38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From 5ad87d10b76fe5d4646d1f0a795580df20f0cd02 Mon Sep 17 00:00:00 2001
|
|
From: jinlun <jinlun@huawei.com>
|
|
Date: Tue, 12 Sep 2023 17:40:03 +0800
|
|
Subject: [PATCH] fix the certificate resolution in sm2
|
|
|
|
---
|
|
lib/cryptohi/seckey.c | 1 +
|
|
lib/softoken/pkcs11c.c | 1 +
|
|
2 files changed, 2 insertions(+)
|
|
|
|
diff --git a/lib/cryptohi/seckey.c b/lib/cryptohi/seckey.c
|
|
index 6a230e1..11a936e 100644
|
|
--- a/lib/cryptohi/seckey.c
|
|
+++ b/lib/cryptohi/seckey.c
|
|
@@ -639,6 +639,7 @@ seckey_ExtractPublicKey(const CERTSubjectPublicKeyInfo *spki)
|
|
return pubk;
|
|
break;
|
|
case SEC_OID_ANSIX962_EC_PUBLIC_KEY:
|
|
+ case SEC_OID_SM2:
|
|
/* A basic sanity check on inputs. */
|
|
if (spki->algorithm.parameters.len == 0 || newOs.len == 0) {
|
|
PORT_SetError(SEC_ERROR_INPUT_LEN);
|
|
diff --git a/lib/softoken/pkcs11c.c b/lib/softoken/pkcs11c.c
|
|
index 2105cb5..5261a92 100644
|
|
--- a/lib/softoken/pkcs11c.c
|
|
+++ b/lib/softoken/pkcs11c.c
|
|
@@ -6199,6 +6199,7 @@ sftk_unwrapPrivateKey(SFTKObject *key, SECItem *bpki)
|
|
prepare_low_pqg_params_for_asn1(&lpk->u.dsa.params);
|
|
break;
|
|
/* case NSSLOWKEYDHKey: */
|
|
+ case SEC_OID_SM2:
|
|
case SEC_OID_ANSIX962_EC_PUBLIC_KEY:
|
|
keyTemplate = nsslowkey_ECPrivateKeyTemplate;
|
|
paramTemplate = NULL;
|
|
--
|
|
2.27.0
|
|
|