add method
authorDr. Stephen Henson <steve@openssl.org>
Wed, 5 Apr 2017 15:48:32 +0000 (16:48 +0100)
committerDr. Stephen Henson <steve@openssl.org>
Tue, 30 May 2017 19:38:19 +0000 (20:38 +0100)
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3503)

crypto/asn1/standard_methods.h
crypto/include/internal/asn1_int.h

index a0fd881..f5fa128 100644 (file)
@@ -49,5 +49,8 @@ static const EVP_PKEY_ASN1_METHOD *standard_methods[] = {
 #ifndef OPENSSL_NO_SIPHASH
     &siphash_asn1_meth,
 #endif
+#ifndef OPENSSL_NO_EC
+    &ed25519_asn1_meth,
+#endif
 };
 
index 6e6e028..a2e2b17 100644 (file)
@@ -64,6 +64,7 @@ extern const EVP_PKEY_ASN1_METHOD dhx_asn1_meth;
 extern const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[5];
 extern const EVP_PKEY_ASN1_METHOD eckey_asn1_meth;
 extern const EVP_PKEY_ASN1_METHOD ecx25519_asn1_meth;
+extern const EVP_PKEY_ASN1_METHOD ed25519_asn1_meth;
 extern const EVP_PKEY_ASN1_METHOD poly1305_asn1_meth;
 
 extern const EVP_PKEY_ASN1_METHOD hmac_asn1_meth;