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
128 lines
4.4 KiB
Diff
128 lines
4.4 KiB
Diff
# HG changeset patch
|
|
# Parent 5786c2bb5c229b530e95e435ee0cf51314359e7b
|
|
|
|
Index: nss/lib/softoken/pkcs11c.c
|
|
===================================================================
|
|
--- nss.orig/lib/softoken/pkcs11c.c
|
|
+++ nss/lib/softoken/pkcs11c.c
|
|
@@ -5132,6 +5132,88 @@ pairwise_signverify_mech (CK_SESSION_HAN
|
|
return crv;
|
|
}
|
|
|
|
+/* This function regenerates a public key from a private key
|
|
+ * (not simply returning the saved public key) and compares it
|
|
+ * to the given publicKey
|
|
+ */
|
|
+static CK_RV
|
|
+regeneratePublicKeyFromPrivateKeyAndCompare(NSSLOWKEYPrivateKey *currPrivKey,
|
|
+ NSSLOWKEYPublicKey *currPubKey)
|
|
+{
|
|
+ NSSLOWKEYPublicKey *pubk;
|
|
+ SECItem publicValue;
|
|
+ PLArenaPool *arena;
|
|
+
|
|
+ arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
|
|
+ if (arena == NULL) {
|
|
+ PORT_SetError(SEC_ERROR_NO_MEMORY);
|
|
+ return CKR_HOST_MEMORY;
|
|
+ }
|
|
+
|
|
+ switch (currPrivKey->keyType) {
|
|
+ case NSSLOWKEYDHKey:
|
|
+ pubk = (NSSLOWKEYPublicKey *)PORT_ArenaZAlloc(arena,
|
|
+ sizeof(NSSLOWKEYPublicKey));
|
|
+ if (pubk != NULL) {
|
|
+ SECStatus rv;
|
|
+
|
|
+ pubk->arena = arena;
|
|
+ pubk->keyType = currPrivKey->keyType;
|
|
+
|
|
+ // Regenerate the publicValue
|
|
+ rv = DH_Derive(&currPrivKey->u.dh.base, &currPrivKey->u.dh.prime,
|
|
+ &currPrivKey->u.dh.privateValue, &publicValue, 0);
|
|
+ if (rv != SECSuccess) {
|
|
+ break;
|
|
+ }
|
|
+ rv = SECITEM_CopyItem(arena, &pubk->u.dh.publicValue,
|
|
+ &publicValue);
|
|
+ SECITEM_ZfreeItem(&publicValue, PR_FALSE);
|
|
+ if (rv != SECSuccess) {
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ if (SECITEM_CompareItem(&pubk->u.dh.publicValue, &currPubKey->u.dh.publicValue) != SECEqual) {
|
|
+ nsslowkey_DestroyPublicKey(pubk);
|
|
+ return CKR_GENERAL_ERROR;
|
|
+ }
|
|
+ nsslowkey_DestroyPublicKey(pubk);
|
|
+ return CKR_OK;
|
|
+ }
|
|
+ break;
|
|
+ case NSSLOWKEYECKey:
|
|
+ {
|
|
+ ECPrivateKey *privk = NULL;
|
|
+ SECStatus rv;
|
|
+
|
|
+ /* The "seed" is an octet stream corresponding to our private key.
|
|
+ * The new public key is derived from this + the parameters and
|
|
+ * stored in the new private key's publicValue. */
|
|
+ rv = EC_NewKeyFromSeed (&currPrivKey->u.ec.ecParams,
|
|
+ &privk,
|
|
+ currPrivKey->u.ec.privateValue.data,
|
|
+ currPrivKey->u.ec.privateValue.len);
|
|
+ if (rv != SECSuccess)
|
|
+ break;
|
|
+
|
|
+ /* Verify that the passed-in public value is equal to the one derived */
|
|
+ if (SECITEM_CompareItem (&privk->publicValue, &currPubKey->u.ec.publicValue) != SECEqual) {
|
|
+ PORT_FreeArena (privk->ecParams.arena, PR_TRUE);
|
|
+ return CKR_GENERAL_ERROR;
|
|
+ }
|
|
+
|
|
+ PORT_FreeArena (privk->ecParams.arena, PR_TRUE);
|
|
+ return CKR_OK;
|
|
+ }
|
|
+ break;
|
|
+ default:
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ PORT_FreeArena(arena, PR_TRUE);
|
|
+ return CKR_GENERAL_ERROR;
|
|
+}
|
|
+
|
|
/*
|
|
* FIPS 140-2 pairwise consistency check utilized to validate key pair.
|
|
*
|
|
@@ -5484,6 +5566,30 @@ sftk_PairwiseConsistencyCheck(CK_SESSION
|
|
}
|
|
}
|
|
|
|
+ // Regenerate the publicKey from the privateKey and compare it to the
|
|
+ // original publicKey
|
|
+ if (keyType == CKK_DH || keyType == CKK_EC) {
|
|
+ NSSLOWKEYPrivateKey *currPrivKey = sftk_GetPrivKey(privateKey, CKK_DH, &crv);
|
|
+ if (crv != CKR_OK) {
|
|
+ return crv;
|
|
+ }
|
|
+ if (!currPrivKey) {
|
|
+ return CKR_DEVICE_ERROR;
|
|
+ }
|
|
+
|
|
+ NSSLOWKEYPublicKey *currPubKey = sftk_GetPubKey(publicKey, CKK_DH, &crv);
|
|
+ if (crv != CKR_OK) {
|
|
+ return crv;
|
|
+ }
|
|
+ if (!currPubKey) {
|
|
+ return CKR_DEVICE_ERROR;
|
|
+ }
|
|
+
|
|
+ crv = regeneratePublicKeyFromPrivateKeyAndCompare(currPrivKey, currPubKey);
|
|
+ if (crv != CKR_OK) {
|
|
+ return crv;
|
|
+ }
|
|
+ }
|
|
return CKR_OK;
|
|
}
|
|
|