WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3635 from SparkiDev/hmac_openssl_fix 

HMAC OpenSSL API: initialise HMAC ctx on new and allow key length of 0
pull/3676/head
toddouska 2021-01-21 15:57:30 -08:00 committed by GitHub
parent a8cfc23683 129f3fd13f
commit 1acd6dfab2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/ssl.c
View File

@ -33321,8 +33321,12 @@ int wolfSSL_RSA_GenAdd(WOLFSSL_RSA* rsa)
WOLFSSL_HMAC_CTX* wolfSSL_HMAC_CTX_new(void)
{
return (WOLFSSL_HMAC_CTX*)XMALLOC(sizeof(WOLFSSL_HMAC_CTX), NULL,
DYNAMIC_TYPE_OPENSSL);
WOLFSSL_HMAC_CTX* hmac_ctx = (WOLFSSL_HMAC_CTX*)XMALLOC(
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)
@ -33560,6 +33564,7 @@ int wolfSSL_HMAC_Init(WOLFSSL_HMAC_CTX* ctx, const void* key, int keylen,
{
int hmac_error = 0;
void* heap = NULL;
int inited;
WOLFSSL_MSG("wolfSSL_HMAC_Init");
@ -33653,11 +33658,13 @@ int wolfSSL_HMAC_Init(WOLFSSL_HMAC_CTX* ctx, const void* key, int keylen,
}
}
/* Make sure and free if needed */
if (ctx->hmac.macType != WC_HASH_TYPE_NONE) {
/* Check if init has been called before */
inited = (ctx->hmac.macType != WC_HASH_TYPE_NONE);
/* Free if needed */
if (inited) {
wc_HmacFree(&ctx->hmac);
}
if (key && keylen) {
if (key != NULL) {
WOLFSSL_MSG("keying hmac");
if (wc_HmacInit(&ctx->hmac, NULL, INVALID_DEVID) == 0) {
@ -33674,6 +33681,9 @@ int wolfSSL_HMAC_Init(WOLFSSL_HMAC_CTX* ctx, const void* key, int keylen,
}
/* OpenSSL compat, no error */
}
else if (!inited) {
return WOLFSSL_FAILURE;
}
else if (ctx->type >= 0) { /* MD5 == 0 */
WOLFSSL_MSG("recover hmac");
if (wc_HmacInit(&ctx->hmac, NULL, INVALID_DEVID) == 0) {