From fad8bd49537fe76aa3d5a76d62a82494e62180b7 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Thu, 6 Dec 2018 10:16:09 +0100 Subject: [PATCH] Update to NSS 3.40.1 --- .gitignore | 1 + PayPalEE.cert | Bin 0 -> 2012 bytes PayPalICA.cert | Bin 0 -> 1210 bytes nss-load-policy-file.patch | 79 ------------------------------------- nss.spec | 56 +++++++++++++++----------- sources | 4 +- 6 files changed, 36 insertions(+), 104 deletions(-) create mode 100644 PayPalEE.cert create mode 100644 PayPalICA.cert delete mode 100644 nss-load-policy-file.patch diff --git a/.gitignore b/.gitignore index 46aed9f..b0fa934 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ TestUser51.cert /nss-3.37.3.tar.gz /nss-3.38.0.tar.gz /nss-3.39.tar.gz +/nss-3.40.1.tar.gz diff --git a/PayPalEE.cert b/PayPalEE.cert new file mode 100644 index 0000000000000000000000000000000000000000..aef4086762a88dd5d7df06a7f4e23ea2f502c83c GIT binary patch literal 2012 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 -# Date 1529655250 -7200 -# Fri Jun 22 10:14:10 2018 +0200 -# Node ID d99e54ca9b6df33025ee9a196b8b942428bbff91 -# Parent 1a13c19d7fab53fd62786e05d6546a4abf66e48d -Bug 1296263 - Fix loading of PKCS#11 modules from system policy file, r=rrelyea - -We currently load the policy file after calling -STAN_LoadDefaultNSS3TrustDomain(), which causes problems because any -tokens in the newly-added modules don't get initialised. - -Move it up by a few lines and fix up the indentation while we're at it. - -diff --git a/lib/nss/nssinit.c b/lib/nss/nssinit.c ---- a/lib/nss/nssinit.c -+++ b/lib/nss/nssinit.c -@@ -702,6 +702,30 @@ nss_Init(const char *configdir, const ch - if (SECOID_Init() != SECSuccess) { - goto loser; - } -+#ifdef POLICY_FILE -+ /* Load the system crypto policy file if it exists, -+ * unless the NSS_IGNORE_SYSTEM_POLICY environment -+ * variable has been set to 1. */ -+ ignoreVar = PR_GetEnvSecure("NSS_IGNORE_SYSTEM_POLICY"); -+ if (ignoreVar == NULL || strncmp(ignoreVar, "1", sizeof("1")) != 0) { -+ if (PR_Access(POLICY_PATH "/" POLICY_FILE, PR_ACCESS_READ_OK) == PR_SUCCESS) { -+ SECMODModule *module = SECMOD_LoadModule( -+ "name=\"Policy File\" " -+ "parameters=\"configdir='sql:" POLICY_PATH "' " -+ "secmod='" POLICY_FILE "' " -+ "flags=readOnly,noCertDB,forceSecmodChoice,forceOpen\" " -+ "NSS=\"flags=internal,moduleDB,skipFirst,moduleDBOnly,critical\"", -+ parent, PR_TRUE); -+ if (module) { -+ PRBool isLoaded = module->loaded; -+ SECMOD_DestroyModule(module); -+ if (!isLoaded) { -+ goto loser; -+ } -+ } -+ } -+ } -+#endif - if (STAN_LoadDefaultNSS3TrustDomain() != PR_SUCCESS) { - goto loser; - } -@@ -730,30 +754,6 @@ nss_Init(const char *configdir, const ch - } - } - } --#ifdef POLICY_FILE -- /* Load the system crypto policy file if it exists, -- * unless the NSS_IGNORE_SYSTEM_POLICY environment -- * variable has been set to 1. */ -- ignoreVar = PR_GetEnvSecure("NSS_IGNORE_SYSTEM_POLICY"); -- if (ignoreVar == NULL || strncmp(ignoreVar, "1", sizeof("1")) != 0) { -- if (PR_Access(POLICY_PATH "/" POLICY_FILE, PR_ACCESS_READ_OK) == PR_SUCCESS) { -- SECMODModule *module = SECMOD_LoadModule( -- "name=\"Policy File\" " -- "parameters=\"configdir='sql:" POLICY_PATH "' " -- "secmod='" POLICY_FILE "' " -- "flags=readOnly,noCertDB,forceSecmodChoice,forceOpen\" " -- "NSS=\"flags=internal,moduleDB,skipFirst,moduleDBOnly,critical\"", -- parent, PR_TRUE); -- if (module) { -- PRBool isLoaded = module->loaded; -- SECMOD_DestroyModule(module); -- if (!isLoaded) { -- goto loser; -- } -- } -- } -- } --#endif - pk11sdr_Init(); - cert_CreateSubjectKeyIDHashTable(); - diff --git a/nss.spec b/nss.spec index c70c693..da782dd 100644 --- a/nss.spec +++ b/nss.spec @@ -1,5 +1,5 @@ %global nspr_version 4.20.0 -%global nss_version 3.39.0 +%global nss_version 3.40.1 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools %global allTools "certutil cmsutil crlutil derdump modutil pk12util signtool signver ssltap vfychain vfyserv" %global saved_files_dir %{_libdir}/nss/saved @@ -42,20 +42,12 @@ rpm.define(string.format("nss_release_tag NSS_%s_RTM", string.gsub(rpm.expand("%nss_archive_version"), "%.", "_"))) } -# The upstream omits the trailing ".0", while we need it for -# consistency with the pkg-config version: -# https://bugzilla.redhat.com/show_bug.cgi?id=1578106 -%{lua: -rpm.define(string.format("nss_archive_version %s", - string.gsub(rpm.expand("%nss_version"), "(.*)%.0$", "%1"))) -} - Summary: Network Security Services Name: nss Version: %{nss_version} # for Rawhide, please always use release >= 2 # for Fedora release branches, please use release < 2 (1.0, 1.1, ...) -Release: 1.1%{?dist} +Release: 1.0%{?dist} License: MPLv2.0 URL: http://www.mozilla.org/projects/security/pki/nss/ Requires: nspr >= %{nspr_version} @@ -930,40 +922,60 @@ update-crypto-policies %changelog -* Tue Nov 27 2018 Daiki Ueno - 3.39.0-1.1 +* Thu Dec 6 2018 Daiki Ueno - 3.40.1-1.0 +- Update to NSS 3.40.1 + +* Wed Nov 14 2018 Daiki Ueno - 3.39.0-4 - Consolidate nss-util, nss-softokn, and nss into a single package - Fix FTBFS with expired test certs - Modernize spec file based on the suggestion from Robert-André Mauchin -* Mon Sep 3 2018 Daiki Ueno - 3.39.0-1.0 +* Thu Sep 13 2018 Daiki Ueno - 3.39.0-3 +- Fix LDFLAGS injection + +* Mon Sep 3 2018 Daiki Ueno - 3.39.0-2 - Update to NSS 3.39 - Use the upstream tarball as it is (rhbz#1578106) +- Allow SSLKEYLOGFILE (rhbz#1620207) -* Tue Jul 3 2018 Daiki Ueno - 3.38.0-1.0 +* Fri Jul 20 2018 Kai Engert - 3.38.0-4 +- Backport upstream addition of nss-policy-check utility, rhbz#1428746 + +* Fri Jul 13 2018 Fedora Release Engineering - 3.38.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jul 2 2018 Daiki Ueno - 3.38.0-2 - Update to NSS 3.38 +- Install crypto-policies configuration file for + https://fedoraproject.org/wiki/Changes/NSSLoadP11KitModules +- Use %%ldconfig_scriptlets -* Wed Jun 6 2018 Daiki Ueno - 3.37.3-1.1 +* Wed Jun 6 2018 Daiki Ueno - 3.37.3-3 - Backport fix for handling DTLS application_data before handshake -* Tue Jun 5 2018 Daiki Ueno - 3.37.3-1.0 +* Tue Jun 5 2018 Daiki Ueno - 3.37.3-2 - Update to NSS 3.37.3 -* Mon Jun 4 2018 Daiki Ueno - 3.37.1-1.0 +* Mon May 28 2018 Daiki Ueno - 3.37.1-2 - Update to NSS 3.37.1 +- Temporarily disable AlertBeforeServerHello test -* Wed May 02 2018 Kai Engert - 3.36.1-1.1 +* Wed May 02 2018 Kai Engert - 3.36.1-3 - Upstream patch to keep nicknames stable on repeated certificate import into SQL DB, mozbz#1458518 -* Wed Apr 11 2018 Daiki Ueno - 3.36.1-1.0 +* Wed Apr 11 2018 Daiki Ueno - 3.36.1-2 - Update to NSS 3.36.1 -- Remove nss-3.14.0.0-disble-ocsp-test.patch -- Fix partial injection of LDFLAGS -- Remove NSS_NO_PKCS11_BYPASS, which is no-op in upstream -* Fri Mar 9 2018 Daiki Ueno - 3.36.0-1.0 +* Mon Mar 12 2018 Daiki Ueno - 3.36.0-3 +- Remove nss-3.14.0.0-disble-ocsp-test.patch +- Remove obsolete Conflicts +- Fix partial injection of LDFLAGS + +* Fri Mar 9 2018 Daiki Ueno - 3.36.0-2 - Update to NSS 3.36.0 - Add gcc-c++ to BuildRequires (C++ is needed for gtests) +- Remove NSS_NO_PKCS11_BYPASS, which is no-op in upstream - Make test failure detection robuster * Thu Feb 08 2018 Fedora Release Engineering - 3.35.0-5 diff --git a/sources b/sources index c45fce5..bd84a22 100644 --- a/sources +++ b/sources @@ -3,6 +3,4 @@ SHA512 (blank-cert9.db) = 2f8eab4c0612210ee47db8a3a80c1b58a0b43849551af78c7da403 SHA512 (blank-key3.db) = 01f7314e9fc8a7c9aa997652624cfcde213d18a6b3bb31840c1a60bbd662e56b5bc3221d13874abb42ce78163b225a6dfce2e1326cf6dd29366ad9c28ba5a71c SHA512 (blank-key4.db) = 8fedae93af7163da23fe9492ea8e785a44c291604fa98e58438448efb69c85d3253fc22b926d5c3209c62e58a86038fd4d78a1c4c068bc00600a7f3e5382ebe7 SHA512 (blank-secmod.db) = 06a2dbd861839ef6315093459328b500d3832333a34b30e6fac4a2503af337f014a4d319f0f93322409e719142904ce8bc08252ae9a4f37f30d4c3312e900310 -SHA512 (nss-3.39.tar.gz) = 16358c2d8660ca301410b1d39b2eae64fe2ebbbfab797872410e5fcc67f802ef48f4e362edeecb0591626c77013537019094a6a5dfc8d24487b6b6e54564da8f -SHA512 (PayPalEE.cert) = 602518b8476b40dd241879923a36a433f3220eb28a8c4f7d941131def6e3d00b01d92050ab498e2a08763b02c3c4709855de0ee23a0053d26f4fa9f9f33aaad3 -SHA512 (PayPalICA.cert) = 013795ebb3f13a1cbd5d9d82eef2f439852e461200f12df9790d0b1d63863dc7755af378ea4758f4c8a3a619dfd2d0d43a59da77553caed57611815d6263946b +SHA512 (nss-3.40.1.tar.gz) = 464ae843161e8deb911975d2117e8bf1194a968689b4ce70f9a12d5a33dba7ddd69f1248ec45244139c30fcc87678b206a4e124f032b26ead8bf894e4e8d0564