wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 04:04:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

spelling fixes and free decrypt structs on error case

Browse Source
This commit is contained in:
JacobBarthelmeh
2025-03-01 15:39:42 -07:00
parent b781ac6c29
commit fcf88f16e6
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wolfcrypt/src/pkcs7.c
View File

@@ -12476,7 +12476,7 @@ WOLFSSL_API int wc_PKCS7_DecodeEnvelopedData(wc_PKCS7* pkcs7, byte* in,
#ifndef NO_PKCS7_STREAM #ifndef NO_PKCS7_STREAM
if (length == 0) { if (length == 0) {
/* if indefinet length, assume worst case size /* if indefinite length, assume worst case size
* - Content Type OID + tag/length * - Content Type OID + tag/length
* - Algorithm ID structure (OID + parameters) * - Algorithm ID structure (OID + parameters)
* - Version * - Version
@@ -12501,7 +12501,7 @@ WOLFSSL_API int wc_PKCS7_DecodeEnvelopedData(wc_PKCS7* pkcs7, byte* in,
} }
pkiMsgSz = (pkcs7->stream->length > 0)? pkcs7->stream->length: inSz; pkiMsgSz = (pkcs7->stream->length > 0)? pkcs7->stream->length: inSz;
if (pkcs7->stream->length > 0) { if (pkcs7->stream->length > 0) {
idx = localIdx; /* acount for byte used with seq read */ idx = localIdx; /* account for byte used with seq read */
} }
} }
#endif #endif
@@ -12737,8 +12737,9 @@ WOLFSSL_API int wc_PKCS7_DecodeEnvelopedData(wc_PKCS7* pkcs7, byte* in,
} }
if (ret != 0) { if (ret != 0) {
if (ret == -270) if (ret == WC_PKCS7_WANT_READ_E) {
wc_PKCS7_StreamEndCase(pkcs7, &localIdx, &idx); wc_PKCS7_StreamEndCase(pkcs7, &localIdx, &idx);
}
break; break;
} }
@@ -12781,6 +12782,10 @@ WOLFSSL_API int wc_PKCS7_DecodeEnvelopedData(wc_PKCS7* pkcs7, byte* in,
} }
if (ret != 0) { if (ret != 0) {
if (ret != WC_PKCS7_WANT_READ_E) {
/* free up in an error case if not looking for more data */
wc_PKCS7_DecryptContentFree(pkcs7, encOID, pkcs7->heap);
}
break; break;
} }
wc_PKCS7_DecryptContentFree(pkcs7, encOID, pkcs7->heap); wc_PKCS7_DecryptContentFree(pkcs7, encOID, pkcs7->heap);