The branch OpenSSL_1_1_1-stable has been updated via a9e808fadcff1b1b4bf5dece753ee5eb00c9cc16 (commit) from 9f85ab647c8c9f47a1523f99facdf15fc34797a0 (commit)
- Log ----------------------------------------------------------------- commit a9e808fadcff1b1b4bf5dece753ee5eb00c9cc16 Author: Dmitry Belyavskiy <beld...@gmail.com> Date: Wed May 5 14:29:28 2021 +0200 Avoid sending alerts after shutdown Fixes #11388 Reviewed-by: Matt Caswell <m...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15159) (cherry picked from commit 22d1138fe2fde9a16e80b81de1d848ae6fa879ef) ----------------------------------------------------------------------- Summary of changes: ssl/s3_msg.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ssl/s3_msg.c b/ssl/s3_msg.c index 339fb2774a..721bbb7320 100644 --- a/ssl/s3_msg.c +++ b/ssl/s3_msg.c @@ -48,6 +48,8 @@ int ssl3_send_alert(SSL *s, int level, int desc) * protocol_version alerts */ if (desc < 0) return -1; + if (s->shutdown & SSL_SENT_SHUTDOWN && desc != SSL_AD_CLOSE_NOTIFY) + return -1; /* If a fatal one, remove from cache */ if ((level == SSL3_AL_FATAL) && (s->session != NULL)) SSL_CTX_remove_session(s->session_ctx, s->session);