summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2017-05-24 21:52:31 +0100
committerDr. Stephen Henson <steve@openssl.org>2017-06-21 14:11:01 +0100
commitd3c094ca712594eeb42d732642f4a3ffc5ffc59a (patch)
tree6488d2dee99906c28fd23618cfcc9ad79f636caa
parentc80149d9f09b3a5a5b1621fa705e900d455334d4 (diff)
Recognise Ed25519 in X509_certificate_type
Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3585)
-rw-r--r--crypto/x509/x509type.c3
1 files changed, 3 insertions, 0 deletions
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;