wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8119 from dgarske/async_20241028

Browse Source 
Fixes for asynchronous release - SHA3/HMAC devId
This commit is contained in:
JacobBarthelmeh
2024-10-29 15:11:43 -06:00
committed by GitHub
parent 0ded8ba0c7 ea35b98005
commit 2b8d43cef2
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wolfcrypt/src/hmac.c
View File

@@ -266,6 +266,7 @@ int wc_HmacSetKey_ex(Hmac* hmac, int type, const byte* key, word32 length,
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
heap = hmac->heap;
#if !defined(HAVE_FIPS) || FIPS_VERSION3_GE(6,0,0) #if !defined(HAVE_FIPS) || FIPS_VERSION3_GE(6,0,0)
/* if set key has already been run then make sure and free existing */ /* if set key has already been run then make sure and free existing */
/* This is for async and PIC32MZ situations, and just normally OK, /* This is for async and PIC32MZ situations, and just normally OK,
@@ -273,7 +274,13 @@ int wc_HmacSetKey_ex(Hmac* hmac, int type, const byte* key, word32 length,
available in FIPS builds. In current FIPS builds, the hashes are available in FIPS builds. In current FIPS builds, the hashes are
not allocating resources. */ not allocating resources. */
if (hmac->macType != WC_HASH_TYPE_NONE) { if (hmac->macType != WC_HASH_TYPE_NONE) {
#ifdef WOLF_CRYPTO_CB
int devId = hmac->devId;
#endif
wc_HmacFree(hmac); wc_HmacFree(hmac);
#ifdef WOLF_CRYPTO_CB
hmac->devId = devId;
#endif
} }
#endif #endif

6
wolfcrypt/src/sha3.c
View File

@@ -820,10 +820,10 @@ static int wc_InitSha3(wc_Sha3* sha3, void* heap, int devId)
#if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_SHA3) #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_SHA3)
ret = wolfAsync_DevCtxInit(&sha3->asyncDev, ret = wolfAsync_DevCtxInit(&sha3->asyncDev,
WOLFSSL_ASYNC_MARKER_SHA3, sha3->heap, devId); WOLFSSL_ASYNC_MARKER_SHA3, sha3->heap, devId);
#elif defined(WOLF_CRYPTO_CB) #endif
#if defined(WOLF_CRYPTO_CB)
sha3->devId = devId; sha3->devId = devId;
#endif /* WOLFSSL_ASYNC_CRYPT */ #endif
(void)devId; (void)devId;
return ret; return ret;