From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Wed, 5 May 2021 12:29:28 +0000 (+0200)
Subject: Avoid sending alerts after shutdown
X-Git-Tag: OpenSSL_1_1_1l~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9e808fadcff1b1b4bf5dece753ee5eb00c9cc16;p=thirdparty%2Fopenssl.git

Avoid sending alerts after shutdown

Fixes #11388

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15159)

(cherry picked from commit 22d1138fe2fde9a16e80b81de1d848ae6fa879ef)
---

diff --git a/ssl/s3_msg.c b/ssl/s3_msg.c
index 339fb2774a6..721bbb73207 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);