* 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

2 files changed, 17 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index fa5e2c2b6a..65c62d0ce8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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