Skip to content

Hardening in wc_FreeRsaKey and wc_RsaPrivateKeyDecodeRaw #9893

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 3 commits into from
Mar 7, 2026
+15 −25
Merged

Hardening in wc_FreeRsaKey and wc_RsaPrivateKeyDecodeRaw #9893

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9062b98
Fix f284 harden wc_FreeRsaKey
embhorn Mar 5, 2026
b03a732
Fix f285 harden wc_RsaPrivateKeyDecodeRaw
embhorn Mar 5, 2026
c0a4b94
Fix from review
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
40 changes: 15 additions & 25 deletions wolfcrypt/src/rsa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,27 +564,17 @@ int wc_FreeRsaKey(RsaKey* key)
#endif

#ifndef WOLFSSL_RSA_PUBLIC_ONLY
if (key->type == RSA_PRIVATE) {
/* Forcezero all private key fields that are present in this build
* configuration, since they may contain residual sensitive data even when
* key->type is not RSA_PRIVATE (e.g., after a partial key decode failure). */
#if defined(WOLFSSL_KEY_GEN) || defined(OPENSSL_EXTRA) || !defined(RSA_LOW_MEM)
mp_forcezero(&key->u);
mp_forcezero(&key->dQ);
mp_forcezero(&key->dP);
mp_forcezero(&key->u);
mp_forcezero(&key->dQ);
mp_forcezero(&key->dP);
#endif
mp_forcezero(&key->q);
mp_forcezero(&key->p);
mp_forcezero(&key->d);
}
else {
/* private part */
#if defined(WOLFSSL_KEY_GEN) || defined(OPENSSL_EXTRA) || !defined(RSA_LOW_MEM)
mp_clear(&key->u);
mp_clear(&key->dQ);
mp_clear(&key->dP);
#endif
mp_clear(&key->q);
mp_clear(&key->p);
mp_clear(&key->d);
}
mp_forcezero(&key->q);
mp_forcezero(&key->p);
mp_forcezero(&key->d);
#endif /* WOLFSSL_RSA_PUBLIC_ONLY */

/* public part */
Expand Down Expand Up @@ -5410,13 +5400,13 @@ int wc_RsaPrivateKeyDecodeRaw(const byte* n, word32 nSz,
else if (key != NULL) {
mp_clear(&key->n);
mp_clear(&key->e);
mp_clear(&key->d);
mp_clear(&key->p);
mp_clear(&key->q);
mp_forcezero(&key->d);
mp_forcezero(&key->p);
mp_forcezero(&key->q);
#if defined(WOLFSSL_KEY_GEN) || defined(OPENSSL_EXTRA) || !defined(RSA_LOW_MEM)
mp_clear(&key->u);
mp_clear(&key->dP);
mp_clear(&key->dQ);
mp_forcezero(&key->u);
mp_forcezero(&key->dP);
mp_forcezero(&key->dQ);
#endif
}

Expand Down