Backed out changeset 94ca8dafa006 (bug 1720464) for Browser-chrome fa…

…ilures in browser/base/content/test/performance/browser_startup_mainthreadio.js. UPGRADE_NSS_RELEASE CLOSED TREE
dothq · Jul 22, 2021 · df0ba03 · df0ba03
1 parent 91127ac
commit df0ba03
Show file tree

Hide file tree

Showing 27 changed files with 99 additions and 518 deletions.
diff --git a/security/nss/TAG-INFO b/security/nss/TAG-INFO
@@ -1 +1 @@
-8f41147c2192
+b1eac8c86e99
diff --git a/security/nss/cmd/manifest.mn b/security/nss/cmd/manifest.mn
@@ -65,7 +65,6 @@ NSS_SRCDIRS = \
  pwdecrypt \
  rsaperf \
  rsapoptst \
- sdbthreadtst \
  sdrtest \
  selfserv  \
  signtool \

diff --git a/security/nss/cmd/sdbthreadtst/Makefile b/security/nss/cmd/sdbthreadtst/Makefile
diff --git a/security/nss/cmd/sdbthreadtst/manifest.mn b/security/nss/cmd/sdbthreadtst/manifest.mn
diff --git a/security/nss/cmd/sdbthreadtst/sdbthreadtst.c b/security/nss/cmd/sdbthreadtst/sdbthreadtst.c
diff --git a/security/nss/cmd/sdbthreadtst/sdbthreadtst.gyp b/security/nss/cmd/sdbthreadtst/sdbthreadtst.gyp
diff --git a/security/nss/coreconf/coreconf.dep b/security/nss/coreconf/coreconf.dep
@@ -10,4 +10,3 @@
  */
 
 #error "Do not include this header file."
-
diff --git a/security/nss/doc/rst/index.rst b/security/nss/doc/rst/index.rst
@@ -12,10 +12,6 @@ Network Security Services
    introduction_to_network_security_services/index.rst
    More documentation <more_docs>
 
-
-.. warning::
-   This NSS documentation was just imported from our legacy MDN repository. It currently is very deprecated and likely incorrect or broken in many places.
-
 `Documentation <#documentation>`__
 ----------------------------------
 

diff --git a/security/nss/gtests/softoken_gtest/softoken_dh_vectors.h b/security/nss/gtests/softoken_gtest/softoken_dh_vectors.h
@@ -2872,7 +2872,7 @@ static const DhTestVector DH_TEST_VECTORS[] = {
      {siBuffer, (unsigned char *)g2, sizeof(g2)},
      {siBuffer, NULL, 0},
      {siBuffer, NULL, 0},
-     SAFE_PRIME,
+     IKE_APPROVED,
      CLASS_1536},
     {"IKE 2048",
      {siBuffer, (unsigned char *)prime_ike_2048, sizeof(prime_ike_2048)},
@@ -2952,7 +2952,7 @@ static const DhTestVector DH_TEST_VECTORS[] = {
      {siBuffer, (unsigned char *)sub2_prime_ike_1536,
       sizeof(sub2_prime_ike_1536)},
      {siBuffer, NULL, 0},
-     SAFE_PRIME,
+     IKE_APPROVED,
      CLASS_1536},
     {"IKE 2048 with subprime",
      {siBuffer, (unsigned char *)prime_ike_2048, sizeof(prime_ike_2048)},

diff --git a/security/nss/lib/pk11wrap/pk11cxt.c b/security/nss/lib/pk11wrap/pk11cxt.c
@@ -382,7 +382,7 @@ pk11_CreateNewContextInSlot(CK_MECHANISM_TYPE type,
      * of the connection.*/
     context->fortezzaHack = PR_FALSE;
     if (type == CKM_SKIPJACK_CBC64) {
-        if (symKey && (symKey->origin == PK11_OriginFortezzaHack)) {
+        if (symKey->origin == PK11_OriginFortezzaHack) {
             context->fortezzaHack = PR_TRUE;
         }
     }

diff --git a/security/nss/lib/pk11wrap/pk11hpke.c b/security/nss/lib/pk11wrap/pk11hpke.c
@@ -1164,6 +1164,8 @@ PK11_HPKE_Seal(HpkeContext *cx, const SECItem *aad, const SECItem *pt,
     unsigned char tagBuf[HASH_LENGTH_MAX];
     size_t tagLen;
     unsigned int fixedBits;
+    PORT_Assert(cx->baseNonce->len == sizeof(ivOut));
+    PORT_Memcpy(ivOut, cx->baseNonce->data, cx->baseNonce->len);
 
     /* aad may be NULL, PT may be zero-length but not NULL. */
     if (!cx || !cx->aeadContext ||
@@ -1174,9 +1176,6 @@ PK11_HPKE_Seal(HpkeContext *cx, const SECItem *aad, const SECItem *pt,
         return SECFailure;
     }
 
-    PORT_Assert(cx->baseNonce->len == sizeof(ivOut));
-    PORT_Memcpy(ivOut, cx->baseNonce->data, cx->baseNonce->len);
-
     tagLen = cx->aeadParams->tagLen;
     maxOut = pt->len + tagLen;
     fixedBits = (cx->baseNonce->len - 8) * 8;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,4 +10,3 @@
		*/

		#error "Do not include this header file."