wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-04-29 16:43:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

add pkcs7 test with multiple recipients

Browse Source
This commit is contained in:
JacobBarthelmeh
2025-09-29 17:58:15 -06:00
parent 7a5e97e30e
commit 328f505702
6 changed files with 96 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wolfcrypt/src/pkcs7.c
+10 -6
View File
@@ -11974,8 +11974,14 @@ static int wc_PKCS7_DecryptRecipientInfos(wc_PKCS7* pkcs7, byte* in,
ret = wc_PKCS7_DecryptKtri(pkcs7, in, inSz, idx,
decryptedKey, decryptedKeySz,
recipFound);
if (ret != 0)
return ret;
if (ret != 0) {
if (ret != WC_PKCS7_WANT_READ_E && *recipFound == 0) {
continue; /* try next recipient */
}
else {
return ret; /* found recipient and failed decrypt */
}
}
#else
return NOT_COMPILED_IN;
#endif
@@ -12096,8 +12102,8 @@ static int wc_PKCS7_DecryptRecipientInfos(wc_PKCS7* pkcs7, byte* in,
recipFound);
if (ret != 0)
return ret;
} else {
}
else {
/* failed to find RecipientInfo, restore idx and continue */
*idx = savedIdx;
break;
@@ -12497,8 +12503,6 @@ int wc_PKCS7_DecodeEnvelopedData(wc_PKCS7* pkcs7, byte* in,
decryptedKeySz = MAX_ENCRYPTED_KEY_SZ;
tmpIdx = idx;
#endif
pkiMsgSz = (pkcs7->stream->length > 0)? pkcs7->stream->length: inSz;
ret = wc_PKCS7_DecryptRecipientInfos(pkcs7, in, inSz, &idx,
decryptedKey, &decryptedKeySz,
&recipFound);