summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Wininger <fw.centrale@gmail.com>2022-04-29 14:19:55 +0200
committerFlorian Wininger <fw.centrale@gmail.com>2022-04-29 14:42:49 +0200
commit395f0cd4029c305c4591482a3e8f2a3bb25f6860 (patch)
tree50c8f3a86bcecba7901e9b3f195e85d78fce392f
parentb58014618c09968095655ebbd278e94fd81def73 (diff)
downloadnet-ssh-395f0cd4029c305c4591482a3e8f2a3bb25f6860.tar.gz
Fix unit tests for OpenSSL 3
-rw-r--r--test/common.rb12
-rw-r--r--test/transport/kex/test_diffie_hellman_group1_sha1.rb2
-rw-r--r--test/transport/test_algorithms.rb2
3 files changed, 14 insertions, 2 deletions
diff --git a/test/common.rb b/test/common.rb
index e6a69bf..14dded0 100644
--- a/test/common.rb
+++ b/test/common.rb
@@ -46,6 +46,18 @@ def P(*args)
Net::SSH::Packet.new(Net::SSH::Buffer.from(*args))
end
+# DH key generate with OpenSSL::PKey::DH.new(512).to_pem
+def dh_512bits_bn
+ OpenSSL::PKey::DH.new(
+ <<~DH_KEY
+ -----BEGIN DH PARAMETERS-----
+ MEYCQQDkZMgCTieW40x/bmCpf6m1XHERNnyOodot21UsJkCidr+T6aAcy/Oz4mWo
+ aYudmZZLQz7jhz0Ut2VQUw0Nz033AgEC
+ -----END DH PARAMETERS-----
+ DH_KEY
+ ).p
+end
+
class NetSSHTest < Minitest::Test
def assert_nothing_raised(&block)
yield
diff --git a/test/transport/kex/test_diffie_hellman_group1_sha1.rb b/test/transport/kex/test_diffie_hellman_group1_sha1.rb
index a3b846c..833ce15 100644
--- a/test/transport/kex/test_diffie_hellman_group1_sha1.rb
+++ b/test/transport/kex/test_diffie_hellman_group1_sha1.rb
@@ -133,7 +133,7 @@ module Transport
end
def server_dh_pubkey
- @server_dh_pubkey ||= bn(1234567890)
+ @server_dh_pubkey ||= OpenSSL::BN.new(dh_512bits_bn, 10)
end
def shared_secret
diff --git a/test/transport/test_algorithms.rb b/test/transport/test_algorithms.rb
index e52782c..b54b098 100644
--- a/test/transport/test_algorithms.rb
+++ b/test/transport/test_algorithms.rb
@@ -371,7 +371,7 @@ module Transport
end
def shared_secret
- @shared_secret ||= OpenSSL::BN.new("1234567890", 10)
+ @shared_secret ||= dh_512bits_bn
end
def session_id