b91ce5d4d5
* bmo#1910071 - Copy original corpus to heap-allocated buffer
* bmo#1910079 - Fix min ssl version for DTLS client fuzzer
* bmo#1908990 - Remove OS2 support just like we did on NSPR
* bmo#1910605 - clang-format NSS improvements
* bmo#1902078 - Adding basicutil.h to use HexString2SECItem function
* bmo#1908990 - removing dirent.c from build
* bmo#1902078 - Allow handing in keymaterial to shlibsign to make
the output reproducible
* bmo#1908990 - remove nec4.3, sunos4, riscos and SNI references
* bmo#1908990 - remove other old OS (BSDI, old HP UX, NCR,
openunix, sco, unixware or reliantUnix
* bmo#1908990 - remove mentions of WIN95
* bmo#1908990 - remove mentions of WIN16
* bmo#1913750 - More explicit directory naming
* bmo#1913755 - Add more options to TLS server fuzz target
* bmo#1913675 - Add more options to TLS client fuzz target
* bmo#1835240 - Use OSS-Fuzz corpus in NSS CI
* bmo#1908012 - set nssckbi version number to 2.70.
* bmo#1914499 - Remove Email Trust bit from ACCVRAIZ1 root cert.
* bmo#1908009 - Remove Email Trust bit from certSIGN ROOT CA.
* bmo#1908006 - Add Cybertrust Japan Roots to NSS.
* bmo#1908004 - Add Taiwan CA Roots to NSS.
* bmo#1911354 - remove search by decoded serial in
nssToken_FindCertificateByIssuerAndSerialNumber
* bmo#1913132 - Fix tstclnt CI build failure
* bmo#1913047 - vfyserv: ensure peer cert chain is in db for
CERT_VerifyCertificateNow
* bmo#1912427 - Enable all supported protocol versions for UDP
* bmo#1910361 - Actually use random PSK hash type
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nss?expand=0&rev=457
53 lines
1.4 KiB
Diff
53 lines
1.4 KiB
Diff
commit 3ab80b72e85583bd727730bc5b57f91e07b89710
|
|
Author: Hans Petter Jansson <hpj@cl.no>
|
|
Date: Fri Sep 4 13:41:34 2020 +0200
|
|
|
|
Patch 38: nss-fips-stricter-dh.patch
|
|
|
|
Index: nss/lib/freebl/dh.c
|
|
===================================================================
|
|
--- nss.orig/lib/freebl/dh.c
|
|
+++ nss/lib/freebl/dh.c
|
|
@@ -449,7 +449,7 @@ cleanup:
|
|
PRBool
|
|
KEA_Verify(SECItem *Y, SECItem *prime, SECItem *subPrime)
|
|
{
|
|
- mp_int p, q, y, r;
|
|
+ mp_int p, q, y, r, psub1;
|
|
mp_err err;
|
|
int cmp = 1; /* default is false */
|
|
if (!Y || !prime || !subPrime) {
|
|
@@ -460,13 +460,24 @@ KEA_Verify(SECItem *Y, SECItem *prime, S
|
|
MP_DIGITS(&q) = 0;
|
|
MP_DIGITS(&y) = 0;
|
|
MP_DIGITS(&r) = 0;
|
|
+ MP_DIGITS(&psub1) = 0;
|
|
CHECK_MPI_OK(mp_init(&p));
|
|
CHECK_MPI_OK(mp_init(&q));
|
|
CHECK_MPI_OK(mp_init(&y));
|
|
CHECK_MPI_OK(mp_init(&r));
|
|
+ CHECK_MPI_OK(mp_init(&psub1));
|
|
SECITEM_TO_MPINT(*prime, &p);
|
|
SECITEM_TO_MPINT(*subPrime, &q);
|
|
SECITEM_TO_MPINT(*Y, &y);
|
|
+
|
|
+ CHECK_MPI_OK(mp_sub_d(&p, 1, &psub1));
|
|
+
|
|
+ if (mp_cmp_d(&y, 1) <= 0 ||
|
|
+ mp_cmp(&y, &psub1) >= 0) {
|
|
+ err = MP_BADARG;
|
|
+ goto cleanup;
|
|
+ }
|
|
+
|
|
/* compute r = y**q mod p */
|
|
CHECK_MPI_OK(mp_exptmod(&y, &q, &p, &r));
|
|
/* compare to 1 */
|
|
@@ -476,6 +487,7 @@ cleanup:
|
|
mp_clear(&q);
|
|
mp_clear(&y);
|
|
mp_clear(&r);
|
|
+ mp_clear(&psub1);
|
|
if (err) {
|
|
MP_TO_SEC_ERROR(err);
|
|
return PR_FALSE;
|