On Sat, Jan 30, 2021 at 09:57:40PM -0500, Stefan Berger wrote: > On 1/30/21 4:26 PM, Jarkko Sakkinen wrote: > > On Wed, 2021-01-27 at 07:33 -0500, Stefan Berger wrote: > > > From: Stefan Berger <stef...@linux.ibm.com> > > > > > > Detect whether a key is an sm2 type of key by its OID in the parameters > > > array rather than assuming that everything under OID_id_ecPublicKey > > > is sm2, which is not the case. > > > > > > Signed-off-by: Stefan Berger <stef...@linux.ibm.com> > > > --- > > > crypto/asymmetric_keys/x509_cert_parser.c | 13 ++++++++++++- > > > 1 file changed, 12 insertions(+), 1 deletion(-) > > > > > > diff --git a/crypto/asymmetric_keys/x509_cert_parser.c > > > b/crypto/asymmetric_keys/x509_cert_parser.c > > > index 52c9b455fc7d..4643fe5ed69a 100644 > > > --- a/crypto/asymmetric_keys/x509_cert_parser.c > > > +++ b/crypto/asymmetric_keys/x509_cert_parser.c > > > @@ -459,6 +459,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) { > > > @@ -470,7 +471,17 @@ 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) > > Either a named constant, or at least a comment instead of just '2'. > > > I will look at the 2 entries whether they contain the expected values: > ASN1_OID and length > > Thanks! > > Stefan
Just add inline comment that explains that. /Jarkko