Skip to content

Hardening in GeneratePrivateDh186 and wc_DhImportKeyPair #9895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
douzzer merged 2 commits into from
Mar 7, 2026
Merged

Hardening in GeneratePrivateDh186 and wc_DhImportKeyPair #9895

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
296493a
f283 harden GeneratePrivateDh186
embhorn Mar 5, 2026
203cce4
f287 harden wc_DhImportKeyPair
embhorn Mar 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions wolfcrypt/src/dh.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1157,8 +1157,9 @@ static int GeneratePrivateDh186(DhKey* key, WC_RNG* rng, byte* priv,
if (err == MP_OKAY)
err = mp_read_unsigned_bin(tmpX, cBuf, cSz);
if (err != MP_OKAY) {
mp_clear(tmpX);
mp_forcezero(tmpX);
Comment thread
embhorn marked this conversation as resolved.
mp_clear(tmpQ);
ForceZero(cBuf, cSz);
#if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC)
XFREE(cBuf, key->heap, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(tmpQ, key->heap, DYNAMIC_TYPE_DH);
Expand Down Expand Up @@ -2403,7 +2404,7 @@ int wc_DhImportKeyPair(DhKey* key, const byte* priv, word32 privSz,
}
if (havePriv) {
if (mp_read_unsigned_bin(&key->priv, priv, privSz) != MP_OKAY) {
mp_clear(&key->priv);
mp_forcezero(&key->priv);
havePriv = 0;
Comment thread
embhorn marked this conversation as resolved.
} else {
WOLFSSL_MSG("DH Private Key Set");
Expand Down