commit | f1c5b6d8141af1548cf3db4d4514e14c4e841074 | [log] [tgz] |
---|---|---|
author | Kenny Root <kroot@google.com> | Tue Dec 09 13:46:03 2014 -0800 |
committer | Kenny Root <kroot@google.com> | Tue Dec 09 13:49:48 2014 -0800 |
tree | 91193334922b05a52c6793dbffb625bf6110517a | |
parent | 058faf1e3a8978cca7c9898ccd692fa5b738a180 [diff] |
NativeCrypto: empty data content for PKCS7 container The EncapsulatedContentInfo must be present in the output, but OpenSSL will fill in a zero-length OID if you don't call PKCS7_set_content on the outer PKCS7 container. So we construct an empty PKCS7 data container and set it as the content. This fixes the invalid PKCS7 output. (cherry picked from commit 525df9b12c1eb77db9f1b2b8fa5d41f779b9afa6) Bug: 18664989 Change-Id: I6f4cf785dd02ee40f1951d098fa987aa25d2421a