diff options
| author | Miklos Fazekas <mfazekas@szemafor.com> | 2015-01-07 14:27:09 +0100 |
|---|---|---|
| committer | Miklos Fazekas <mfazekas@szemafor.com> | 2015-01-07 14:27:09 +0100 |
| commit | b52c2ed5f486cc94c6b9c2ed530f6edd1c4dcaf7 (patch) | |
| tree | 069b11b4ec1ccaa4c38d5cc73722d7a68af6eeb8 | |
| parent | 0cd9ff44d7d592583fe35c49b0d64868f334f3b2 (diff) | |
| download | net-ssh-b52c2ed5f486cc94c6b9c2ed530f6edd1c4dcaf7.tar.gz | |
Removed unsupported curve25519-sha256@libssh
| -rw-r--r-- | CHANGES.txt | 4 | ||||
| -rw-r--r-- | lib/net/ssh/transport/algorithms.rb | 3 | ||||
| -rw-r--r-- | test/transport/test_algorithms.rb | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index a5dad58..4c21761 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,7 @@ +=== 2.9.2-rc3 + +* Remove advertised algorithms that were not working (curve25519-sha256@libssh.org) [mfazekas] + === 2.9.2-rc2 * number_of_password_prompts is now accepted as ssh option, by setting it 0 net-ssh will not ask for password for password auth as with previous versions [mfazekas] diff --git a/lib/net/ssh/transport/algorithms.rb b/lib/net/ssh/transport/algorithms.rb index 1f9a360..142b2b1 100644 --- a/lib/net/ssh/transport/algorithms.rb +++ b/lib/net/ssh/transport/algorithms.rb @@ -58,8 +58,7 @@ module Net; module SSH; module Transport ecdsa-sha2-nistp521) ALGORITHMS[:kex] += %w(ecdh-sha2-nistp256 ecdh-sha2-nistp384 - ecdh-sha2-nistp521 - curve25519-sha256@libssh.org) + ecdh-sha2-nistp521) end # The underlying transport layer session that supports this object diff --git a/test/transport/test_algorithms.rb b/test/transport/test_algorithms.rb index 1be7c7c..2ffe3ec 100644 --- a/test/transport/test_algorithms.rb +++ b/test/transport/test_algorithms.rb @@ -58,7 +58,7 @@ module Transport def ec_kex if defined?(OpenSSL::PKey::EC) - %w(ecdh-sha2-nistp256 ecdh-sha2-nistp384 ecdh-sha2-nistp521 curve25519-sha256@libssh.org) + %w(ecdh-sha2-nistp256 ecdh-sha2-nistp384 ecdh-sha2-nistp521) else [] end |