From: Stefan Berger <stefanb@linux.vnet.ibm.com>
To: dhowells@redhat.com, keyrings@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, herbert@gondor.apana.org.au,
davem@davemloft.net, linux-crypto@vger.kernel.org,
patrick@puiterwijk.org, Stefan Berger <stefanb@linux.ibm.com>
Subject: [PATCH 3/3] x509: Detect sm2 keys by their parameters OID
Date: Tue, 26 Jan 2021 12:03:59 -0500 [thread overview]
Message-ID: <20210126170359.363969-4-stefanb@linux.vnet.ibm.com> (raw)
In-Reply-To: <20210126170359.363969-1-stefanb@linux.vnet.ibm.com>
From: Stefan Berger <stefanb@linux.ibm.com>
Detect whether a key is a sm2 type of key by its OID in the parameters
array.
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
---
crypto/asymmetric_keys/x509_cert_parser.c | 27 +++++++++++++----------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/crypto/asymmetric_keys/x509_cert_parser.c b/crypto/asymmetric_keys/x509_cert_parser.c
index 720cc7977077..82e331da5041 100644
--- a/crypto/asymmetric_keys/x509_cert_parser.c
+++ b/crypto/asymmetric_keys/x509_cert_parser.c
@@ -485,6 +485,7 @@ int x509_extract_key_data(void *context, size_t hdrlen,
const void *value, size_t vlen)
{
struct x509_parse_context *ctx = context;
+ enum OID oid;
ctx->key_algo = ctx->last_oid;
switch (ctx->last_oid) {
@@ -496,18 +497,20 @@ int x509_extract_key_data(void *context, size_t hdrlen,
ctx->cert->pub->pkey_algo = "ecrdsa";
break;
case OID_id_ecPublicKey:
- ctx->cert->pub->pkey_algo = "sm2";
- if (ctx->params_size > 2) {
- enum OID oid = look_up_OID(ctx->params + 2,
- ctx->params_size - 2);
- switch (oid) {
- case OID_id_prime192v1:
- case OID_id_prime256v1:
- ctx->cert->pub->pkey_algo = "ecdsa";
- break;
- default:
- break;
- }
+ if (ctx->params_size < 2)
+ return -ENOPKG;
+
+ oid = look_up_OID(ctx->params + 2, ctx->params_size - 2);
+ switch (oid) {
+ case OID_id_prime192v1:
+ case OID_id_prime256v1:
+ ctx->cert->pub->pkey_algo = "ecdsa";
+ break;
+ case OID_sm2:
+ ctx->cert->pub->pkey_algo = "sm2";
+ break;
+ default:
+ return -ENOPKG;
}
break;
default:
--
2.25.4
prev parent reply other threads:[~2021-01-27 0:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-26 17:03 [PATCH 0/3] Add support for x509 certs with NIST p256 and p192 keys Stefan Berger
2021-01-26 17:03 ` [PATCH 1/3] x509: Add support for parsing x509 certs with NIST p256 keys Stefan Berger
2021-01-26 17:03 ` [PATCH 2/3] x509: Add support for NIST p192 keys in certificates and akcipher Stefan Berger
2021-01-26 17:03 ` Stefan Berger [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210126170359.363969-4-stefanb@linux.vnet.ibm.com \
--to=stefanb@linux.vnet.ibm.com \
--cc=davem@davemloft.net \
--cc=dhowells@redhat.com \
--cc=herbert@gondor.apana.org.au \
--cc=keyrings@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=patrick@puiterwijk.org \
--cc=stefanb@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).