From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 24 May 2017 20:52:31 +0000 (+0100)
Subject: Recognise Ed25519 in X509_certificate_type
X-Git-Tag: OpenSSL_1_1_1-pre1~1270
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d3c094ca712594eeb42d732642f4a3ffc5ffc59a;p=oweals%2Fopenssl.git

Recognise Ed25519 in X509_certificate_type

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3585)
---

diff --git a/crypto/x509/x509type.c b/crypto/x509/x509type.c
index aca8355273..a1172e489d 100644
--- a/crypto/x509/x509type.c
+++ b/crypto/x509/x509type.c
@@ -41,6 +41,9 @@ int X509_certificate_type(const X509 *x, const EVP_PKEY *pkey)
     case EVP_PKEY_EC:
         ret = EVP_PK_EC | EVP_PKT_SIGN | EVP_PKT_EXCH;
         break;
+    case NID_ED25519:
+        ret = EVP_PKT_SIGN;
+        break;
     case EVP_PKEY_DH:
         ret = EVP_PK_DH | EVP_PKT_EXCH;
         break;