wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-08-11 08:01:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

dsa: gate CheckDsaLN on err==MP_OKAY in _DsaImportParamsRaw

Browse Source 
The (L,N) size check ran unconditionally, so after an earlier failure it
overwrote the specific error (e.g. DH_CHECK_PUB_E from the p primality
check) with BAD_FUNC_ARG, and computed qSz from a q that was never read
(the q read is itself gated on err==MP_OKAY). Gate the size check the same
way as the surrounding steps so the first, most specific error is returned.
This commit is contained in:
Daniele Lacamera
2026-07-10 08:37:02 +02:00
parent 600880a0a4
commit 30ceba03c5
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wolfcrypt/src/dsa.c
+10 -6
View File
@@ -546,13 +546,17 @@ static int _DsaImportParamsRaw(DsaKey* dsa, const char* p, const char* q,
if (err == MP_OKAY) if (err == MP_OKAY)
err = mp_read_radix(&dsa->g, g, MP_RADIX_HEX); err = mp_read_radix(&dsa->g, g, MP_RADIX_HEX);
/* verify (L,N) pair bit lengths */ /* verify (L,N) pair bit lengths - only when the reads above succeeded, so
pSz = mp_unsigned_bin_size(&dsa->p); * a more specific earlier error (e.g. DH_CHECK_PUB_E from the primality
qSz = mp_unsigned_bin_size(&dsa->q); * check) is not overwritten and qSz is not read from an unset q. */
if (err == MP_OKAY) {
pSz = mp_unsigned_bin_size(&dsa->p);
qSz = mp_unsigned_bin_size(&dsa->q);
if (CheckDsaLN(pSz * WOLFSSL_BIT_SIZE, qSz * WOLFSSL_BIT_SIZE) != 0) { if (CheckDsaLN(pSz * WOLFSSL_BIT_SIZE, qSz * WOLFSSL_BIT_SIZE) != 0) {
WOLFSSL_MSG("Invalid DSA p or q parameter size"); WOLFSSL_MSG("Invalid DSA p or q parameter size");
err = BAD_FUNC_ARG; err = BAD_FUNC_ARG;
}
} }
if (err != MP_OKAY) { if (err != MP_OKAY) {