mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
c8cb26252a
* ext/openssl/ossl_x509cert.c (ossl_x509_verify): X509_verify() family may put errors on 0 return (0 means verification failure). Clear OpenSSL error queue before return to Ruby. Since the queue is thread global, remaining errors in the queue can cause an unexpected error in the next OpenSSL operation. [ruby-core:48284] [Bug #7215] * ext/openssl/ossl_x509crl.c (ossl_x509crl_verify): ditto. * ext/openssl/ossl_x509req.c (ossl_x509req_verify): ditto. * ext/openssl/ossl_x509store.c (ossl_x509stctx_verify): ditto. * ext/openssl/ossl_pkey_dh.c (dh_generate): clear the OpenSSL error queue before re-raising exception. * ext/openssl/ossl_pkey_dsa.c (dsa_generate): ditto. * ext/openssl/ossl_pkey_rsa.c (rsa_generate): ditto. * ext/openssl/ossl_ssl.c (ossl_start_ssl): ditto. * test/openssl: check that OpenSSL.errors is empty every time after running a test case. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55051 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
108 lines
2.7 KiB
Ruby
108 lines
2.7 KiB
Ruby
# frozen_string_literal: false
|
|
require_relative 'utils'
|
|
|
|
if defined?(OpenSSL::TestUtils)
|
|
|
|
class OpenSSL::TestPKeyDH < OpenSSL::TestCase
|
|
|
|
NEW_KEYLEN = 256
|
|
|
|
def test_DEFAULT_1024
|
|
params = <<-eop
|
|
-----BEGIN DH PARAMETERS-----
|
|
MIGHAoGBAJ0lOVy0VIr/JebWn0zDwY2h+rqITFOpdNr6ugsgvkDXuucdcChhYExJ
|
|
AV/ZD2AWPbrTqV76mGRgJg4EddgT1zG0jq3rnFdMj2XzkBYx3BVvfR0Arnby0RHR
|
|
T4h7KZ/2zmjvV+eF8kBUHBJAojUlzxKj4QeO2x20FP9X5xmNUXeDAgEC
|
|
-----END DH PARAMETERS-----
|
|
eop
|
|
assert_equal params, OpenSSL::PKey::DH::DEFAULT_1024.to_s
|
|
end
|
|
|
|
def test_DEFAULT_2048
|
|
params = <<-eop
|
|
-----BEGIN DH PARAMETERS-----
|
|
MIIBCAKCAQEA7E6kBrYiyvmKAMzQ7i8WvwVk9Y/+f8S7sCTN712KkK3cqd1jhJDY
|
|
JbrYeNV3kUIKhPxWHhObHKpD1R84UpL+s2b55+iMd6GmL7OYmNIT/FccKhTcveab
|
|
VBmZT86BZKYyf45hUF9FOuUM9xPzuK3Vd8oJQvfYMCd7LPC0taAEljQLR4Edf8E6
|
|
YoaOffgTf5qxiwkjnlVZQc3whgnEt9FpVMvQ9eknyeGB5KHfayAc3+hUAvI3/Cr3
|
|
1bNveX5wInh5GDx1FGhKBZ+s1H+aedudCm7sCgRwv8lKWYGiHzObSma8A86KG+MD
|
|
7Lo5JquQ3DlBodj3IDyPrxIv96lvRPFtAwIBAg==
|
|
-----END DH PARAMETERS-----
|
|
eop
|
|
assert_equal params, OpenSSL::PKey::DH::DEFAULT_2048.to_s
|
|
end
|
|
|
|
def test_new
|
|
dh = OpenSSL::PKey::DH.new(NEW_KEYLEN)
|
|
assert_key(dh)
|
|
end
|
|
|
|
def test_new_break
|
|
assert_nil(OpenSSL::PKey::DH.new(NEW_KEYLEN) { break })
|
|
assert_raise(RuntimeError) do
|
|
OpenSSL::PKey::DH.new(NEW_KEYLEN) { raise }
|
|
end
|
|
end
|
|
|
|
def test_to_der
|
|
dh = OpenSSL::TestUtils::TEST_KEY_DH1024
|
|
der = dh.to_der
|
|
dh2 = OpenSSL::PKey::DH.new(der)
|
|
assert_equal_params(dh, dh2)
|
|
assert_no_key(dh2)
|
|
end
|
|
|
|
def test_to_pem
|
|
dh = OpenSSL::TestUtils::TEST_KEY_DH1024
|
|
pem = dh.to_pem
|
|
dh2 = OpenSSL::PKey::DH.new(pem)
|
|
assert_equal_params(dh, dh2)
|
|
assert_no_key(dh2)
|
|
end
|
|
|
|
def test_public_key
|
|
dh = OpenSSL::TestUtils::TEST_KEY_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)
|
|
assert_equal(dh.to_pem, public_key.to_pem)
|
|
end
|
|
|
|
def test_generate_key
|
|
dh = OpenSSL::TestUtils::TEST_KEY_DH1024.public_key # creates a copy
|
|
assert_no_key(dh)
|
|
dh.generate_key!
|
|
assert_key(dh)
|
|
end
|
|
|
|
def test_key_exchange
|
|
dh = OpenSSL::TestUtils::TEST_KEY_DH1024
|
|
dh2 = dh.public_key
|
|
dh.generate_key!
|
|
dh2.generate_key!
|
|
assert_equal(dh.compute_key(dh2.pub_key), dh2.compute_key(dh.pub_key))
|
|
end
|
|
|
|
private
|
|
|
|
def assert_equal_params(dh1, dh2)
|
|
assert_equal(dh1.g, dh2.g)
|
|
assert_equal(dh1.p, dh2.p)
|
|
end
|
|
|
|
def assert_no_key(dh)
|
|
assert_equal(false, dh.public?)
|
|
assert_equal(false, dh.private?)
|
|
assert_equal(nil, dh.pub_key)
|
|
assert_equal(nil, dh.priv_key)
|
|
end
|
|
|
|
def assert_key(dh)
|
|
assert(dh.public?)
|
|
assert(dh.private?)
|
|
assert(dh.pub_key)
|
|
assert(dh.priv_key)
|
|
end
|
|
end
|
|
|
|
end
|