Commit 0c13c8ec authored by Matt Caswell's avatar Matt Caswell
Browse files

Don't get the mac type in TLSv1.3 



We don't use this information so we shouldn't fetch it. As noted in the
comments in #8005.

Reviewed-by: default avatarBen Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/8020)

(cherry picked from commit ea09abc8)
parent 709c6be2

ssl/tls13_enc.c

+1 −3
Original line number Diff line number Diff line
@@ -323,11 +323,9 @@ int tls13_setup_key_block(SSL *s) 
{

    const EVP_CIPHER *c;

    const EVP_MD *hash;

    int mac_type = NID_undef;



    s->session->cipher = s->s3->tmp.new_cipher;

    if (!ssl_cipher_get_evp

        (s->session, &c, &hash, &mac_type, NULL, NULL, 0)) {

    if (!ssl_cipher_get_evp(s->session, &c, &hash, NULL, NULL, NULL, 0)) {

        SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS13_SETUP_KEY_BLOCK,

                 SSL_R_CIPHER_OR_HASH_UNAVAILABLE);

        return 0;