Fix a crash in SSLfatal due to invalid enc_write_ctx Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5645)
diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c index f775f26..966d498 100644 --- a/ssl/s3_enc.c +++ b/ssl/s3_enc.c
@@ -155,6 +155,7 @@ RECORD_LAYER_reset_read_sequence(&s->rlayer); mac_secret = &(s->s3->read_mac_secret[0]); } else { + s->statem.invalid_enc_write_ctx = 1; if (s->enc_write_ctx != NULL) { reuse_dd = 1; } else if ((s->enc_write_ctx = EVP_CIPHER_CTX_new()) == NULL) { @@ -238,6 +239,7 @@ goto err; } + s->statem.invalid_enc_write_ctx = 0; OPENSSL_cleanse(exp_key, sizeof(exp_key)); OPENSSL_cleanse(exp_iv, sizeof(exp_iv)); return 1;
diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c index a574853..1f221e7 100644 --- a/ssl/statem/statem.c +++ b/ssl/statem/statem.c
@@ -123,7 +123,7 @@ s->statem.in_init = 1; s->statem.state = MSG_FLOW_ERROR; ERR_put_error(ERR_LIB_SSL, func, reason, file, line); - if (al != SSL_AD_NO_ALERT) + if (al != SSL_AD_NO_ALERT && !s->statem.invalid_enc_write_ctx) ssl3_send_alert(s, SSL3_AL_FATAL, al); }
diff --git a/ssl/statem/statem.h b/ssl/statem/statem.h index 1935718..95dd881 100644 --- a/ssl/statem/statem.h +++ b/ssl/statem/statem.h
@@ -100,6 +100,7 @@ /* Should we skip the CertificateVerify message? */ unsigned int no_cert_verify; int use_timer; + int invalid_enc_write_ctx; }; typedef struct ossl_statem_st OSSL_STATEM;
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c index bd7ff50..a138b60 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c
@@ -154,6 +154,7 @@ mac_secret = &(s->s3->read_mac_secret[0]); mac_secret_size = &(s->s3->read_mac_secret_size); } else { + s->statem.invalid_enc_write_ctx = 1; if (s->ext.use_etm) s->s3->flags |= TLS1_FLAGS_ENCRYPT_THEN_MAC_WRITE; else @@ -316,6 +317,7 @@ ERR_R_INTERNAL_ERROR); goto err; } + s->statem.invalid_enc_write_ctx = 0; #ifdef SSL_DEBUG printf("which = %04X\nkey=", which);
diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c index 08fbee5..7f43958 100644 --- a/ssl/tls13_enc.c +++ b/ssl/tls13_enc.c
@@ -397,6 +397,7 @@ RECORD_LAYER_reset_read_sequence(&s->rlayer); } else { + s->statem.invalid_enc_write_ctx = 1; if (s->enc_write_ctx != NULL) { EVP_CIPHER_CTX_reset(s->enc_write_ctx); } else { @@ -609,6 +610,7 @@ goto err; } + s->statem.invalid_enc_write_ctx = 0; ret = 1; err: OPENSSL_cleanse(secret, sizeof(secret)); @@ -631,6 +633,7 @@ insecret = s->client_app_traffic_secret; if (sending) { + s->statem.invalid_enc_write_ctx = 1; iv = s->write_iv; ciph_ctx = s->enc_write_ctx; RECORD_LAYER_reset_write_sequence(&s->rlayer); @@ -651,6 +654,7 @@ memcpy(insecret, secret, hashlen); + s->statem.invalid_enc_write_ctx = 0; ret = 1; err: OPENSSL_cleanse(secret, sizeof(secret));