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

Merge pull request #3805 from hanno-arm/check_dtls_timers_only_once

Browse source 
Check presence of DTLS retransmission timers only once
This commit is contained in:
Janos Follath 2020-10-22 14:29:16 +01:00 committed by GitHub
parent 1b275cc5d0 a817ea449a
commit da9f92c2b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
library/ssl_msg.c
View file

@ -2018,14 +2018,6 @@ int mbedtls_ssl_fetch_input( mbedtls_ssl_context *ssl, size_t nb_want )
{ {
uint32_t timeout; uint32_t timeout;
/* Just to be sure */
if( ssl->f_set_timer == NULL || ssl->f_get_timer == NULL )
{
MBEDTLS_SSL_DEBUG_MSG( 1, ( "You must use "
"mbedtls_ssl_set_timer_cb() for DTLS" ) );
return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
}
/* /*
* The point is, we need to always read a full datagram at once, so we * The point is, we need to always read a full datagram at once, so we
* sometimes read more then requested, and handle the additional data. * sometimes read more then requested, and handle the additional data.

13
library/ssl_tls.c
View file

@ -5682,11 +5682,24 @@ int mbedtls_ssl_handshake( mbedtls_ssl_context *ssl )
{ {
int ret = 0; int ret = 0;
/* Sanity checks */
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 defined(MBEDTLS_SSL_PROTO_DTLS)
if( ssl->conf->transport == MBEDTLS_SSL_TRANSPORT_DATAGRAM &&
( ssl->f_set_timer == NULL || ssl->f_get_timer == NULL ) )
{
MBEDTLS_SSL_DEBUG_MSG( 1, ( "You must use "
"mbedtls_ssl_set_timer_cb() for DTLS" ) );
return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
}
#endif /* MBEDTLS_SSL_PROTO_DTLS */
MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> handshake" ) ); MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> handshake" ) );
/* Main handshake loop */
while( ssl->state != MBEDTLS_SSL_HANDSHAKE_OVER ) while( ssl->state != MBEDTLS_SSL_HANDSHAKE_OVER )
{ {
ret = mbedtls_ssl_handshake_step( ssl ); ret = mbedtls_ssl_handshake_step( ssl );