feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

remove contentOID check

Browse Source
This commit is contained in:
Jacob Barthelmeh
2021-06-17 01:30:29 +07:00
parent 31e8784057
commit a4b5ebb62f
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wolfcrypt/src/pkcs7.c
View File

@ -12672,7 +12672,7 @@ int wc_PKCS7_EncodeCompressedData(PKCS7* pkcs7, byte* output, word32 outputSz)
compressedDataSeqSz = SetSequence(totalSz, compressedDataSeq); compressedDataSeqSz = SetSequence(totalSz, compressedDataSeq);
totalSz += compressedDataSeqSz; totalSz += compressedDataSeqSz;
if (pkcs7->version == 3 && pkcs7->contentOID == COMPRESSED_DATA) { if (pkcs7->version == 3) {
/* RFC 4108 section 2 /* RFC 4108 section 2
* When the SignedData is version 3 and eContent is compressedData then * When the SignedData is version 3 and eContent is compressedData then
* the encoding is : * the encoding is :
@ -12687,10 +12687,7 @@ int wc_PKCS7_EncodeCompressedData(PKCS7* pkcs7, byte* output, word32 outputSz)
contentInfoContentSeqSz = 0; contentInfoContentSeqSz = 0;
} }
else { else {
/* pkcs7->contentOID should be ENCRYPTED_DATA, FIRMWARE_PKG_DATA is just /* EncryptedData eContent type is encoded with:
* an octet string for eContent.
*
* EncryptedData eContent type is encoded with:
* EncryptedData { * EncryptedData {
* version * version
* EncryptedContentInfo { * EncryptedContentInfo {