Skip to content

Fixes issues in SRP component: #9896

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
+17 −17
Merged

Fixes issues in SRP component: #9896

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e21c4d7
f278 fix setting heap in wc_SrpInit_ex
embhorn Mar 5, 2026
f28a660
f281 harden wc_SrpInit
embhorn Mar 5, 2026
25f8d6d
f282 harden wc_SrpComputeKey
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
34 changes: 17 additions & 17 deletions wolfcrypt/src/srp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,13 @@ int wc_SrpInit_ex(Srp* srp, SrpType type, SrpSide side, void* heap, int devId)
/* initializing variables */
XMEMSET(srp, 0, sizeof(Srp));

/* default heap hint to NULL or test value */
#ifdef WOLFSSL_HEAP_TEST
srp->heap = (void*)WOLFSSL_HEAP_TEST;
#else
srp->heap = heap;
#endif /* WOLFSSL_HEAP_TEST */

if ((r = SrpHashInit(&srp->client_proof, type, srp->heap)) != 0)
return r;

Expand All @@ -280,13 +287,6 @@ int wc_SrpInit_ex(Srp* srp, SrpType type, SrpSide side, void* heap, int devId)

srp->keyGenFunc_cb = wc_SrpSetKey;

/* default heap hint to NULL or test value */
#ifdef WOLFSSL_HEAP_TEST
srp->heap = (void*)WOLFSSL_HEAP_TEST;
#else
srp->heap = heap;
#endif /* WOLFSSL_HEAP_TEST */

(void)devId; /* future */

return 0;
Expand All @@ -300,8 +300,8 @@ int wc_SrpInit(Srp* srp, SrpType type, SrpSide side)
void wc_SrpTerm(Srp* srp)
{
if (srp) {
mp_clear(&srp->N); mp_clear(&srp->g);
mp_clear(&srp->auth); mp_clear(&srp->priv);
mp_clear(&srp->N); mp_clear(&srp->g);
mp_forcezero(&srp->auth); mp_forcezero(&srp->priv);
if (srp->salt) {
ForceZero(srp->salt, srp->saltSz);
XFREE(srp->salt, srp->heap, DYNAMIC_TYPE_SRP);
Expand Down Expand Up @@ -908,30 +908,30 @@ int wc_SrpComputeKey(Srp* srp, byte* clientPubKey, word32 clientPubKeySz,
XFREE(digest, srp->heap, DYNAMIC_TYPE_SRP);
if (u) {
if (r != WC_NO_ERR_TRACE(MP_INIT_E))
mp_clear(u);
mp_forcezero(u);
XFREE(u, srp->heap, DYNAMIC_TYPE_SRP);
}
if (s) {
if (r != WC_NO_ERR_TRACE(MP_INIT_E))
mp_clear(s);
mp_forcezero(s);
XFREE(s, srp->heap, DYNAMIC_TYPE_SRP);
}
if (temp1) {
if (r != WC_NO_ERR_TRACE(MP_INIT_E))
mp_clear(temp1);
mp_forcezero(temp1);
XFREE(temp1, srp->heap, DYNAMIC_TYPE_SRP);
}
if (temp2) {
if (r != WC_NO_ERR_TRACE(MP_INIT_E))
mp_clear(temp2);
mp_forcezero(temp2);
XFREE(temp2, srp->heap, DYNAMIC_TYPE_SRP);
}
#else
if (r != WC_NO_ERR_TRACE(MP_INIT_E)) {
mp_clear(u);
mp_clear(s);
mp_clear(temp1);
mp_clear(temp2);
mp_forcezero(u);
mp_forcezero(s);
mp_forcezero(temp1);
mp_forcezero(temp2);
}
#endif

Expand Down