From 1e54903684aa3c9ea3fe54520157846a1b1f07be Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Wed, 5 Jun 2019 21:07:27 +0900 Subject: test/openssl: Support OpenSSL 1.1.1 OpenSSL 1.1.1 rejects some shorter keys, which caused some failures of `make test-all TESTS=openssl`. https://rubyci.org/logs/rubyci.s3.amazonaws.com/debian/ruby-master/log/20190606T003005Z.fail.html.gz This change merges 6bbc31ddd1 and 63fb3a36d1 in https://github.com/ruby/openssl. Reference: https://github.com/ruby/openssl/pull/217 --- test/openssl/test_pkey_dh.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'test/openssl/test_pkey_dh.rb') diff --git a/test/openssl/test_pkey_dh.rb b/test/openssl/test_pkey_dh.rb index 77cdb0ab84..8c8fbaeefb 100644 --- a/test/openssl/test_pkey_dh.rb +++ b/test/openssl/test_pkey_dh.rb @@ -19,7 +19,7 @@ class OpenSSL::TestPKeyDH < OpenSSL::PKeyTestCase end def test_DHparams - dh1024 = Fixtures.pkey_dh("dh1024") + dh1024 = Fixtures.pkey("dh1024") asn1 = OpenSSL::ASN1::Sequence([ OpenSSL::ASN1::Integer(dh1024.p), OpenSSL::ASN1::Integer(dh1024.g) @@ -42,7 +42,7 @@ class OpenSSL::TestPKeyDH < OpenSSL::PKeyTestCase end def test_public_key - dh = Fixtures.pkey_dh("dh1024") + dh = Fixtures.pkey("dh1024") public_key = dh.public_key assert_no_key(public_key) #implies public_key.public? is false! assert_equal(dh.to_der, public_key.to_der) @@ -50,14 +50,14 @@ class OpenSSL::TestPKeyDH < OpenSSL::PKeyTestCase end def test_generate_key - dh = Fixtures.pkey_dh("dh1024").public_key # creates a copy + dh = Fixtures.pkey("dh1024").public_key # creates a copy assert_no_key(dh) dh.generate_key! assert_key(dh) end def test_key_exchange - dh = Fixtures.pkey_dh("dh1024") + dh = Fixtures.pkey("dh1024") dh2 = dh.public_key dh.generate_key! dh2.generate_key! -- cgit v1.2.3