Skip to content

Commit 2cf1253

Browse files
committed
fix out-of-order ForceZero()s in wc_HKDF_Extract(), wc_HKDF_Expand(), and wc_SSH_KDF() (fixes 844e961).
1 parent 9160ac0 commit 2cf1253

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

wolfcrypt/src/hmac.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1279,8 +1279,8 @@ int wolfSSL_GetHmacMaxSize(void)
12791279
ret = wc_HmacUpdate(&myHmac, inKey, inKeySz);
12801280
if (ret == 0)
12811281
ret = wc_HmacFinal(&myHmac, out);
1282-
ForceZero(&myHmac, sizeof(myHmac));
12831282
wc_HmacFree(&myHmac);
1283+
ForceZero(&myHmac, sizeof(myHmac));
12841284
}
12851285

12861286
return ret;
@@ -1345,8 +1345,8 @@ int wolfSSL_GetHmacMaxSize(void)
13451345
n++;
13461346
}
13471347

1348-
ForceZero(&myHmac, sizeof(myHmac));
13491348
wc_HmacFree(&myHmac);
1349+
ForceZero(&myHmac, sizeof(myHmac));
13501350

13511351
return ret;
13521352
}

wolfcrypt/src/kdf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -734,8 +734,8 @@ int wc_SSH_KDF(byte hashId, byte keyId, byte* key, word32 keySz,
734734
}
735735
}
736736

737-
ForceZero(&hash, sizeof(hash));
738737
_HashFree(enmhashId, &hash);
738+
ForceZero(&hash, sizeof(hash));
739739

740740
return ret;
741741
}

0 commit comments

Comments
 (0)