yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-02-02 06:41:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move ssl_set_timer() to public namespace

Browse source
This commit is contained in:
Hanno Becker 2020-02-05 10:37:26 +00:00
parent 148c3deba1
commit 0f57a65391
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mbedtls/ssl_internal.h
View file

@ -1063,4 +1063,6 @@ int mbedtls_ssl_decrypt_buf( mbedtls_ssl_context const *ssl,
mbedtls_ssl_transform *transform, mbedtls_ssl_transform *transform,
mbedtls_record *rec ); mbedtls_record *rec );
void mbedtls_ssl_set_timer( mbedtls_ssl_context *ssl, uint32_t millisecs );
#endif /* ssl_internal.h */ #endif /* ssl_internal.h */

22
library/ssl_tls.c
View file

@ -80,7 +80,7 @@ static inline size_t ssl_ep_len( const mbedtls_ssl_context *ssl )
* Start a timer. * Start a timer.
* Passing millisecs = 0 cancels a running timer. * Passing millisecs = 0 cancels a running timer.
*/ */
static void ssl_set_timer( mbedtls_ssl_context *ssl, uint32_t millisecs ) void mbedtls_ssl_set_timer( mbedtls_ssl_context *ssl, uint32_t millisecs )
{ {
if( ssl->f_set_timer == NULL ) if( ssl->f_set_timer == NULL )
return; return;
@ -3727,7 +3727,7 @@ int mbedtls_ssl_fetch_input( mbedtls_ssl_context *ssl, size_t nb_want )
if( ret == MBEDTLS_ERR_SSL_TIMEOUT ) if( ret == MBEDTLS_ERR_SSL_TIMEOUT )
{ {
MBEDTLS_SSL_DEBUG_MSG( 2, ( "timeout" ) ); MBEDTLS_SSL_DEBUG_MSG( 2, ( "timeout" ) );
ssl_set_timer( ssl, 0 ); mbedtls_ssl_set_timer( ssl, 0 );
if( ssl->state != MBEDTLS_SSL_HANDSHAKE_OVER ) if( ssl->state != MBEDTLS_SSL_HANDSHAKE_OVER )
{ {
@ -4167,7 +4167,7 @@ int mbedtls_ssl_flight_transmit( mbedtls_ssl_context *ssl )
else else
{ {
ssl->handshake->retransmit_state = MBEDTLS_SSL_RETRANS_WAITING; ssl->handshake->retransmit_state = MBEDTLS_SSL_RETRANS_WAITING;
ssl_set_timer( ssl, ssl->handshake->retransmit_timeout ); mbedtls_ssl_set_timer( ssl, ssl->handshake->retransmit_timeout );
} }
MBEDTLS_SSL_DEBUG_MSG( 2, ( "<= mbedtls_ssl_flight_transmit" ) ); MBEDTLS_SSL_DEBUG_MSG( 2, ( "<= mbedtls_ssl_flight_transmit" ) );
@ -4195,7 +4195,7 @@ void mbedtls_ssl_recv_flight_completed( mbedtls_ssl_context *ssl )
ssl_buffering_free( ssl ); ssl_buffering_free( ssl );
/* Cancel timer */ /* Cancel timer */
ssl_set_timer( ssl, 0 ); mbedtls_ssl_set_timer( ssl, 0 );
if( ssl->in_msgtype == MBEDTLS_SSL_MSG_HANDSHAKE && if( ssl->in_msgtype == MBEDTLS_SSL_MSG_HANDSHAKE &&
ssl->in_msg[0] == MBEDTLS_SSL_HS_FINISHED ) ssl->in_msg[0] == MBEDTLS_SSL_HS_FINISHED )
@ -4212,7 +4212,7 @@ void mbedtls_ssl_recv_flight_completed( mbedtls_ssl_context *ssl )
void mbedtls_ssl_send_flight_completed( mbedtls_ssl_context *ssl ) void mbedtls_ssl_send_flight_completed( mbedtls_ssl_context *ssl )
{ {
ssl_reset_retransmit_timeout( ssl ); ssl_reset_retransmit_timeout( ssl );
ssl_set_timer( ssl, ssl->handshake->retransmit_timeout ); mbedtls_ssl_set_timer( ssl, ssl->handshake->retransmit_timeout );
if( ssl->in_msgtype == MBEDTLS_SSL_MSG_HANDSHAKE && if( ssl->in_msgtype == MBEDTLS_SSL_MSG_HANDSHAKE &&
ssl->in_msg[0] == MBEDTLS_SSL_HS_FINISHED ) ssl->in_msg[0] == MBEDTLS_SSL_HS_FINISHED )
@ -8082,7 +8082,7 @@ void mbedtls_ssl_handshake_wrapup( mbedtls_ssl_context *ssl )
ssl->handshake->flight != NULL ) ssl->handshake->flight != NULL )
{ {
/* Cancel handshake timer */ /* Cancel handshake timer */
ssl_set_timer( ssl, 0 ); mbedtls_ssl_set_timer( ssl, 0 );
/* Keep last flight around in case we need to resend it: /* Keep last flight around in case we need to resend it:
* we need the handshake and transform structures for that */ * we need the handshake and transform structures for that */
@ -8447,7 +8447,7 @@ static int ssl_handshake_init( mbedtls_ssl_context *ssl )
else else
ssl->handshake->retransmit_state = MBEDTLS_SSL_RETRANS_WAITING; ssl->handshake->retransmit_state = MBEDTLS_SSL_RETRANS_WAITING;
ssl_set_timer( ssl, 0 ); mbedtls_ssl_set_timer( ssl, 0 );
} }
#endif #endif
@ -8693,7 +8693,7 @@ static int ssl_session_reset_int( mbedtls_ssl_context *ssl, int partial )
ssl->state = MBEDTLS_SSL_HELLO_REQUEST; ssl->state = MBEDTLS_SSL_HELLO_REQUEST;
/* Cancel any possibly running timer */ /* Cancel any possibly running timer */
ssl_set_timer( ssl, 0 ); mbedtls_ssl_set_timer( ssl, 0 );
#if defined(MBEDTLS_SSL_RENEGOTIATION) #if defined(MBEDTLS_SSL_RENEGOTIATION)
ssl->renego_status = MBEDTLS_SSL_INITIAL_HANDSHAKE; ssl->renego_status = MBEDTLS_SSL_INITIAL_HANDSHAKE;
@ -8913,7 +8913,7 @@ void mbedtls_ssl_set_timer_cb( mbedtls_ssl_context *ssl,
ssl->f_get_timer = f_get_timer; ssl->f_get_timer = f_get_timer;
/* Make sure we start with no timer running */ /* Make sure we start with no timer running */
ssl_set_timer( ssl, 0 ); mbedtls_ssl_set_timer( ssl, 0 );
} }
#if defined(MBEDTLS_SSL_SRV_C) #if defined(MBEDTLS_SSL_SRV_C)
@ -10779,7 +10779,7 @@ int mbedtls_ssl_read( mbedtls_ssl_context *ssl, unsigned char *buf, size_t len )
if( ssl->f_get_timer != NULL && if( ssl->f_get_timer != NULL &&
ssl->f_get_timer( ssl->p_timer ) == -1 ) ssl->f_get_timer( ssl->p_timer ) == -1 )
{ {
ssl_set_timer( ssl, ssl->conf->read_timeout ); mbedtls_ssl_set_timer( ssl, ssl->conf->read_timeout );
} }
if( ( ret = mbedtls_ssl_read_record( ssl, 1 ) ) != 0 ) if( ( ret = mbedtls_ssl_read_record( ssl, 1 ) ) != 0 )
@ -10972,7 +10972,7 @@ int mbedtls_ssl_read( mbedtls_ssl_context *ssl, unsigned char *buf, size_t len )
/* We're going to return something now, cancel timer, /* We're going to return something now, cancel timer,
* except if handshake (renegotiation) is in progress */ * except if handshake (renegotiation) is in progress */
if( ssl->state == MBEDTLS_SSL_HANDSHAKE_OVER ) if( ssl->state == MBEDTLS_SSL_HANDSHAKE_OVER )
ssl_set_timer( ssl, 0 ); mbedtls_ssl_set_timer( ssl, 0 );
#if defined(MBEDTLS_SSL_PROTO_DTLS) #if defined(MBEDTLS_SSL_PROTO_DTLS)
/* If we requested renego but received AppData, resend HelloRequest. /* If we requested renego but received AppData, resend HelloRequest.