40 lines
1.7 KiB
Diff
40 lines
1.7 KiB
Diff
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
|
|
|