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

Fixes for release

Browse Source
This commit is contained in:
Eric Blankenhorn
2023-12-13 13:51:02 -06:00
parent 8acee813cb
commit 1d7fd42aa8
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wolfcrypt/src/asn.c
View File

@ -32504,7 +32504,7 @@ static int EccSpecifiedECDomainDecode(const byte* input, word32 inSz,
} }
} }
if (curveSz) { if ((ret == 0) && (curveSz)) {
*curveSz = curve->size; *curveSz = curve->size;
} }

7
wolfcrypt/src/pkcs7.c
View File

@ -11825,6 +11825,10 @@ WOLFSSL_API int wc_PKCS7_DecodeAuthEnvelopedData(PKCS7* pkcs7, byte* in,
} }
#endif #endif
#ifndef WOLFSSL_SMALL_STACK
XMEMSET(decryptedKey, 0, MAX_ENCRYPTED_KEY_SZ);
#endif
switch (pkcs7->state) { switch (pkcs7->state) {
case WC_PKCS7_START: case WC_PKCS7_START:
case WC_PKCS7_INFOSET_START: case WC_PKCS7_INFOSET_START:
@ -11856,6 +11860,9 @@ WOLFSSL_API int wc_PKCS7_DecodeAuthEnvelopedData(PKCS7* pkcs7, byte* in,
ret = MEMORY_E; ret = MEMORY_E;
break; break;
} }
else {
XMEMSET(decryptedKey, 0, MAX_ENCRYPTED_KEY_SZ);
}
#ifndef NO_PKCS7_STREAM #ifndef NO_PKCS7_STREAM
pkcs7->stream->key = decryptedKey; pkcs7->stream->key = decryptedKey;
#endif #endif