diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2016-08-09 21:58:55 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-08-13 14:11:04 +0100 |
| commit | 262bd85fdead8808240f92eaea899615912001f7 (patch) | |
| tree | 001fe76fec748b9e3325c3cc121c2c5bd561cf46 | |
| parent | 873feeb9cfd026b5cadc50ab026f4839ea9e3c08 (diff) | |
| download | openssl-262bd85fdead8808240f92eaea899615912001f7.tar.gz | |
Add X25519 methods to internal tables
Reviewed-by: Rich Salz <rsalz@openssl.org>
| -rw-r--r-- | crypto/asn1/ameth_lib.c | 5 | ||||
| -rw-r--r-- | crypto/evp/pmeth_lib.c | 3 | ||||
| -rw-r--r-- | crypto/include/internal/asn1_int.h | 1 | ||||
| -rw-r--r-- | crypto/include/internal/evp_int.h | 1 |
4 files changed, 9 insertions, 1 deletions
diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c index 577e2050ed..d5a024776f 100644 --- a/crypto/asn1/ameth_lib.c +++ b/crypto/asn1/ameth_lib.c @@ -39,7 +39,10 @@ static const EVP_PKEY_ASN1_METHOD *standard_methods[] = { &cmac_asn1_meth, #endif #ifndef OPENSSL_NO_DH - &dhx_asn1_meth + &dhx_asn1_meth, +#endif +#ifndef OPENSSL_NO_EC + &ecx25519_asn1_meth #endif }; diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c index 2e5e932941..169639b562 100644 --- a/crypto/evp/pmeth_lib.c +++ b/crypto/evp/pmeth_lib.c @@ -42,6 +42,9 @@ static const EVP_PKEY_METHOD *standard_methods[] = { &dhx_pkey_meth, #endif &tls1_prf_pkey_meth, +#ifndef OPENSSL_NO_EC + &ecx25519_pkey_meth, +#endif &hkdf_pkey_meth }; diff --git a/crypto/include/internal/asn1_int.h b/crypto/include/internal/asn1_int.h index aad047eacd..f4c71fc861 100644 --- a/crypto/include/internal/asn1_int.h +++ b/crypto/include/internal/asn1_int.h @@ -61,6 +61,7 @@ extern const EVP_PKEY_ASN1_METHOD dh_asn1_meth; 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 hmac_asn1_meth; extern const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[2]; diff --git a/crypto/include/internal/evp_int.h b/crypto/include/internal/evp_int.h index d7346f5b52..d1e607e7d3 100644 --- a/crypto/include/internal/evp_int.h +++ b/crypto/include/internal/evp_int.h @@ -79,6 +79,7 @@ extern const EVP_PKEY_METHOD dh_pkey_meth; extern const EVP_PKEY_METHOD dhx_pkey_meth; extern const EVP_PKEY_METHOD dsa_pkey_meth; extern const EVP_PKEY_METHOD ec_pkey_meth; +extern const EVP_PKEY_METHOD ecx25519_pkey_meth; extern const EVP_PKEY_METHOD hmac_pkey_meth; extern const EVP_PKEY_METHOD rsa_pkey_meth; extern const EVP_PKEY_METHOD tls1_prf_pkey_meth; |