From b43c37658600300de485100185eebec8bfa3dbcf Mon Sep 17 00:00:00 2001 From: Bernd Edlinger Date: Wed, 14 Jun 2017 20:25:52 +0200 Subject: [PATCH] Fix potential crash in tls_construct_finished. Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/3667) --- ssl/statem/statem_lib.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c index 5cd17f2836..933f18ecbb 100644 --- a/ssl/statem/statem_lib.c +++ b/ssl/statem/statem_lib.c @@ -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) { -- 2.40.0