Merge pull request #1086 from rhenium/ky/pkcs7-test-flaky-enveloped

pkcs7: fix flaky test test_enveloped

Author: rhenium

test/openssl/test_pkcs7.rb

@@ -238,8 +238,6 @@ def test_enveloped
     assert_equal(@ee2_cert.serial, recip[1].serial)
     assert_equal(data, p7.decrypt(@ee2_key, @ee2_cert))
 
-    assert_equal(data, p7.decrypt(@ee1_key))
-
     assert_raise(OpenSSL::PKCS7::PKCS7Error) {
       p7.decrypt(@ca_key, @ca_cert)
     }
@@ -250,6 +248,16 @@ def test_enveloped
     }
   end
 
+  def test_enveloped_decrypt_key_only
+    omit_on_fips # PKCS #1 v1.5 padding
+
+    data = "aaaaa\nbbbbb\nccccc\n"
+    cipher = "AES-128-CBC"
+
+    p7 = OpenSSL::PKCS7.encrypt([@ee1_cert], data, cipher, OpenSSL::PKCS7::BINARY)
+    assert_equal(data, p7.decrypt(@ee1_key))
+  end
+
   def test_enveloped_add_recipient
     omit_on_fips # PKCS #1 v1.5 padding