nahi	2011-06-22 01:33:06 +0900 (Wed, 22 Jun 2011)

  New Revision: 32189

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32189

  Log:
    * 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.

  Modified files:
    trunk/ChangeLog
    trunk/test/openssl/test_x509store.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 32188)
+++ ChangeLog	(revision 32189)
@@ -1,3 +1,9 @@
+Wed Jun 22 01:28:13 2011  Hiroshi Nakamura  <nahi@r...>
+
+	* 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@r...>
 
 	* lib/webrick/httpresponse.rb (HTTPResponse#setup_header): Close 
Index: test/openssl/test_x509store.rb
===================================================================
--- test/openssl/test_x509store.rb	(revision 32188)
+++ test/openssl/test_x509store.rb	(revision 32189)
@@ -212,9 +212,17 @@
     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
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/