diff options
author | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-21 16:33:06 +0000 |
---|---|---|
committer | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-21 16:33:06 +0000 |
commit | 5e8aa0a1d2f0ceeefbdf00414c8c0921d910fcac (patch) | |
tree | fce6d4fcc3085b0920d679fe720a9ee334c1f72b | |
parent | 4ce158147502304af431c820c227134628578e74 (diff) | |
download | ruby-5e8aa0a1d2f0ceeefbdf00414c8c0921d910fcac.tar.gz |
* test/openssl/test_x509store.rb (test_set_errors): Redhat is
distributing a patched version of OpenSSL that allows multiple CRL
for a key (multi-crl.patch.) Make test pass on such env.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32189 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | test/openssl/test_x509store.rb | 14 |
2 files changed, 17 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Wed Jun 22 01:28:13 2011 Hiroshi Nakamura <nahi@ruby-lang.org> + + * test/openssl/test_x509store.rb (test_set_errors): Redhat is + distributing a patched version of OpenSSL that allows multiple CRL + for a key (multi-crl.patch.) Make test pass on such env. + Tue Jun 21 21:50:37 2011 Hiroshi Nakamura <nahi@ruby-lang.org> * lib/webrick/httpresponse.rb (HTTPResponse#setup_header): Close diff --git a/test/openssl/test_x509store.rb b/test/openssl/test_x509store.rb index 0a93207eee..ff820c1c58 100644 --- a/test/openssl/test_x509store.rb +++ b/test/openssl/test_x509store.rb @@ -212,9 +212,17 @@ class OpenSSL::TestX509Store < Test::Unit::TestCase crl2 = issue_crl(revoke_info, 2, now+1800, now+3600, [], ca1_cert, @rsa2048, OpenSSL::Digest::SHA1.new) store.add_crl(crl1) - assert_raise(OpenSSL::X509::StoreError){ - store.add_crl(crl2) # add CRL issued by same CA twice. - } + if /0\.9\.8.*-rhel/ =~ OpenSSL::OPENSSL_VERSION + # RedHat is distributing a patched version of OpenSSL that allows + # multiple CRL for a key (multi-crl.patch) + assert_nothing_raised do + store.add_crl(crl2) # add CRL issued by same CA twice. + end + else + assert_raise(OpenSSL::X509::StoreError){ + store.add_crl(crl2) # add CRL issued by same CA twice. + } + end end end |