diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2018-03-16 13:29:51 +0100 |
|---|---|---|
| committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2018-03-19 14:16:54 +0100 |
| commit | d4ef4fbf46a51837a54e4a7cd0140eb9f08fdf30 (patch) | |
| tree | 1507db0bb8061345eca6f69296477e43aef8e43d /ssl/statem/statem.c | |
| parent | df6d51e2e4599da2c85e04e919bf30db3744af20 (diff) | |
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)
Diffstat (limited to 'ssl/statem/statem.c')
| -rw-r--r-- | ssl/statem/statem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c index a574853487..1f221e7542 100644 --- a/ssl/statem/statem.c +++ b/ssl/statem/statem.c @@ -123,7 +123,7 @@ void ossl_statem_fatal(SSL *s, int al, int func, int reason, const char *file, 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); } |