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

Merge pull request #4544 from dgarske/hmachash

Browse Source
This commit is contained in:
John Safranek
2021-11-05 15:11:07 -07:00
committed by GitHub
parent ba291b519d 7fca031346
commit d46b140250
2 changed files with 7 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
wolfcrypt/src/hmac.c
View File

@ -1083,6 +1083,10 @@ void wc_HmacFree(Hmac* hmac)
}
#endif
#if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_HMAC)
wolfAsync_DevCtxFree(&hmac->asyncDev, WOLFSSL_ASYNC_MARKER_HMAC);
#endif /* WOLFSSL_ASYNC_CRYPT */
switch (hmac->macType) {
#ifndef NO_MD5
case WC_MD5:
@ -1144,48 +1148,6 @@ void wc_HmacFree(Hmac* hmac)
default:
break;
}
#if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_HMAC)
wolfAsync_DevCtxFree(&hmac->asyncDev, WOLFSSL_ASYNC_MARKER_HMAC);
#endif /* WOLFSSL_ASYNC_CRYPT */
switch (hmac->macType) {
#ifndef NO_MD5
case WC_MD5:
wc_Md5Free(&hmac->hash.md5);
break;
#endif /* !NO_MD5 */
#ifndef NO_SHA
case WC_SHA:
wc_ShaFree(&hmac->hash.sha);
break;
#endif /* !NO_SHA */
#ifdef WOLFSSL_SHA224
case WC_SHA224:
wc_Sha224Free(&hmac->hash.sha224);
break;
#endif /* WOLFSSL_SHA224 */
#ifndef NO_SHA256
case WC_SHA256:
wc_Sha256Free(&hmac->hash.sha256);
break;
#endif /* !NO_SHA256 */
#ifdef WOLFSSL_SHA512
#ifdef WOLFSSL_SHA384
case WC_SHA384:
wc_Sha384Free(&hmac->hash.sha384);
break;
#endif /* WOLFSSL_SHA384 */
case WC_SHA512:
wc_Sha512Free(&hmac->hash.sha512);
break;
#endif /* WOLFSSL_SHA512 */
default:
break;
}
}
#endif /* WOLFSSL_KCAPI_HMAC */

6
wolfssl/wolfcrypt/hmac.h
View File

@ -115,7 +115,7 @@ enum {
#endif
/* hash union */
/* hmac hash union */
typedef union {
#ifndef NO_MD5
wc_Md5 md5;
@ -138,11 +138,11 @@ typedef union {
#ifdef WOLFSSL_SHA3
wc_Sha3 sha3;
#endif
} wc_Hmac_Hash;
} wc_HmacHash;
/* Hmac digest */
struct Hmac {
wc_Hmac_Hash hash;
wc_HmacHash hash;
word32 ipad[WC_HMAC_BLOCK_SIZE / sizeof(word32)]; /* same block size all*/
word32 opad[WC_HMAC_BLOCK_SIZE / sizeof(word32)];
word32 innerHash[WC_MAX_DIGEST_SIZE / sizeof(word32)];