Skip to content

Commit 031c874

Browse files
authored
Merge pull request wolfSSL#9892 from embhorn/f380-381-382
Hardening in wc_MakeDsaKey and wc_FreeDsaKey
2 parents 396b5ec + 355081b commit 031c874

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

wolfcrypt/src/dsa.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,7 @@ void wc_FreeDsaKey(DsaKey* key)
8585
if (key == NULL)
8686
return;
8787

88-
if (key->type == DSA_PRIVATE)
89-
mp_forcezero(&key->x);
90-
91-
mp_clear(&key->x);
88+
mp_forcezero(&key->x);
9289
mp_clear(&key->y);
9390
mp_clear(&key->g);
9491
mp_clear(&key->q);
@@ -227,10 +224,11 @@ int wc_MakeDsaKey(WC_RNG *rng, DsaKey *dsa)
227224
dsa->type = DSA_PRIVATE;
228225

229226
if (err != MP_OKAY) {
230-
mp_clear(&dsa->x);
227+
mp_forcezero(&dsa->x);
231228
mp_clear(&dsa->y);
232229
}
233230

231+
ForceZero(cBuf, (word32)cSz);
234232
#if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC)
235233
XFREE(cBuf, dsa->heap, DYNAMIC_TYPE_TMP_BUFFER);
236234
if (tmpQ != NULL) {

0 commit comments

Comments
 (0)