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

Move ssl_check_timer() to public namespace

Browse source
This commit is contained in:
Hanno Becker 2020-02-05 10:39:31 +00:00
parent dd77229184
commit 7876d127a9
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mbedtls/ssl_internal.h
View file

@ -1077,4 +1077,6 @@ static inline size_t mbedtls_ssl_ep_len( const mbedtls_ssl_context *ssl )
void mbedtls_ssl_set_timer( mbedtls_ssl_context *ssl, uint32_t millisecs ); void mbedtls_ssl_set_timer( mbedtls_ssl_context *ssl, uint32_t millisecs );
int mbedtls_ssl_check_timer( mbedtls_ssl_context *ssl );
#endif /* ssl_internal.h */ #endif /* ssl_internal.h */

6
library/ssl_tls.c
View file

@ -80,7 +80,7 @@ void mbedtls_ssl_set_timer( mbedtls_ssl_context *ssl, uint32_t millisecs )
/* /*
* Return -1 is timer is expired, 0 if it isn't. * Return -1 is timer is expired, 0 if it isn't.
*/ */
static int ssl_check_timer( mbedtls_ssl_context *ssl ) int mbedtls_ssl_check_timer( mbedtls_ssl_context *ssl )
{ {
if( ssl->f_get_timer == NULL ) if( ssl->f_get_timer == NULL )
return( 0 ); return( 0 );
@ -3684,7 +3684,7 @@ int mbedtls_ssl_fetch_input( mbedtls_ssl_context *ssl, size_t nb_want )
* This avoids by-passing the timer when repeatedly receiving messages * This avoids by-passing the timer when repeatedly receiving messages
* that will end up being dropped. * that will end up being dropped.
*/ */
if( ssl_check_timer( ssl ) != 0 ) if( mbedtls_ssl_check_timer( ssl ) != 0 )
{ {
MBEDTLS_SSL_DEBUG_MSG( 2, ( "timer has expired" ) ); MBEDTLS_SSL_DEBUG_MSG( 2, ( "timer has expired" ) );
ret = MBEDTLS_ERR_SSL_TIMEOUT; ret = MBEDTLS_ERR_SSL_TIMEOUT;
@ -3763,7 +3763,7 @@ int mbedtls_ssl_fetch_input( mbedtls_ssl_context *ssl, size_t nb_want )
{ {
len = nb_want - ssl->in_left; len = nb_want - ssl->in_left;
if( ssl_check_timer( ssl ) != 0 ) if( mbedtls_ssl_check_timer( ssl ) != 0 )
ret = MBEDTLS_ERR_SSL_TIMEOUT; ret = MBEDTLS_ERR_SSL_TIMEOUT;
else else
{ {