Commit 07afa3d8 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Add index for ED25519 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3585)
parent 65e89736

ssl/ssl_locl.h

+2 −1
Original line number Diff line number Diff line
@@ -364,7 +364,8 @@ 
# define SSL_PKEY_GOST01         3

# define SSL_PKEY_GOST12_256     4

# define SSL_PKEY_GOST12_512     5

# define SSL_PKEY_NUM            6

# define SSL_PKEY_ED25519        6

# define SSL_PKEY_NUM            7

/*

 * Pseudo-constant. GOST cipher suites can use different certs for 1

 * SSL_CIPHER. So let's see which one we have in fact.

ssl/statem/statem_lib.c

+2 −0
Original line number Diff line number Diff line
@@ -1248,6 +1248,8 @@ int ssl_cert_type(const X509 *x, const EVP_PKEY *pk) 
#ifndef OPENSSL_NO_EC

    case EVP_PKEY_EC:

        return SSL_PKEY_ECC;

    case NID_ED25519:

        return SSL_PKEY_ED25519;

#endif

#ifndef OPENSSL_NO_GOST

    case NID_id_GostR3410_2001:

ssl/t1_lib.c

+4 −1
Original line number Diff line number Diff line
@@ -798,7 +798,8 @@ static const uint16_t tls_default_sigalg[] = { 
    TLSEXT_SIGALG_ecdsa_sha1, /* SSL_PKEY_ECC */

    TLSEXT_SIGALG_gostr34102001_gostr3411, /* SSL_PKEY_GOST01 */

    TLSEXT_SIGALG_gostr34102012_256_gostr34112012_256, /* SSL_PKEY_GOST12_256 */

    TLSEXT_SIGALG_gostr34102012_512_gostr34112012_512 /* SSL_PKEY_GOST12_512 */

    TLSEXT_SIGALG_gostr34102012_512_gostr34112012_512, /* SSL_PKEY_GOST12_512 */

    0 /* SSL_PKEY_ED25519 */

};



/* Lookup TLS signature algorithm */
@@ -1394,6 +1395,8 @@ static int tls12_get_pkey_idx(int sig_nid) 
#ifndef OPENSSL_NO_EC

    case EVP_PKEY_EC:

        return SSL_PKEY_ECC;

    case NID_ED25519:

        return SSL_PKEY_ED25519;

#endif

#ifndef OPENSSL_NO_GOST

    case NID_id_GostR3410_2001: