Commit 262bd85f authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Add X25519 methods to internal tables 

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 873feeb9

crypto/asn1/ameth_lib.c

+4 −1
Changes for crypto/asn1/ameth_lib.c: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -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

};

crypto/evp/pmeth_lib.c

+3 −0
Changes for crypto/evp/pmeth_lib.c: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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

};

crypto/include/internal/asn1_int.h

+1 −0
Changes for crypto/include/internal/asn1_int.h: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -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];

crypto/include/internal/evp_int.h

+1 −0
Changes for crypto/include/internal/evp_int.h: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -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;