diff options
| author | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-07-14 03:46:37 +0000 |
|---|---|---|
| committer | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-07-14 03:46:37 +0000 |
| commit | 7b8c142696b4751b70f5baf7a9df26069071985f (patch) | |
| tree | 42699fe356fdf9ecbe86e75f5bd6af860056ee67 | |
| parent | 2ab2a56f129f5e9a1437af209b0d76c7a1580e4e (diff) | |
* test/openssl/test_pkcs7.rb: reverted the previous patch. it should
be as it was to check interface compatibility. sorry for bothering
with this.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@12782 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/openssl/test_pkcs7.rb | 10 |
2 files changed, 11 insertions, 5 deletions
@@ -1,3 +1,9 @@ +Sat Jul 14 12:44:14 2007 NAKAMURA, Hiroshi <nahi@ruby-lang.org> + + * test/openssl/test_pkcs7.rb: reverted the previous patch. it should + be as it was to check interface compatibility. sorry for bothering + with this. + Sat Jul 14 12:16:17 2007 NAKAMURA, Hiroshi <nahi@ruby-lang.org> * test/openssl/test_pkcs7.rb: follow the library change. applied a diff --git a/test/openssl/test_pkcs7.rb b/test/openssl/test_pkcs7.rb index 2cdd9343ff..9b472c1795 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.new(tmp.to_der) + p7 = OpenSSL::PKCS7::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.new(tmp.to_der) + p7 = OpenSSL::PKCS7::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.new(tmp1.to_der) + p7 = OpenSSL::PKCS7::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.new(tmp.to_der) + p7 = OpenSSL::PKCS7::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.new(tmp.to_der) + p7 = OpenSSL::PKCS7::PKCS7.new(tmp.to_der) recip = p7.recipients assert_equal(:enveloped, p7.type) assert_equal(2, recip.size) |