mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-11-26 04:35:44 +01:00
Make alert sending function re-entrant
Fixes #1916 Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
parent
e29a837ed3
commit
d9c66c0509
@ -4918,6 +4918,9 @@ int mbedtls_ssl_send_alert_message( mbedtls_ssl_context *ssl,
|
|||||||
if( ssl == NULL || ssl->conf == NULL )
|
if( ssl == NULL || ssl->conf == NULL )
|
||||||
return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
|
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( 2, ( "=> send alert message" ) );
|
||||||
MBEDTLS_SSL_DEBUG_MSG( 3, ( "send alert level=%u message=%u", level, message ));
|
MBEDTLS_SSL_DEBUG_MSG( 3, ( "send alert level=%u message=%u", level, message ));
|
||||||
|
|
||||||
@ -5790,9 +5793,6 @@ int mbedtls_ssl_close_notify( mbedtls_ssl_context *ssl )
|
|||||||
|
|
||||||
MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> write close notify" ) );
|
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( ssl->state == MBEDTLS_SSL_HANDSHAKE_OVER )
|
||||||
{
|
{
|
||||||
if( ( ret = mbedtls_ssl_send_alert_message( ssl,
|
if( ( ret = mbedtls_ssl_send_alert_message( ssl,
|
||||||
|
Loading…
Reference in New Issue
Block a user