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

Fixes for PKCS7 with crypto callback (deviceId), where it was not being used for RSA and RNG. ZD 11163.

Browse Source
This commit is contained in:
David Garske
2021-01-28 09:52:13 -08:00
parent 311a0d25dd
commit 2bd63d27bf
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wolfcrypt/src/pkcs7.c
View File

@ -2845,7 +2845,7 @@ int wc_PKCS7_EncodeSignedFPD(PKCS7* pkcs7, byte* privateKey,
content == NULL || contentSz == 0 || output == NULL || outputSz == 0) content == NULL || contentSz == 0 || output == NULL || outputSz == 0)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
ret = wc_InitRng(&rng); ret = wc_InitRng_ex(&rng, pkcs7->heap, pkcs7->devId);
if (ret != 0) if (ret != 0)
return ret; return ret;
@ -2952,7 +2952,7 @@ int wc_PKCS7_EncodeSignedEncryptedFPD(PKCS7* pkcs7, byte* encryptKey,
XMEMCPY(encrypted, output, encryptedSz); XMEMCPY(encrypted, output, encryptedSz);
ForceZero(output, outputSz); ForceZero(output, outputSz);
ret = wc_InitRng(&rng); ret = wc_InitRng_ex(&rng, pkcs7->heap, pkcs7->devId);
if (ret != 0) { if (ret != 0) {
ForceZero(encrypted, encryptedSz); ForceZero(encrypted, encryptedSz);
XFREE(encrypted, pkcs7->heap, DYNAMIC_TYPE_PKCS7); XFREE(encrypted, pkcs7->heap, DYNAMIC_TYPE_PKCS7);
@ -3050,7 +3050,7 @@ int wc_PKCS7_EncodeSignedCompressedFPD(PKCS7* pkcs7, byte* privateKey,
XMEMCPY(compressed, output, compressedSz); XMEMCPY(compressed, output, compressedSz);
ForceZero(output, outputSz); ForceZero(output, outputSz);
ret = wc_InitRng(&rng); ret = wc_InitRng_ex(&rng, pkcs7->heap, pkcs7->devId);
if (ret != 0) { if (ret != 0) {
ForceZero(compressed, compressedSz); ForceZero(compressed, compressedSz);
XFREE(compressed, pkcs7->heap, DYNAMIC_TYPE_PKCS7); XFREE(compressed, pkcs7->heap, DYNAMIC_TYPE_PKCS7);
@ -3186,7 +3186,7 @@ int wc_PKCS7_EncodeSignedEncryptedCompressedFPD(PKCS7* pkcs7, byte* encryptKey,
XFREE(compressed, pkcs7->heap, DYNAMIC_TYPE_PKCS7); XFREE(compressed, pkcs7->heap, DYNAMIC_TYPE_PKCS7);
ForceZero(output, outputSz); ForceZero(output, outputSz);
ret = wc_InitRng(&rng); ret = wc_InitRng_ex(&rng, pkcs7->heap, pkcs7->devId);
if (ret != 0) { if (ret != 0) {
ForceZero(encrypted, encryptedSz); ForceZero(encrypted, encryptedSz);
XFREE(encrypted, pkcs7->heap, DYNAMIC_TYPE_PKCS7); XFREE(encrypted, pkcs7->heap, DYNAMIC_TYPE_PKCS7);
@ -6450,7 +6450,7 @@ int wc_PKCS7_AddRecipient_KTRI(PKCS7* pkcs7, const byte* cert, word32 certSz,
#endif #endif
/* EncryptedKey */ /* EncryptedKey */
ret = wc_InitRsaKey_ex(pubKey, pkcs7->heap, INVALID_DEVID); ret = wc_InitRsaKey_ex(pubKey, pkcs7->heap, pkcs7->devId);
if (ret != 0) { if (ret != 0) {
FreeDecodedCert(decoded); FreeDecodedCert(decoded);
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
@ -8407,7 +8407,7 @@ static int wc_PKCS7_DecryptKtri(PKCS7* pkcs7, byte* in, word32 inSz,
} }
#endif #endif
ret = wc_InitRsaKey_ex(privKey, pkcs7->heap, INVALID_DEVID); ret = wc_InitRsaKey_ex(privKey, pkcs7->heap, pkcs7->devId);
if (ret != 0) { if (ret != 0) {
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
XFREE(encryptedKey, pkcs7->heap, DYNAMIC_TYPE_TMP_BUFFER); XFREE(encryptedKey, pkcs7->heap, DYNAMIC_TYPE_TMP_BUFFER);