update to version 3.128-nss-AtomGit

已合并

update to version 3.128 #181

Funda Wang创建于 12 天前从已删除 :update-to-3.128 合入到 src-openeuler/nss： master

update to version 3.128 #181

已合并

Funda Wang创建于 12 天前

从已删除 :update-to-3.128合入到src-openeuler/nss master

共 4 个文件变更+22-19

MFeature-nss-add-implement-of-SM2-signature-algorithm-without.patch+2-2

	@@ -150,9 +150,9 @@ index c383b9c..ef8aef3 100644
150	/* we don't implement MD4 hashes */	150	/* we don't implement MD4 hashes */
151	case SEC_OID_PKCS1_MD4_WITH_RSA_ENCRYPTION:	151	case SEC_OID_PKCS1_MD4_WITH_RSA_ENCRYPTION:
152	default:	152	default:
153	-@@ -610,6 +612,9 @@ sec_DecodeSigAlg(const SECKEYPublicKey *key, SECOidTag sigAlg,	153	+@@ -617,6 +617,9 @@ sec_DecodeSigAlg(const SECKEYPublicKey *key, SECOidTag sigAlg,
		154	+ comboRequired = PR_TRUE;
154	*hashalg = sigAlg;	155	*hashalg = sigAlg;
155	- /* decode params to get the sign context and set (mechparamsp) */
156	break;	156	break;
157	+ case SEC_OID_SM2_WITH_SM3:	157	+ case SEC_OID_SM2_WITH_SM3:
158	+ *hashalg = SEC_OID_SM3;	158	+ *hashalg = SEC_OID_SM3;

MFeature-port-nss-support-SM3-digest-algorithm-to-NSS_3_117_R.patch+6-6

	@@ -151,10 +151,10 @@ diff --git a/lib/freebl/ldvector.c b/lib/freebl/ldvector.c
151	index 420d567..2fd5251 100644	151	index 420d567..2fd5251 100644
152	--- a/lib/freebl/ldvector.c	152	--- a/lib/freebl/ldvector.c
153	+++ b/lib/freebl/ldvector.c	153	+++ b/lib/freebl/ldvector.c
154	-@@ -462,6 +462,17 @@ static const struct FREEBLVectorStr vector = {	154	+@@ -464,6 +464,17 @@ static const struct FREEBLVectorStr vector = {
155	- EC_DecompressPublicKey,
156	- /* End of version 3.032 */
157		155
		156	+ MLDSA_DestroyContext,
		157	+ /* End of version 3.033 */
158	+ SM3_NewContext,	158	+ SM3_NewContext,
159	+ SM3_DestroyContext,	159	+ SM3_DestroyContext,
160	+ SM3_Begin,	160	+ SM3_Begin,
	@@ -275,9 +275,9 @@ diff --git a/lib/freebl/loader.h b/lib/freebl/loader.h
275	index 7b52a9b..ef43cae 100644	275	index 7b52a9b..ef43cae 100644
276	--- a/lib/freebl/loader.h	276	--- a/lib/freebl/loader.h
277	+++ b/lib/freebl/loader.h	277	+++ b/lib/freebl/loader.h
278	-@@ -943,6 +943,21 @@ struct FREEBLVectorStr {	278	+@@ -946,6 +946,21 @@ struct FREEBLVectorStr {
279	- SECStatus (p_EC_DecompressPublicKey)(const SECItem publicCompressed, const ECParams params, SECItem publicUncompressed);	279	+ void (p_MLDSA_DestroyContext)(MLDSAContext ctx);
280	- /* Version 3.032 came to here */	280	+ /* Version 3.033 came to here */
281		281
282	+ SM3Context (p_SM3_NewContext)(void);	282	+ SM3Context (p_SM3_NewContext)(void);
283	+ void (p_SM3_DestroyContext)(SM3Context cx, PRBool freeit);	283	+ void (p_SM3_DestroyContext)(SM3Context cx, PRBool freeit);

Rnss-3.126.tar.gz→nss-3.128.tar.gz+2-2

	@@ -1,3 +1,3 @@
1	version https://git-lfs.github.com/spec/v1	1	version https://git-lfs.github.com/spec/v1
2	-oid sha256:7aa07c758be1453d82d739240b249ffb7aef0041be488067e1c0f348e1f9e337	2	+oid sha256:70ea638f4e4fc341b24782ef9af6d88a2d3280ef5e46736748411fe8ca586351
3	-size 78769092	3	+size 87053743

Mnss.spec+12-9

	@@ -1,7 +1,7 @@
1	-%global nspr_version 4.35.0	1	+%global nspr_version 4.39
2	-%global nss_version 3.126	2	+%global nss_version 3.128
3	-%global nss_ver 3_126	3	+%global nss_ver 3_128
4	-%global nss_archive_version 3.126	4	+%global nss_archive_version 3.128
5	%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools	5	%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
6	%global allTools "certutil cmsutil crlutil derdump modutil pk12util signtool signver ssltap vfychain vfyserv"	6	%global allTools "certutil cmsutil crlutil derdump modutil pk12util signtool signver ssltap vfychain vfyserv"
7		7
	@@ -131,7 +131,7 @@ Developers should rely only on the officially supported NSS public API.
131		131
132	%package help	132	%package help
133	Summary: help document for NSS	133	Summary: help document for NSS
134	-Requires: man-db	134	+BuildArch: noarch
135		135
136	%description help	136	%description help
137	Help document for NSS	137	Help document for NSS
	@@ -139,10 +139,7 @@ Help document for NSS
139	%prep	139	%prep
140	%setup -q -n %{name}-%{nss_archive_version}	140	%setup -q -n %{name}-%{nss_archive_version}
141	pushd nss	141	pushd nss
142	-%patch -P 9000 -p1	142	+%autopatch -p1
143	-%patch -P 9001 -p1
144	-%patch -P 9002 -p1
145	-%patch -P 9003 -p1
146	popd	143	popd
147		144
148	%build	145	%build
	@@ -570,6 +567,12 @@ update-crypto-policies &>/dev/null\|\|:
570	%doc %{_mandir}/man*	567	%doc %{_mandir}/man*
571		568
572	%changelog	569	%changelog
		570	+* Fri Aug 28 2026 Funda Wang <fundawang@yeah.net> - 3.128-1
		571	+- update to 3.128
		572	+- adapt SM3/SM2 patches for 3.128 (SM3 vector entries after version 3.033 in loader.h/ldvector.c, SM2 case in secvfy.c)
		573	+- use autopatch -p1 to apply patches
		574	+- build the help subpackage as noarch and drop the man-db Requires
		575	+
573	* Wed Aug 12 2026 Funda Wang <fundawang@yeah.net> - 3.126-1	576	* Wed Aug 12 2026 Funda Wang <fundawang@yeah.net> - 3.126-1
574	- update to 3.126	577	- update to 3.126
575	- adapt SM2/SM3 patches for 3.126 (SEC_OID_SM3=400, SEC_OID_SM2=401, SEC_OID_SM2_WITH_SM3=402)	578	- adapt SM2/SM3 patches for 3.126 (SEC_OID_SM3=400, SEC_OID_SM2=401, SEC_OID_SM2_WITH_SM3=402)