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

HMAC OpenSSL API: initialise HMAC ctx on new and allow key length of 0

Browse Source
This commit is contained in:
Sean Parkinson
2021-01-07 17:20:47 +10:00
parent 88faef9bd9
commit 129f3fd13f
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/ssl.c
View File

@ -33297,8 +33297,12 @@ int wolfSSL_RSA_GenAdd(WOLFSSL_RSA* rsa)
WOLFSSL_HMAC_CTX* wolfSSL_HMAC_CTX_new(void) WOLFSSL_HMAC_CTX* wolfSSL_HMAC_CTX_new(void)
{ {
return (WOLFSSL_HMAC_CTX*)XMALLOC(sizeof(WOLFSSL_HMAC_CTX), NULL, WOLFSSL_HMAC_CTX* hmac_ctx = (WOLFSSL_HMAC_CTX*)XMALLOC(
DYNAMIC_TYPE_OPENSSL); sizeof(WOLFSSL_HMAC_CTX), NULL, DYNAMIC_TYPE_OPENSSL);
if (hmac_ctx != NULL) {
XMEMSET(hmac_ctx, 0, sizeof(WOLFSSL_HMAC_CTX));
}
return hmac_ctx;
} }
int wolfSSL_HMAC_CTX_Init(WOLFSSL_HMAC_CTX* ctx) int wolfSSL_HMAC_CTX_Init(WOLFSSL_HMAC_CTX* ctx)
@ -33536,6 +33540,7 @@ int wolfSSL_HMAC_Init(WOLFSSL_HMAC_CTX* ctx, const void* key, int keylen,
{ {
int hmac_error = 0; int hmac_error = 0;
void* heap = NULL; void* heap = NULL;
int inited;
WOLFSSL_MSG("wolfSSL_HMAC_Init"); WOLFSSL_MSG("wolfSSL_HMAC_Init");
@ -33629,11 +33634,13 @@ int wolfSSL_HMAC_Init(WOLFSSL_HMAC_CTX* ctx, const void* key, int keylen,
} }
} }
/* Make sure and free if needed */ /* Check if init has been called before */
if (ctx->hmac.macType != WC_HASH_TYPE_NONE) { inited = (ctx->hmac.macType != WC_HASH_TYPE_NONE);
/* Free if needed */
if (inited) {
wc_HmacFree(&ctx->hmac); wc_HmacFree(&ctx->hmac);
} }
if (key && keylen) { if (key != NULL) {
WOLFSSL_MSG("keying hmac"); WOLFSSL_MSG("keying hmac");
if (wc_HmacInit(&ctx->hmac, NULL, INVALID_DEVID) == 0) { if (wc_HmacInit(&ctx->hmac, NULL, INVALID_DEVID) == 0) {
@ -33650,6 +33657,9 @@ int wolfSSL_HMAC_Init(WOLFSSL_HMAC_CTX* ctx, const void* key, int keylen,
} }
/* OpenSSL compat, no error */ /* OpenSSL compat, no error */
} }
else if (!inited) {
return WOLFSSL_FAILURE;
}
else if (ctx->type >= 0) { /* MD5 == 0 */ else if (ctx->type >= 0) { /* MD5 == 0 */
WOLFSSL_MSG("recover hmac"); WOLFSSL_MSG("recover hmac");
if (wc_HmacInit(&ctx->hmac, NULL, INVALID_DEVID) == 0) { if (wc_HmacInit(&ctx->hmac, NULL, INVALID_DEVID) == 0) {