Add X25519 methods to internal tables

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c
index 577e2050edee66d0614bb174bf02a2838b9bc023..d5a024776ff7525aca4964dea97a9cfcc1524659 100644 (file)
--- 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 2e5e93294130e0802a3e0f7ae86a7543cbb4ca56..169639b562015af6a9027b670970b83af9a00222 100644 (file)
--- 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 aad047eacd792910ac6b57f3eea0048d42d54193..f4c71fc861f5cc567057ff2e3e52422852841bea 100644 (file)
--- 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 d7346f5b526a8c5a7d0cb80f691c7d0cd684b028..d1e607e7d3bb2fb8f7ca4fce803385aca94b0a26 100644 (file)
--- 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;