Skip to content

Fix NSS random failures #133

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
LinuxJedi merged 2 commits into from
Aug 20, 2025
Merged

Fix NSS random failures #133

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e9e8f8
Fix NSS random failures
mattia-moffa Aug 12, 2025
ceda20e
Ensure PSS_SALTLEN_E is always treated as failed verification
mattia-moffa Aug 12, 2025
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
19 changes: 7 additions & 12 deletions src/internal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10347,15 +10347,10 @@ int WP11_RsaPKCSPSS_Verify(unsigned char* sig, word32 sigLen,
pss->hashType, pss->saltLen, 0);
if (ret == 0)
*stat = 1;
/* Both can indicate that the verification failed */
if (ret == BAD_PADDING_E || ret == PSS_SALTLEN_E) {
*stat = 0;
ret = 0;
}
}
/* Make sure bad padding returns success, but verify failed.
/* Make sure bad padding/salt length returns success, but verify failed.
* Calling code expects this. */
if (ret == BAD_PADDING_E) {
if (ret == BAD_PADDING_E || ret == PSS_SALTLEN_E) {
ret = 0;
*stat = 0;
}
Expand Down Expand Up @@ -10716,7 +10711,7 @@ int WP11_EC_Derive(unsigned char* point, word32 pointLen, unsigned char* key,
ecc_key pubKey;
unsigned char* x963Data = point;
word32 x963Len = pointLen;
int dataLen;
word32 expectedPointLen;
int i = 0;
#if defined(ECC_TIMING_RESISTANT) && (!defined(HAVE_FIPS) || \
(defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION > 2)))
Expand All @@ -10738,13 +10733,13 @@ int WP11_EC_Derive(unsigned char* point, word32 pointLen, unsigned char* key,
}
}
if (i < (int)pointLen) {
dataLen = point[i++];
if (dataLen == (int)(pointLen - i)) {
expectedPointLen = priv->data.ecKey->dp->size * 2 + 1;
if (pointLen > expectedPointLen) {
x963Len = point[i++];
x963Data = point + i;
x963Len = dataLen;
}
else {
/* Length mismatch, treat as raw X9.63 data */
/* Treat as raw X9.63 data */
x963Data = point;
x963Len = pointLen;
}
Expand Down
Loading