From: Kazuhiro NISHIYAMA <zn@...>
Date: 2007-07-13T22:09:41+09:00
Subject: [ruby-dev:31214] Warning: OpenSSL::PKCS7::PKCS7 is deprecated after Ruby 1.9; use OpenSSL::PKCS7 instead

西山和広です。

ruby_1_8のテストで
Warning: OpenSSL::PKCS7::PKCS7 is deprecated after Ruby 1.9; use OpenSSL::PKCS7 instead
と出ていたのが気になったのでパッチです。

Index: ruby_1_8/test/openssl/test_pkcs7.rb
===================================================================
--- ruby_1_8/test/openssl/test_pkcs7.rb	(revision 12767)
+++ ruby_1_8/test/openssl/test_pkcs7.rb	(working copy)
@@ -46,7 +46,7 @@
 
     data = "aaaaa\r\nbbbbb\r\nccccc\r\n"
     tmp = OpenSSL::PKCS7.sign(@ee1_cert, @rsa1024, data, ca_certs)
-    p7 = OpenSSL::PKCS7::PKCS7.new(tmp.to_der)
+    p7 = OpenSSL::PKCS7.new(tmp.to_der)
     certs = p7.certificates
     signers = p7.signers
     assert(p7.verify([], store))
@@ -65,7 +65,7 @@
     data = "aaaaa\nbbbbb\nccccc\n"
     flag = OpenSSL::PKCS7::BINARY
     tmp = OpenSSL::PKCS7.sign(@ee1_cert, @rsa1024, data, ca_certs, flag)
-    p7 = OpenSSL::PKCS7::PKCS7.new(tmp.to_der)
+    p7 = OpenSSL::PKCS7.new(tmp.to_der)
     certs = p7.certificates
     signers = p7.signers
     assert(p7.verify([], store))
@@ -87,7 +87,7 @@
     tmp1.add_signer(tmp2.signers[0])
     tmp1.add_certificate(@ee2_cert)  
 
-    p7 = OpenSSL::PKCS7::PKCS7.new(tmp1.to_der)
+    p7 = OpenSSL::PKCS7.new(tmp1.to_der)
     certs = p7.certificates
     signers = p7.signers
     assert(p7.verify([], store))
@@ -108,7 +108,7 @@
     data = "aaaaa\nbbbbb\nccccc\n"
     flag = OpenSSL::PKCS7::BINARY|OpenSSL::PKCS7::DETACHED
     tmp = OpenSSL::PKCS7.sign(@ee1_cert, @rsa1024, data, ca_certs, flag)
-    p7 = OpenSSL::PKCS7::PKCS7.new(tmp.to_der)
+    p7 = OpenSSL::PKCS7.new(tmp.to_der)
     a1 = OpenSSL::ASN1.decode(p7)
 
     certs = p7.certificates
@@ -136,7 +136,7 @@
     data = "aaaaa\nbbbbb\nccccc\n"
 
     tmp = OpenSSL::PKCS7.encrypt(certs, data, cipher, OpenSSL::PKCS7::BINARY)
-    p7 = OpenSSL::PKCS7::PKCS7.new(tmp.to_der)
+    p7 = OpenSSL::PKCS7.new(tmp.to_der)
     recip = p7.recipients
     assert_equal(:enveloped, p7.type)
     assert_equal(2, recip.size)



-- 
|ZnZ(ゼット エヌ ゼット)
|西山和広(Kazuhiro NISHIYAMA)