projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c80149d
)
Recognise Ed25519 in X509_certificate_type
author
Dr. Stephen Henson
<steve@openssl.org>
Wed, 24 May 2017 20:52:31 +0000
(21:52 +0100)
committer
Dr. Stephen Henson
<steve@openssl.org>
Wed, 21 Jun 2017 13:11:01 +0000
(14:11 +0100)
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3585)
crypto/x509/x509type.c
patch
|
blob
|
history
diff --git
a/crypto/x509/x509type.c
b/crypto/x509/x509type.c
index aca8355273309d301b57ed1944842698925f1eb9..a1172e489d5dc3e6638976f2d6220bf0df5f4ca6 100644
(file)
--- 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;