summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklós Fazekas <mfazekas@szemafor.com>2020-02-11 11:50:15 +0100
committerGitHub <noreply@github.com>2020-02-11 11:50:15 +0100
commit71e2f31bb970096f6257031c57ccc035c6e07d93 (patch)
tree588b10182cd706a920699aae086989883d81b569
parent71634cbb0fbc15abb989f8652a866d715012f8e2 (diff)
parent9eb6a445a57546930bf82149422e573f6d63e23b (diff)
downloadnet-ssh-71e2f31bb970096f6257031c57ccc035c6e07d93.tar.gz
Merge pull request #741 from aspyatkin/fix-kex-algorithm-name
Fix kex algorithm name
-rw-r--r--lib/net/ssh/transport/algorithms.rb2
-rw-r--r--lib/net/ssh/transport/kex.rb1
-rw-r--r--test/transport/test_algorithms.rb2
3 files changed, 3 insertions, 2 deletions
diff --git a/lib/net/ssh/transport/algorithms.rb b/lib/net/ssh/transport/algorithms.rb
index f286d2c..ed656ee 100644
--- a/lib/net/ssh/transport/algorithms.rb
+++ b/lib/net/ssh/transport/algorithms.rb
@@ -58,7 +58,7 @@ module Net
if Net::SSH::Transport::Kex::Curve25519Sha256Loader::LOADED
DEFAULT_ALGORITHMS[:kex].unshift(
'curve25519-sha256',
- 'curve22519-sha256@libssh.org'
+ 'curve25519-sha256@libssh.org'
)
end
diff --git a/lib/net/ssh/transport/kex.rb b/lib/net/ssh/transport/kex.rb
index bec7f9f..b3571c3 100644
--- a/lib/net/ssh/transport/kex.rb
+++ b/lib/net/ssh/transport/kex.rb
@@ -23,6 +23,7 @@ module Net::SSH::Transport
if Net::SSH::Transport::Kex::Curve25519Sha256Loader::LOADED
MAP['curve25519-sha256'] = Curve25519Sha256
+ MAP['curve25519-sha256@libssh.org'] = Curve25519Sha256
end
end
end
diff --git a/test/transport/test_algorithms.rb b/test/transport/test_algorithms.rb
index b986570..54f5774 100644
--- a/test/transport/test_algorithms.rb
+++ b/test/transport/test_algorithms.rb
@@ -83,7 +83,7 @@ module Transport
def x25519_kex
if Net::SSH::Transport::Kex::Curve25519Sha256Loader::LOADED
- %w[curve25519-sha256 curve22519-sha256@libssh.org]
+ %w[curve25519-sha256 curve25519-sha256@libssh.org]
else
[]
end