From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 5 Apr 2017 15:48:32 +0000 (+0100)
Subject: add method
X-Git-Tag: OpenSSL_1_1_1-pre1~1419
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a13727e5df57f77b39ad2b57378e8511aa9dcb37;p=oweals%2Fopenssl.git

add method

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3503)
---

diff --git a/crypto/asn1/standard_methods.h b/crypto/asn1/standard_methods.h
index a0fd881b7a..f5fa128346 100644
--- a/crypto/asn1/standard_methods.h
+++ b/crypto/asn1/standard_methods.h
@@ -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
 };
 
diff --git a/crypto/include/internal/asn1_int.h b/crypto/include/internal/asn1_int.h
index 6e6e028738..a2e2b17b6a 100644
--- a/crypto/include/internal/asn1_int.h
+++ b/crypto/include/internal/asn1_int.h
@@ -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;