Bug 1671713 - land NSS 97751cd6d553 UPGRADE_NSS_RELEASE, r=jcj

2020-11-03 Kevin Jacobs <[email protected]> * gtests/common/testvectors/hmac-sha256-vectors.h, gtests/common/testvectors/hmac-sha384-vectors.h, gtests/common/testvectors/hmac-sha512-vectors.h, gtests/common/testvectors_base/test-structs.h, gtests/pk11_gtest/manifest.mn, gtests/pk11_gtest/pk11_gtest.gyp, gtests/pk11_gtest/pk11_hmac_unittest.cc: Bug 1672823 - Add Wycheproof HMAC test cases. r=jcj [97751cd6d553] [tip] * gtests/common/testvectors/hkdf-sha1-vectors.h, gtests/common/testvectors/hkdf-sha256-vectors.h, gtests/common/testvectors/hkdf-sha384-vectors.h, gtests/common/testvectors/hkdf-sha512-vectors.h, gtests/common/testvectors/hkdf-vectors.h, gtests/common/testvectors_base/test-structs.h, gtests/common/wycheproof/genTestVectors.py, gtests/pk11_gtest/manifest.mn, gtests/pk11_gtest/pk11_hkdf_unittest.cc: Bug 1672823 - Add Wycheproof HKDF test cases. r=bbeurdouche [5a02ca2617cf] * gtests/common/testvectors/dsa-vectors.h, gtests/common/testvectors_base/test-structs.h, gtests/common/wycheproof/genTestVectors.py, gtests/common/wycheproof/source_vectors/dsa_test.json, gtests/pk11_gtest/manifest.mn, gtests/pk11_gtest/pk11_dsa_unittest.cc, gtests/pk11_gtest/pk11_gtest.gyp: Bug 1672823 - Add Wycheproof DSA test cases. r=jcj [3ce42ead87f9] * lib/dev/devslot.c, lib/dev/devt.h: Bug 1663661 - Guard against NULL token in nssSlot_IsTokenPresent. r=jcj This patch addresses locking inconsistency in `nssSlot_IsTokenPresent` by retaining the slot lock for the duration of accesses to `slot->token`. This is already done correctly elsewhere. As a side effect, this introduces an ordering requirement: we take `slot->lock` followed by `session->lock`. [0ed11a5835ac] 2020-10-30 Kevin Jacobs <[email protected]> * lib/pk11wrap/pk11pars.c: Bug 1670835 - Fixup for 6f79a7695812, add missing return value check. r=rrelyea [424974716ef0] Differential Revision: https://phabricator.services.mozilla.com/D96073
dothq · Nov 6, 2020 · 92af1fd · 92af1fd
1 parent ba9ddd4
commit 92af1fd
Show file tree

Hide file tree

Showing 22 changed files with 30,821 additions and 367 deletions.
diff --git a/security/nss/TAG-INFO b/security/nss/TAG-INFO
@@ -1 +1 @@
-035110dfa0b9
+97751cd6d553
diff --git a/security/nss/coreconf/coreconf.dep b/security/nss/coreconf/coreconf.dep
@@ -10,3 +10,4 @@
  */
 
 #error "Do not include this header file."
+
diff --git a/security/nss/gtests/common/testvectors/dsa-vectors.h b/security/nss/gtests/common/testvectors/dsa-vectors.h
diff --git a/security/nss/gtests/common/testvectors/hkdf-sha1-vectors.h b/security/nss/gtests/common/testvectors/hkdf-sha1-vectors.h
diff --git a/security/nss/gtests/common/testvectors/hkdf-sha256-vectors.h b/security/nss/gtests/common/testvectors/hkdf-sha256-vectors.h
diff --git a/security/nss/gtests/common/testvectors/hkdf-sha384-vectors.h b/security/nss/gtests/common/testvectors/hkdf-sha384-vectors.h
diff --git a/security/nss/gtests/common/testvectors/hkdf-sha512-vectors.h b/security/nss/gtests/common/testvectors/hkdf-sha512-vectors.h
diff --git a/security/nss/gtests/common/testvectors/hkdf-vectors.h b/security/nss/gtests/common/testvectors/hkdf-vectors.h
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,3 +10,4 @@
		*/

		#error "Do not include this header file."