commit 5e18f74abba8bb41148839b8a77d1abc9c7431ec
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:16:43 2022 +0100
tree fc7171bba80ee0285443e1ef2349b4a198eb3538
parent a91b68564c8160a1c2c9582cb8c870d215ec19e0

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 4eac24b..051e4b0 100644
--- a/library/ssl_msg.c
+++ b/library/ssl_msg.c
@@ -4855,6 +4855,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 ));
 
@@ -5714,9 +5717,6 @@
 
     MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> write close notify" ) );
 
-    if( ssl->out_left != 0 )
-        return( mbedtls_ssl_flush_output( ssl ) );
-
     if( mbedtls_ssl_is_handshake_over( ssl ) == 1 )
     {
         if( ( ret = mbedtls_ssl_send_alert_message( ssl,