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

For TLS 1.3 retrieve previously set certificate index 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2339)
parent e10dbdbf

ssl/ssl_lib.c

+8 −5
Original line number Original line Diff line number Diff line
@@ -2838,11 +2838,14 @@ static int ssl_get_server_cert_index(const SSL *s) 
{

{

    int idx;

    int idx;





    /*

    if (SSL_IS_TLS13(s)) {

     * TODO(TLS1.3): In TLS1.3 the selected certificate is not based on the

        if (s->s3->tmp.sigalg == NULL) {

     * ciphersuite. For now though it still is. Our only TLS1.3 ciphersuite

            SSLerr(SSL_F_SSL_GET_SERVER_CERT_INDEX, ERR_R_INTERNAL_ERROR);

     * forces the use of an RSA cert. This will need to change.

            return -1;

     */

        }

        return s->s3->tmp.cert_idx;

    }



    idx = ssl_cipher_get_cert_index(s->s3->tmp.new_cipher);

    idx = ssl_cipher_get_cert_index(s->s3->tmp.new_cipher);

    if (idx == SSL_PKEY_RSA_ENC && !s->cert->pkeys[SSL_PKEY_RSA_ENC].x509)

    if (idx == SSL_PKEY_RSA_ENC && !s->cert->pkeys[SSL_PKEY_RSA_ENC].x509)

        idx = SSL_PKEY_RSA_SIGN;

        idx = SSL_PKEY_RSA_SIGN;