Rename pend_alert_msg -> pending_fatal_alert_msg

This commit is contained in:
Hanno Becker 2019-07-25 11:15:08 +01:00
parent d829d0fbd0
commit c8f529995f
3 changed files with 8 additions and 8 deletions

View file

@ -1235,7 +1235,7 @@ struct mbedtls_ssl_context
{
const mbedtls_ssl_config *conf; /*!< configuration information */
unsigned char pend_alert_msg;
unsigned char pending_fatal_alert_msg;
/*
* Miscellaneous

View file

@ -1736,14 +1736,14 @@ static inline unsigned int mbedtls_ssl_conf_get_ems_enforced(
* The check for pending alerts must be done manually. Currently,
* it happens only during the handshake loop.
*
* This function must not be called multiple times without manually
* inspecting and clearing ssl->pending_fatal_alert_msg in between.
* This function must not be called multiple times without
* manually inspecting and clearing ssl->pending_fatal_alert_msg in between.
*/
MBEDTLS_ALWAYS_INLINE static inline void mbedtls_ssl_pend_fatal_alert(
mbedtls_ssl_context *ssl,
unsigned char message )
{
ssl->pend_alert_msg = message;
ssl->pending_fatal_alert_msg = message;
}
#endif /* ssl_internal.h */

View file

@ -7974,7 +7974,7 @@ int mbedtls_ssl_setup( mbedtls_ssl_context *ssl,
if( ( ret = ssl_handshake_init( ssl ) ) != 0 )
goto error;
ssl->pend_alert_msg = MBEDTLS_SSL_ALERT_MSG_NONE;
ssl->pending_fatal_alert_msg = MBEDTLS_SSL_ALERT_MSG_NONE;
return( 0 );
@ -9828,12 +9828,12 @@ int mbedtls_ssl_handshake_step( mbedtls_ssl_context *ssl )
ret = mbedtls_ssl_handshake_server_step( ssl );
#endif
if( ssl->pend_alert_msg != MBEDTLS_SSL_ALERT_MSG_NONE )
if( ssl->pending_fatal_alert_msg != MBEDTLS_SSL_ALERT_MSG_NONE )
{
mbedtls_ssl_send_alert_message( ssl,
MBEDTLS_SSL_ALERT_LEVEL_FATAL,
ssl->pend_alert_msg );
ssl->pend_alert_msg = MBEDTLS_SSL_ALERT_MSG_NONE;
ssl->pending_fatal_alert_msg );
ssl->pending_fatal_alert_msg = MBEDTLS_SSL_ALERT_MSG_NONE;
}
return( ret );
}