mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-09 21:44:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix pending_alert issues

Browse Source 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2021-09-18 20:50:22 +08:00
parent 394ece6cdd
commit bbd5a3fded
3 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
library/ssl_misc.h
View File

@ -1358,7 +1358,6 @@ void mbedtls_ssl_pend_fatal_alert( mbedtls_ssl_context *ssl,
#define MBEDTLS_SSL_PEND_FATAL_ALERT( type, user_return_value ) \ #define MBEDTLS_SSL_PEND_FATAL_ALERT( type, user_return_value ) \
mbedtls_ssl_pend_fatal_alert( ssl, type, user_return_value ) mbedtls_ssl_pend_fatal_alert( ssl, type, user_return_value )
#if defined(MBEDTLS_SSL_DTLS_ANTI_REPLAY) #if defined(MBEDTLS_SSL_DTLS_ANTI_REPLAY)
void mbedtls_ssl_dtls_replay_reset( mbedtls_ssl_context *ssl ); void mbedtls_ssl_dtls_replay_reset( mbedtls_ssl_context *ssl );
#endif #endif

25
library/ssl_msg.c
View File

@ -5641,24 +5641,37 @@ void mbedtls_ssl_read_version( int *major, int *minor, int transport,
/* /*
* Send pending fatal alerts or warnings. * Send pending fatal alerts or warnings.
* 0, No alert message.
* !0, error from send_alert_message or handshake_step return
*/ */
int mbedtls_ssl_handle_pending_alert( mbedtls_ssl_context *ssl ) int mbedtls_ssl_handle_pending_alert( mbedtls_ssl_context *ssl )
{ {
int ret; int ret;
/* Send alert if requested */ /* No pending alert, return success*/
if( ssl->send_alert != 0 ) if( ssl->send_alert == 0 )
{ return( 0 );
/* Clear send_alert to avoid infinite loop */
ssl->send_alert = 0;
ret = mbedtls_ssl_send_alert_message( ssl, ret = mbedtls_ssl_send_alert_message( ssl,
MBEDTLS_SSL_ALERT_LEVEL_FATAL, MBEDTLS_SSL_ALERT_LEVEL_FATAL,
ssl->alert_type ); ssl->alert_type );
/* Success or send message fail, clear send_alert flag
* except WANT_WRITE. WANT_WRITE means need re-send message.
*/
if( ret != MBEDTLS_ERR_SSL_WANT_WRITE )
{
ssl->send_alert = 0;
}
if( ret != 0 ) if( ret != 0 )
{
/* some errors on send alert message */
return( ret ); return( ret );
} }
return( 0 );
/* Assume alert_reason == handshake_step return */
return( ssl->alert_reason );
} }
/* /*

5
library/ssl_tls.c
View File

@ -5205,10 +5205,15 @@ int mbedtls_ssl_handshake_step( mbedtls_ssl_context *ssl )
if( ret != 0 ) if( ret != 0 )
{ {
/* handshake_step return error. And it is same
* with alert_reason.
*/
int alert_ret; int alert_ret;
alert_ret = mbedtls_ssl_handle_pending_alert( ssl ); alert_ret = mbedtls_ssl_handle_pending_alert( ssl );
if( alert_ret != 0 ) if( alert_ret != 0 )
{ {
/* If success send, ret == alert_ret.
*/
ret = alert_ret; ret = alert_ret;
goto cleanup; goto cleanup;
} }