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

Fix to handle BER with PKCS7 enveloped decode

Browse Source
This commit is contained in:
Jacob Barthelmeh
2019-03-13 08:46:15 -06:00
parent 57cdbffc2c
commit e810551aab
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
wolfcrypt/src/pkcs7.c
View File

@@ -344,6 +344,16 @@ static long wc_PKCS7_GetMaxStream(PKCS7* pkcs7, byte flag, byte* in,
NO_USER_CHECK)) < 0) { NO_USER_CHECK)) < 0) {
return ret; return ret;
} }
#ifdef ASN_BER_TO_DER
if (length == 0 && ret == 0) {
idx = 0;
if ((ret = wc_BerToDer(pt, defSz, NULL,
(word32*)&length)) != LENGTH_ONLY_E) {
return ret;
}
}
#endif /* ASN_BER_TO_DER */
pkcs7->stream->maxLen = length + idx; pkcs7->stream->maxLen = length + idx;
} }
} }
@@ -8883,9 +8893,10 @@ static int wc_PKCS7_ParseToRecipientInfoSet(PKCS7* pkcs7, byte* in,
if (ret < 0) if (ret < 0)
return ret; return ret;
pkiMsg = pkcs7->der; pkiMsg = in = pkcs7->der;
pkiMsgSz = len; pkiMsgSz = pkcs7->derSz = len;
*idx = 0; *idx = 0;
if (GetSequence(pkiMsg, idx, &length, pkiMsgSz) < 0) if (GetSequence(pkiMsg, idx, &length, pkiMsgSz) < 0)
return ASN_PARSE_E; return ASN_PARSE_E;
#else #else
@@ -9114,6 +9125,12 @@ WOLFSSL_API int wc_PKCS7_DecodeEnvelopedData(PKCS7* pkcs7, byte* in,
break; break;
} }
#ifdef ASN_BER_TO_DER
/* check if content was BER and has been converted to DER */
if (pkcs7->derSz > 0)
pkiMsg = in = pkcs7->der;
#endif
decryptedKey = (byte*)XMALLOC(MAX_ENCRYPTED_KEY_SZ, pkcs7->heap, decryptedKey = (byte*)XMALLOC(MAX_ENCRYPTED_KEY_SZ, pkcs7->heap,
DYNAMIC_TYPE_PKCS7); DYNAMIC_TYPE_PKCS7);
if (decryptedKey == NULL) if (decryptedKey == NULL)