aboutsummaryrefslogtreecommitdiff
path: root/crypto/asn1/standard_methods.h
diff options
context:
space:
mode:
authorJack Lloyd <jack.lloyd@ribose.com>2018-06-18 15:51:56 -0400
committerMatt Caswell <matt@openssl.org>2018-06-19 11:29:44 +0100
commitddb634fe6f9aeea34fe036cf804903b4240d38ac (patch)
tree60501110c68634a55fdc888fcb5598e8ba9c4887 /crypto/asn1/standard_methods.h
parent2f2e6b6278bc4cbf670e42ae9f4ff818529df37c (diff)
downloadopenssl-ddb634fe6f9aeea34fe036cf804903b4240d38ac.zip
openssl-ddb634fe6f9aeea34fe036cf804903b4240d38ac.tar.gz
openssl-ddb634fe6f9aeea34fe036cf804903b4240d38ac.tar.bz2
Move SM2 algos to SM2 specific PKEY method
Use EVP_PKEY_set_alias_type to access Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/6443)
Diffstat (limited to 'crypto/asn1/standard_methods.h')
-rw-r--r--crypto/asn1/standard_methods.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/asn1/standard_methods.h b/crypto/asn1/standard_methods.h
index 0dcd6b8..e74de55 100644
--- a/crypto/asn1/standard_methods.h
+++ b/crypto/asn1/standard_methods.h
@@ -54,5 +54,8 @@ static const EVP_PKEY_ASN1_METHOD *standard_methods[] = {
&ed25519_asn1_meth,
&ed448_asn1_meth,
#endif
+#ifndef OPENSSL_NO_SM2
+ &sm2_asn1_meth,
+#endif
};