From: agnosticdev <agnosticdev@gmail.com>
Date: Wed, 29 May 2019 15:27:26 +0000 (-0500)
Subject: issue-8998: Ensure that the alert is generated and reaches the remote
X-Git-Tag: OpenSSL_1_1_1d~164
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e9ad1e00e1f02502eea5f99cfe8463bc93fac3cf;p=oweals%2Fopenssl.git

issue-8998: Ensure that the alert is generated and reaches the remote

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

(cherry picked from commit 03da376ff7504c63a1d00d57cf41bd7b7e93ff65)
---

diff --git a/ssl/d1_msg.c b/ssl/d1_msg.c
index 5906e88ca6..aecd321b36 100644
--- a/ssl/d1_msg.c
+++ b/ssl/d1_msg.c
@@ -52,8 +52,7 @@ int dtls1_dispatch_alert(SSL *s)
         s->s3->alert_dispatch = 1;
         /* fprintf( stderr, "not done with alert\n" ); */
     } else {
-        if (s->s3->send_alert[0] == SSL3_AL_FATAL)
-            (void)BIO_flush(s->wbio);
+        (void)BIO_flush(s->wbio);
 
         if (s->msg_callback)
             s->msg_callback(1, s->version, SSL3_RT_ALERT, s->s3->send_alert,