commit d9c66c0509953d702f6fb48479d5986cf0183541
author Hanno Becker <hanno.becker@arm.com> Mon Aug 06 11:35:16 2018 +0100
committer Dave Rodgman <dave.rodgman@arm.com> Fri Apr 08 12:06:14 2022 +0100
tree 872f31417bb33752892fdc494a038272f4b44144
parent e29a837ed3c5fcaa7be945a40c67723e971a8999

Make alert sending function re-entrant

Fixes #1916

Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>

library/ssl_msg.c

diff --git a/library/ssl_msg.c b/library/ssl_msg.c
index 0b696dd..0b1322d 100644
--- a/library/ssl_msg.c
+++ b/library/ssl_msg.c
@@ -4918,6 +4918,9 @@
     if( ssl == NULL || ssl->conf == NULL )
         return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
 
+    if( ssl->out_left != 0 )
+        return( mbedtls_ssl_flush_output( ssl ) );
+
     MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> send alert message" ) );
     MBEDTLS_SSL_DEBUG_MSG( 3, ( "send alert level=%u message=%u", level, message ));
 
@@ -5790,9 +5793,6 @@
 
     MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> write close notify" ) );
 
-    if( ssl->out_left != 0 )
-        return( mbedtls_ssl_flush_output( ssl ) );
-
     if( ssl->state == MBEDTLS_SSL_HANDSHAKE_OVER )
     {
         if( ( ret = mbedtls_ssl_send_alert_message( ssl,