diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2017-04-05 16:48:32 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2017-05-30 20:38:19 +0100 |
| commit | a13727e5df57f77b39ad2b57378e8511aa9dcb37 (patch) | |
| tree | 78e9f8b8460fb335202042b6ac02602f50f48a0d /crypto | |
| parent | 8ecade8bfb85b1d8a473ac12c1589ddbd5a7a431 (diff) | |
add method
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3503)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/asn1/standard_methods.h | 3 | ||||
| -rw-r--r-- | crypto/include/internal/asn1_int.h | 1 |
2 files changed, 4 insertions, 0 deletions
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; |