[openssl] master update
beldmit at gmail.com
beldmit at gmail.com
Thu May 6 15:10:10 UTC 2021
The branch master has been updated
via 22d1138fe2fde9a16e80b81de1d848ae6fa879ef (commit)
from 021521aa91d7b1a47f3c3b704f1cc39f169b2e5b (commit)
- Log -----------------------------------------------------------------
commit 22d1138fe2fde9a16e80b81de1d848ae6fa879ef
Author: Dmitry Belyavskiy <beldmit at gmail.com>
Date: Wed May 5 14:29:28 2021 +0200
Avoid sending alerts after shutdown
Fixes #11388
Reviewed-by: Matt Caswell <matt at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15159)
-----------------------------------------------------------------------
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 066623d5fb..4b0906820e 100644
--- a/ssl/s3_msg.c
+++ b/ssl/s3_msg.c
@@ -52,6 +52,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);
More information about the openssl-commits
mailing list