diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | test/openssl/test_pkcs7.rb | 10 |
2 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,10 @@ +Sat Jul 14 12:16:17 2007 NAKAMURA, Hiroshi <nahi@ruby-lang.org> + + * test/openssl/test_pkcs7.rb: follow the library change. applied a + patch from <zn at mbf.nifty.com> [ruby-dev:31214]. + NOTE: r12496 imports the latest openssl libs from trunk to ruby_1_8 + though its's not ChangeLog-ed. maintainer should aware that. + Sat Jul 14 02:51:52 2007 Yukihiro Matsumoto <matz@ruby-lang.org> * numeric.c (fix_pow): 0**2 should not raise floating point diff --git a/test/openssl/test_pkcs7.rb b/test/openssl/test_pkcs7.rb index 9b472c1795..2cdd9343ff 100644 --- a/test/openssl/test_pkcs7.rb +++ b/test/openssl/test_pkcs7.rb @@ -46,7 +46,7 @@ class OpenSSL::TestPKCS7 < Test::Unit::TestCase 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 @@ class OpenSSL::TestPKCS7 < Test::Unit::TestCase 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 @@ class OpenSSL::TestPKCS7 < Test::Unit::TestCase 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 @@ class OpenSSL::TestPKCS7 < Test::Unit::TestCase 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 @@ class OpenSSL::TestPKCS7 < Test::Unit::TestCase 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) |