diff --git a/Feature-nss-support-SM2-signature-algorithm.patch b/Feature-nss-support-SM2-signature-algorithm.patch index 2fc37868f6d6af53069a20c0e12122771e7e5e9b..6b1c7c99cca06d8dd6f24ba6d4ca3f3c3aa5d1f6 100644 --- a/Feature-nss-support-SM2-signature-algorithm.patch +++ b/Feature-nss-support-SM2-signature-algorithm.patch @@ -147,8 +147,8 @@ index 73a625a..bf2aea7 100644 #include "ecl.h" +#include "sm2.h" - static const ECMethod kMethods[] = { - { ECCurve25519, + #define EC_DOUBLECHECK PR_FALSE + @@ -907,7 +908,9 @@ ECDSA_SignDigest(ECPrivateKey *key, SECItem *signature, const SECItem *digest) goto cleanup; diff --git a/nss-3.85.tar.gz b/nss-3.89.tar.gz similarity index 75% rename from nss-3.85.tar.gz rename to nss-3.89.tar.gz index 40f3a5939d1d0dc78bc7824d985b395298008fa1..2d4f8ea2195a653e591816d4511ac606860ebf58 100644 Binary files a/nss-3.85.tar.gz and b/nss-3.89.tar.gz differ diff --git a/nss-config b/nss-config index 47ae552273ad7753a720583f40cb76556b167196..2a8dc69a3c9b5eef53a063de606f0ac2190e64f0 100644 --- a/nss-config +++ b/nss-config @@ -3,7 +3,7 @@ prefix=/usr major_version=3 -minor_version=85 +minor_version=89 patch_version=0 usage() diff --git a/nss-softokn-config b/nss-softokn-config index ae8f701487e34c5386fd963444a0894818dc46df..c6a4019dfbb4fa0f3004e195012aaea771a9a679 100644 --- a/nss-softokn-config +++ b/nss-softokn-config @@ -3,7 +3,7 @@ prefix=/usr major_version=3 -minor_version=85 +minor_version=89 patch_version=0 usage() diff --git a/nss-softokn.pc b/nss-softokn.pc index a50bb380a0c8de0fe463d80bc104653b55bb50b8..cdbc180db4d8f849440181d7a9796df091bf0fc4 100644 --- a/nss-softokn.pc +++ b/nss-softokn.pc @@ -5,7 +5,7 @@ includedir=/usr/include/nss3 Name: NSS-SOFTOKN Description: Network Security Services Softoken PKCS #11 Module -Version: 3.85 -Requires: nspr >= 4.35.0, nss-util >= 3.85 +Version: 3.89 +Requires: nspr >= 4.35.0, nss-util >= 3.89 Libs: -L${libdir} -lfreebl3 -lnssdbm3 -lsoftokn3 Cflags: -I${includedir} diff --git a/nss-util-config b/nss-util-config index 7e548946c14ae14e56f7efd45ed90c8accd613a2..ef82ba7249ab00274717764d80342ae2b0351dce 100644 --- a/nss-util-config +++ b/nss-util-config @@ -3,7 +3,7 @@ prefix=/usr major_version=3 -minor_version=85 +minor_version=89 patch_version=0 usage() diff --git a/nss-util.pc b/nss-util.pc index c04294e9f4ba4c143e418a19c00443d97248aba7..9db43ee0bacaa031767fc20ccee25a98a11f7da3 100644 --- a/nss-util.pc +++ b/nss-util.pc @@ -5,7 +5,7 @@ includedir=/usr/include/nss3 Name: NSS-UTIL Description: Network Security Services Utility Library -Version: 3.85 +Version: 3.89 Requires: nspr >= 4.35.0 Libs: -L${libdir} -lnssutil3 Cflags: -I${includedir} diff --git a/nss.pc b/nss.pc index bcfc520493e25b322adfb26d065ac753eb24ca59..b8ce884e93195ca796e408be0368954c590bb26c 100644 --- a/nss.pc +++ b/nss.pc @@ -5,7 +5,7 @@ includedir=/usr/include/nss3 Name: NSS Description: Network Security Services -Version: 3.85 -Requires: nspr >= 4.35.0, nss-util >= 3.85 +Version: 3.89 +Requires: nspr >= 4.35.0, nss-util >= 3.89 Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 Cflags: -I${includedir} diff --git a/nss.spec b/nss.spec index d7e39f5f38615593f180078471f4c998de140c4b..f3b353ea440eba662a23809f709ab8d4f68a1556 100644 --- a/nss.spec +++ b/nss.spec @@ -1,6 +1,6 @@ %global nspr_version 4.35.0 -%global nss_version 3.85.0 -%global nss_archive_version 3.85 +%global nss_version 3.89.0 +%global nss_archive_version 3.89 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools %global allTools "certutil cmsutil crlutil derdump modutil pk12util signtool signver ssltap vfychain vfyserv" @@ -14,7 +14,7 @@ Summary: Network Security Services Name: nss Version: %{nss_version} -Release: 3 +Release: 1 License: MPLv2.0 URL: http://www.mozilla.org/projects/security/pki/nss/ Provides: nss-system-init @@ -25,7 +25,7 @@ BuildRequires: nspr-devel >= %{nspr_version} nss-softokn sqlite-devel zlib-de BuildRequires: pkgconf gawk psmisc perl-interpreter gcc-c++ obsoletes: nss-sysinit < %{version}-%{release} -Source0: https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_85_RTM/src/%{name}-%{nss_archive_version}.tar.gz +Source0: https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_89_RTM/src/%{name}-%{nss_archive_version}.tar.gz Source1: nss-util.pc Source2: nss-util-config Source3: nss-softokn.pc @@ -554,6 +554,9 @@ update-crypto-policies &>/dev/null||: %doc %{_mandir}/man* %changelog +* Tue Jul 18 2023 jinlun - 3.89.0-1 +- update version to 3.89 + * Thu Jun 8 2023 zhaochuanfeng - 3.85.0-3 - Fix an issue when building with clang