Merge pull request #871 from samuel40791765/update-awslc-pkcs7

Skip PKCS7 with indefinite length test in AWS-LC

Author: rhenium

test/openssl/test_pkcs7.rb

@@ -308,6 +308,8 @@ def test_degenerate_pkcs7
   end
 
   def test_split_content
+     pend "AWS-LC ASN.1 parsers has no current support for parsing indefinite BER constructed strings" if aws_lc?
+
      pki_message_pem = <<END
 -----BEGIN PKCS7-----
 MIIHSwYJKoZIhvcNAQcCoIIHPDCCBzgCAQExCzAJBgUrDgMCGgUAMIIDiAYJKoZI
@@ -376,14 +378,9 @@ def test_split_content
 END
     pki_msg = OpenSSL::PKCS7.new(pki_message_pem)
     store = OpenSSL::X509::Store.new
-    pki_msg.verify(nil, store, nil, OpenSSL::PKCS7::NOVERIFY)
+    assert_equal(true, pki_msg.verify(nil, store, nil, OpenSSL::PKCS7::NOVERIFY))
     p7enc = OpenSSL::PKCS7.new(pki_msg.data)
-    # AWS-LC uses explicit OCTET STRING headers when encoding PKCS7 EncryptedContent,
-    # while OpenSSL traditionally uses indefinite-length encoding (ASN1_TFLG_NDEF)
-    # in its PKCS7 implementation.
-    unless aws_lc?
-      assert_equal(pki_message_content_pem, p7enc.to_pem)
-    end
+    assert_equal(pki_message_content_pem, p7enc.to_pem)
   end
 end