Commit b43c3765 authored by Bernd Edlinger's avatar Bernd Edlinger
Browse files

Fix potential crash in tls_construct_finished. 



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

ssl/statem/statem_lib.c

+6 −1
Original line number Diff line number Diff line
@@ -501,7 +501,12 @@ int tls_construct_finished(SSL *s, WPACKET *pkt) 
            && (!s->method->ssl3_enc->change_cipher_state(s,

                    SSL3_CC_HANDSHAKE | SSL3_CHANGE_CIPHER_CLIENT_WRITE))) {

        SSLerr(SSL_F_TLS_CONSTRUCT_FINISHED, SSL_R_CANNOT_CHANGE_CIPHER);

        goto err;

        /*

         * This is a fatal error, which leaves

         * enc_write_ctx in an inconsistent state

         * and thus ssl3_send_alert may crash.

         */

        return 0;

    }



    if (s->server) {