DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

wolfSSL: Use wc_HmacInit() to avoid potential use of uninitialized values

Browse source 
wc_HmacSetKey() seems to initialize everything that is needed for the
actual operation, but at least valgrind is reporting use of
uninitialized values when this was done on a data structure that was not
explicitly cleared.

Call wc_HmacInit() before wc_HmacSetKey() to avoid any unexpected
behavior from potentially uninitialized values.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2022-04-23 15:45:31 +03:00
parent f7be558d69
commit e7dd0fff1d
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/crypto/crypto_wolfssl.c
View file

@ -169,7 +169,8 @@ static int wolfssl_hmac_vector(int type, const u8 *key,
if (TEST_FAIL())
return -1;
if (wc_HmacSetKey(&hmac, type, key, (word32) key_len) != 0)
if (wc_HmacInit(&hmac, NULL, INVALID_DEVID) != 0 ||
wc_HmacSetKey(&hmac, type, key, (word32) key_len) != 0)
return -1;
for (i = 0; i < num_elem; i++)
if (wc_HmacUpdate(&hmac, addr[i], len[i]) != 0)
@ -933,7 +934,8 @@ struct crypto_hash * crypto_hash_init(enum crypto_hash_alg alg, const u8 *key,
goto done;
}
if (wc_HmacSetKey(&hash->hmac, type, key, key_len) != 0)
if (wc_HmacInit(&hash->hmac, NULL, INVALID_DEVID) != 0 ||
wc_HmacSetKey(&hash->hmac, type, key, key_len) != 0)
goto done;
ret = hash;