naruse	2010-12-25 18:02:03 +0900 (Sat, 25 Dec 2010)

  New Revision: 30359

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

  Log:
    Support OpenSSL 1.1; it supports RSA1024 and DSS1.

  Modified files:
    trunk/test/openssl/test_x509cert.rb
    trunk/test/openssl/test_x509req.rb

Index: test/openssl/test_x509cert.rb
===================================================================
--- test/openssl/test_x509cert.rb	(revision 30358)
+++ test/openssl/test_x509cert.rb	(revision 30359)
@@ -153,10 +153,18 @@
     cert.not_after = Time.now
     assert_equal(false, cert.verify(@dsa512))
 
-    assert_raise(OpenSSL::X509::CertificateError){
+    begin
       cert = issue_cert(@ca, @rsa2048, 1, Time.now, Time.now+3600, [],
                         nil, nil, OpenSSL::Digest::DSS1.new)
-    }
+      assert_equal(false, cert.verify(@rsa1024))
+      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(@dsa512) })
+      cert.subject = @ee1
+      assert_equal(false, cert.verify(@rsa2048))
+    rescue OpenSSL::X509::CertificateError
+    end
+
     assert_raise(OpenSSL::X509::CertificateError){
       cert = issue_cert(@ca, @dsa512, 1, Time.now, Time.now+3600, [],
                         nil, nil, OpenSSL::Digest::MD5.new)
Index: test/openssl/test_x509req.rb
===================================================================
--- test/openssl/test_x509req.rb	(revision 30358)
+++ test/openssl/test_x509req.rb	(revision 30359)
@@ -123,9 +123,18 @@
     req.public_key = @rsa1024.public_key
     assert_equal(false, req.verify(@dsa512))
 
+    begin
+      req = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest::DSS1.new)
+      assert_equal(true,  req.verify(@rsa1024))
+      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(@dsa512) })
+      req.version = 1
+      assert_equal(false, req.verify(@rsa1024))
+    rescue OpenSSL::X509::RequestError
+    end
+
     assert_raise(OpenSSL::X509::RequestError){
-      issue_csr(0, @dn, @rsa1024, OpenSSL::Digest::DSS1.new) }
-    assert_raise(OpenSSL::X509::RequestError){
       issue_csr(0, @dn, @dsa512, OpenSSL::Digest::MD5.new) }
   end
   

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