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

refactor decrypt content init call

Browse Source
This commit is contained in:
JacobBarthelmeh
2025-03-04 09:29:36 -07:00
parent fcf88f16e6
commit 4124c824ca
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
wolfcrypt/src/pkcs7.c
View File

@ -8452,8 +8452,8 @@ static int wc_PKCS7_EncryptContent(wc_PKCS7* pkcs7, int encryptOID, byte* key,
} }
static int wc_PKCS7_DecryptContentInit(wc_PKCS7* pkcs7, int encryptOID, byte* key, static int wc_PKCS7_DecryptContentInit(wc_PKCS7* pkcs7, int encryptOID,
int keySz, byte* iv, int ivSz, int devId, void* heap) byte* key, int keySz, byte* iv, int ivSz, int devId, void* heap)
{ {
int ret; int ret;
#ifndef NO_AES #ifndef NO_AES
@ -12618,6 +12618,19 @@ WOLFSSL_API int wc_PKCS7_DecodeEnvelopedData(wc_PKCS7* pkcs7, byte* in,
} }
wc_PKCS7_StreamGetVar(pkcs7, &encOID, &expBlockSz, 0); wc_PKCS7_StreamGetVar(pkcs7, &encOID, &expBlockSz, 0);
wc_PKCS7_StreamStoreVar(pkcs7, encOID, expBlockSz, explicitOctet); wc_PKCS7_StreamStoreVar(pkcs7, encOID, expBlockSz, explicitOctet);
if (explicitOctet) {
/* initialize decryption state in preperation */
if (pkcs7->decryptionCb == NULL) {
ret = wc_PKCS7_DecryptContentInit(pkcs7, encOID,
pkcs7->stream->aad, pkcs7->stream->aadSz,
pkcs7->stream->tmpIv, expBlockSz,
pkcs7->devId, pkcs7->heap);
if (ret != 0)
break;
}
}
#endif #endif
wc_PKCS7_ChangeState(pkcs7, WC_PKCS7_ENV_5); wc_PKCS7_ChangeState(pkcs7, WC_PKCS7_ENV_5);
FALL_THROUGH; FALL_THROUGH;
@ -12650,13 +12663,6 @@ WOLFSSL_API int wc_PKCS7_DecodeEnvelopedData(wc_PKCS7* pkcs7, byte* in,
* decrypting and outputting or caching contents until the indef * decrypting and outputting or caching contents until the indef
* ending tag is found */ * ending tag is found */
if (pkcs7->decryptionCb == NULL) {
ret = wc_PKCS7_DecryptContentInit(pkcs7, encOID,
decryptedKey, blockKeySz, tmpIv, expBlockSz,
pkcs7->devId, pkcs7->heap);
}
while (1) { while (1) {
if (pkiMsgSz <= localIdx) { if (pkiMsgSz <= localIdx) {
/* ran out of data to parse */ /* ran out of data to parse */