packages/nss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix sm2 sm3 code error

Browse Source
This commit is contained in:
jinlun 2024-01-22 17:13:31 +08:00
parent 25adefeb76
commit 2655032bf0
2 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Feature-fix-sm2-sm3-code-error.patch Normal file
View File

@ -0,0 +1,39 @@
From 4343eb37c04f464f1f09e91e71d619a7eed1b38b Mon Sep 17 00:00:00 2001
From: jinlun <jinlun@huawei.com>
Date: Mon, 22 Jan 2024 17:03:52 +0800
Subject: [PATCH] fix sm2 sm3 code error
---
lib/util/secoid.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/lib/util/secoid.c b/lib/util/secoid.c
index e97eead..cc776c1 100644
--- a/lib/util/secoid.c
+++ b/lib/util/secoid.c
@@ -1813,10 +1813,6 @@ const static SECOidData oids[SEC_OID_TOTAL] = {
"IPsec User",
CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION),
- OD(sm3, SEC_OID_SM3, "SM3", CKM_NSS_SM3, INVALID_CERT_EXTENSION),
- OD(sm2, SEC_OID_SM2, "SM2", CKM_NSS_SM2, INVALID_CERT_EXTENSION),
- OD(sm2_with_sm3, SEC_OID_SM2_WITH_SM3, "SM2_WITH_SM3", CKM_NSS_SM2_WITH_SM3, INVALID_CERT_EXTENSION),
-
OD(sha3_224, SEC_OID_SHA3_224, "SHA3-224", CKM_SHA3_224, INVALID_CERT_EXTENSION),
OD(sha3_256, SEC_OID_SHA3_256, "SHA3-256", CKM_SHA3_256, INVALID_CERT_EXTENSION),
OD(sha3_384, SEC_OID_SHA3_384, "SHA3-384", CKM_SHA3_384, INVALID_CERT_EXTENSION),
@@ -1826,6 +1822,11 @@ const static SECOidData oids[SEC_OID_TOTAL] = {
OD(hmac_sha3_256, SEC_OID_HMAC_SHA3_256, "HMAC SHA3-256", CKM_SHA3_256_HMAC, INVALID_CERT_EXTENSION),
OD(hmac_sha3_384, SEC_OID_HMAC_SHA3_384, "HMAC SHA3-384", CKM_SHA3_384_HMAC, INVALID_CERT_EXTENSION),
OD(hmac_sha3_512, SEC_OID_HMAC_SHA3_512, "HMAC SHA3-512", CKM_SHA3_512_HMAC, INVALID_CERT_EXTENSION),
+
+ OD(sm3, SEC_OID_SM3, "SM3", CKM_NSS_SM3, INVALID_CERT_EXTENSION),
+ OD(sm2, SEC_OID_SM2, "SM2", CKM_NSS_SM2, INVALID_CERT_EXTENSION),
+ OD(sm2_with_sm3, SEC_OID_SM2_WITH_SM3, "SM2_WITH_SM3", CKM_NSS_SM2_WITH_SM3, INVALID_CERT_EXTENSION),
+
};
/* PRIVATE EXTENDED SECOID Table
--
2.33.0

7
nss.spec
View File

@ -15,7 +15,7 @@
Summary: Network Security Services
Name: nss
Version: %{nss_version}
Release: 3
Release: 4
License: MPLv2.0
URL: http://www.mozilla.org/projects/security/pki/nss/
Provides: nss-system-init
@ -47,6 +47,7 @@ Patch9001: Feature-nss-add-implement-of-SM2-signature-algorithm.patch
Patch9002: Feature-nss-support-SM3-digest-algorithm.patch
Patch9003: Feature-nss-support-SM2-signature-algorithm.patch
Patch9004: Feature-nss-fix-the-certificate-resolution-in-sm2.patch
Patch9005: Feature-fix-sm2-sm3-code-error.patch
%description
Network Security Services (NSS) is a set of libraries designed to
@ -135,6 +136,7 @@ pushd nss
%patch9002 -p1
%patch9003 -p1
%patch9004 -p1
%patch9005 -p1
popd
%build
@ -557,6 +559,9 @@ update-crypto-policies &>/dev/null||:
%doc %{_mandir}/man*
%changelog
* Mon Jan 22 2024 jinlun <jinlun@huawei.com> - 3.94.0-4
- fix sm2 sm3 code error
* Fri Dec 15 2023 jinlun <jinlun@huawei.com> - 3.94.0-3
- fix nss_version error.