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

Merge pull request #2839 from ejohnstown/hmac-init

Browse Source 
HMAC Init
This commit is contained in:
toddouska
2020-03-06 11:05:30 -08:00
committed by GitHub
parent ab8bfc241d 9fe2ddacf4
commit 87ff2fa47d
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wolfcrypt/src/hmac.c
View File

@ -293,10 +293,16 @@ int wc_HmacSetKey(Hmac* hmac, int type, const byte* key, word32 length)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
#ifndef HAVE_FIPS
/* 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 */
if (hmac->macType != 0) { /* This is for async and PIC32MZ situations, and just normally OK,
provided the user calls wc_HmacInit() first. That function is not
available in FIPS builds. In current FIPS builds, the hashes are
not allocating resources. */
if (hmac->macType != WC_HASH_TYPE_NONE) {
wc_HmacFree(hmac); wc_HmacFree(hmac);
} }
#endif
hmac->innerHashKeyed = 0; hmac->innerHashKeyed = 0;
hmac->macType = (byte)type; hmac->macType = (byte)type;
@ -979,6 +985,7 @@ int wc_HmacInit(Hmac* hmac, void* heap, int devId)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
XMEMSET(hmac, 0, sizeof(Hmac)); XMEMSET(hmac, 0, sizeof(Hmac));
hmac->macType = WC_HASH_TYPE_NONE;
hmac->heap = heap; hmac->heap = heap;
#ifdef WOLF_CRYPTO_CB #ifdef WOLF_CRYPTO_CB
hmac->devId = devId; hmac->devId = devId;