1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

split assertions into algorithms

CentOS 7 seems finish MD5 support
http://chkbuild005.hsbt.org/chkbuild/ruby-trunk/log/20140722T140010Z.fail.html.gz

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46899 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2014-07-22 16:02:05 +00:00
parent 98b2401077
commit 594eee8543
2 changed files with 36 additions and 23 deletions

View file

@ -125,7 +125,7 @@ class OpenSSL::TestX509Certificate < Test::Unit::TestCase
end end
def test_sign_and_verify def test_sign_and_verify_rsa_sha1
cert = issue_cert(@ca, @rsa2048, 1, Time.now, Time.now+3600, [], cert = issue_cert(@ca, @rsa2048, 1, Time.now, Time.now+3600, [],
nil, nil, OpenSSL::Digest::SHA1.new) nil, nil, OpenSSL::Digest::SHA1.new)
assert_equal(false, cert.verify(@rsa1024)) assert_equal(false, cert.verify(@rsa1024))
@ -134,7 +134,9 @@ class OpenSSL::TestX509Certificate < Test::Unit::TestCase
assert_equal(false, certificate_error_returns_false { cert.verify(@dsa512) }) assert_equal(false, certificate_error_returns_false { cert.verify(@dsa512) })
cert.serial = 2 cert.serial = 2
assert_equal(false, cert.verify(@rsa2048)) assert_equal(false, cert.verify(@rsa2048))
end
def test_sign_and_verify_rsa_md5
cert = issue_cert(@ca, @rsa2048, 1, Time.now, Time.now+3600, [], cert = issue_cert(@ca, @rsa2048, 1, Time.now, Time.now+3600, [],
nil, nil, OpenSSL::Digest::MD5.new) nil, nil, OpenSSL::Digest::MD5.new)
assert_equal(false, cert.verify(@rsa1024)) assert_equal(false, cert.verify(@rsa1024))
@ -144,7 +146,9 @@ class OpenSSL::TestX509Certificate < Test::Unit::TestCase
assert_equal(false, certificate_error_returns_false { cert.verify(@dsa512) }) assert_equal(false, certificate_error_returns_false { cert.verify(@dsa512) })
cert.subject = @ee1 cert.subject = @ee1
assert_equal(false, cert.verify(@rsa2048)) assert_equal(false, cert.verify(@rsa2048))
end
def test_sign_and_verify_dsa
cert = issue_cert(@ca, @dsa512, 1, Time.now, Time.now+3600, [], cert = issue_cert(@ca, @dsa512, 1, Time.now, Time.now+3600, [],
nil, nil, OpenSSL::TestUtils::DSA_SIGNATURE_DIGEST.new) nil, nil, OpenSSL::TestUtils::DSA_SIGNATURE_DIGEST.new)
assert_equal(false, certificate_error_returns_false { cert.verify(@rsa1024) }) assert_equal(false, certificate_error_returns_false { cert.verify(@rsa1024) })
@ -153,19 +157,21 @@ class OpenSSL::TestX509Certificate < Test::Unit::TestCase
assert_equal(true, cert.verify(@dsa512)) assert_equal(true, cert.verify(@dsa512))
cert.not_after = Time.now cert.not_after = Time.now
assert_equal(false, cert.verify(@dsa512)) assert_equal(false, cert.verify(@dsa512))
end
begin def test_sign_and_verify_rsa_dss1
cert = issue_cert(@ca, @rsa2048, 1, Time.now, Time.now+3600, [], cert = issue_cert(@ca, @rsa2048, 1, Time.now, Time.now+3600, [],
nil, nil, OpenSSL::Digest::DSS1.new) nil, nil, OpenSSL::Digest::DSS1.new)
assert_equal(false, cert.verify(@rsa1024)) assert_equal(false, cert.verify(@rsa1024))
assert_equal(true, cert.verify(@rsa2048)) assert_equal(true, cert.verify(@rsa2048))
assert_equal(false, certificate_error_returns_false { cert.verify(@dsa256) }) assert_equal(false, certificate_error_returns_false { cert.verify(@dsa256) })
assert_equal(false, certificate_error_returns_false { cert.verify(@dsa512) }) assert_equal(false, certificate_error_returns_false { cert.verify(@dsa512) })
cert.subject = @ee1 cert.subject = @ee1
assert_equal(false, cert.verify(@rsa2048)) assert_equal(false, cert.verify(@rsa2048))
rescue OpenSSL::X509::CertificateError rescue OpenSSL::X509::CertificateError
end end
def test_sign_and_verify_dsa_md5
assert_raise(OpenSSL::X509::CertificateError){ assert_raise(OpenSSL::X509::CertificateError){
issue_cert(@ca, @dsa512, 1, Time.now, Time.now+3600, [], issue_cert(@ca, @dsa512, 1, Time.now, Time.now+3600, [],
nil, nil, OpenSSL::Digest::MD5.new) nil, nil, OpenSSL::Digest::MD5.new)

View file

@ -98,7 +98,7 @@ class OpenSSL::TestX509Request < Test::Unit::TestCase
assert_equal(exts, get_ext_req(attrs[1].value)) assert_equal(exts, get_ext_req(attrs[1].value))
end end
def test_sign_and_verify def test_sign_and_verify_rsa_sha1
req = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest::SHA1.new) req = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest::SHA1.new)
assert_equal(true, req.verify(@rsa1024)) assert_equal(true, req.verify(@rsa1024))
assert_equal(false, req.verify(@rsa2048)) assert_equal(false, req.verify(@rsa2048))
@ -106,7 +106,9 @@ class OpenSSL::TestX509Request < Test::Unit::TestCase
assert_equal(false, request_error_returns_false { req.verify(@dsa512) }) assert_equal(false, request_error_returns_false { req.verify(@dsa512) })
req.version = 1 req.version = 1
assert_equal(false, req.verify(@rsa1024)) assert_equal(false, req.verify(@rsa1024))
end
def test_sign_and_verify_rsa_md5
req = issue_csr(0, @dn, @rsa2048, OpenSSL::Digest::MD5.new) req = issue_csr(0, @dn, @rsa2048, OpenSSL::Digest::MD5.new)
assert_equal(false, req.verify(@rsa1024)) assert_equal(false, req.verify(@rsa1024))
assert_equal(true, req.verify(@rsa2048)) assert_equal(true, req.verify(@rsa2048))
@ -114,7 +116,9 @@ class OpenSSL::TestX509Request < Test::Unit::TestCase
assert_equal(false, request_error_returns_false { req.verify(@dsa512) }) assert_equal(false, request_error_returns_false { req.verify(@dsa512) })
req.subject = OpenSSL::X509::Name.parse("/C=JP/CN=FooBar") req.subject = OpenSSL::X509::Name.parse("/C=JP/CN=FooBar")
assert_equal(false, req.verify(@rsa2048)) assert_equal(false, req.verify(@rsa2048))
end
def test_sign_and_verify_dsa
req = issue_csr(0, @dn, @dsa512, OpenSSL::TestUtils::DSA_SIGNATURE_DIGEST.new) req = issue_csr(0, @dn, @dsa512, OpenSSL::TestUtils::DSA_SIGNATURE_DIGEST.new)
assert_equal(false, request_error_returns_false { req.verify(@rsa1024) }) assert_equal(false, request_error_returns_false { req.verify(@rsa1024) })
assert_equal(false, request_error_returns_false { req.verify(@rsa2048) }) assert_equal(false, request_error_returns_false { req.verify(@rsa2048) })
@ -122,18 +126,21 @@ class OpenSSL::TestX509Request < Test::Unit::TestCase
assert_equal(true, req.verify(@dsa512)) assert_equal(true, req.verify(@dsa512))
req.public_key = @rsa1024.public_key req.public_key = @rsa1024.public_key
assert_equal(false, req.verify(@dsa512)) assert_equal(false, req.verify(@dsa512))
end
begin def test_sign_and_verify_rsa_dss1
req = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest::DSS1.new) req = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest::DSS1.new)
assert_equal(true, req.verify(@rsa1024)) assert_equal(true, req.verify(@rsa1024))
assert_equal(false, req.verify(@rsa2048)) assert_equal(false, req.verify(@rsa2048))
assert_equal(false, request_error_returns_false { req.verify(@dsa256) }) assert_equal(false, request_error_returns_false { req.verify(@dsa256) })
assert_equal(false, request_error_returns_false { req.verify(@dsa512) }) assert_equal(false, request_error_returns_false { req.verify(@dsa512) })
req.version = 1 req.version = 1
assert_equal(false, req.verify(@rsa1024)) assert_equal(false, req.verify(@rsa1024))
rescue OpenSSL::X509::RequestError rescue OpenSSL::X509::RequestError
end skip
end
def test_sign_and_verify_dsa_md5
assert_raise(OpenSSL::X509::RequestError){ assert_raise(OpenSSL::X509::RequestError){
issue_csr(0, @dn, @dsa512, OpenSSL::Digest::MD5.new) } issue_csr(0, @dn, @dsa512, OpenSSL::Digest::MD5.new) }
end end