Merge tag 'fuse-update-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

[linux-2.6-microblaze.git] / crypto / asymmetric_keys / x509_cert_parser.c

diff --git a/crypto/asymmetric_keys/x509_cert_parser.c b/crypto/asymmetric_keys/x509_cert_parser.c
index 2899ed8..7a9b084 100644 (file)
--- a/crypto/asymmetric_keys/x509_cert_parser.c
+++ b/crypto/asymmetric_keys/x509_cert_parser.c
@@ -508,6 +508,9 @@ int x509_extract_key_data(void *context, size_t hdrlen,
        case OID_gost2012PKey512:
                ctx->cert->pub->pkey_algo = "ecrdsa";
                break;
+       case OID_sm2:
+               ctx->cert->pub->pkey_algo = "sm2";
+               break;
        case OID_id_ecPublicKey:
                if (parse_OID(ctx->params, ctx->params_size, &oid) != 0)
                        return -EBADMSG;