yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-12-23 20:25:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move call to ssl_consume_current_message()

Browse source 
Subsequent commits will potentially inject buffered
messages after the last incoming message has been
consumed, but before a new one is fetched. As a
preparatory step to this, this commit moves the call
to ssl_consume_current_message() from ssl_read_record_layer()
to the calling function mbedtls_ssl_read_record().
This commit is contained in:
Hanno Becker 2018-08-15 14:14:59 +01:00
parent 1097b34022
commit 2699459529
1 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
library/ssl_tls.c
View file

@ -4299,6 +4299,10 @@ int mbedtls_ssl_read_record( mbedtls_ssl_context *ssl,
{ {
do { do {
ret = ssl_consume_current_message( ssl );
if( ret != 0 )
return( ret );
ret = ssl_read_record_layer( ssl ); ret = ssl_read_record_layer( ssl );
if( ret == MBEDTLS_ERR_SSL_CONTINUE_PROCESSING ) if( ret == MBEDTLS_ERR_SSL_CONTINUE_PROCESSING )
continue; continue;
@ -4429,22 +4433,7 @@ static int ssl_read_record_layer( mbedtls_ssl_context *ssl )
int ret; int ret;
/* /*
* Step A
*
* Consume last content-layer message and potentially
* update in_msglen which keeps track of the contents'
* consumption state.
*/
ret = ssl_consume_current_message( ssl );
if( ret != 0 )
return( ret );
/*
* Step B
*
* Fetch and decode new record if current one is fully consumed. * Fetch and decode new record if current one is fully consumed.
*
*/ */
if( ssl->in_msglen > 0 ) if( ssl->in_msglen > 0 )