eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Verify that f_send and f_recv send and receive the expected length

Browse source 
Verify that f_send and f_recv send and receive the expected length

Conflicts:
	ChangeLog
This commit is contained in:
mohammad1603 2018-03-22 02:40:43 -07:00
parent b11af86daf
commit 2ea2d686e2
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -33,8 +33,9 @@ Changes
* Fix typo in a comment ctr_drbg.c. Contributed by Paul Sokolovsky. * Fix typo in a comment ctr_drbg.c. Contributed by Paul Sokolovsky.
* MD functions deprecated in 2.7.0 are no longer inline, to provide * MD functions deprecated in 2.7.0 are no longer inline, to provide
a migration path for those depending on the library's ABI. a migration path for those depending on the library's ABI.
* Add guard to validate that out_left can not be negative. Raised by * Verify that when (f_send, f_recv and f_recv_timeout) send or receive
samoconnor in #1245. more than the required length an error is returned. Raised by
Sam O'Connor in #1245.
= mbed TLS 2.7.0 branch released 2018-02-03 = mbed TLS 2.7.0 branch released 2018-02-03

12
library/ssl_tls.c
View file

@ -2434,11 +2434,11 @@ int mbedtls_ssl_fetch_input( mbedtls_ssl_context *ssl, size_t nb_want )
if( ret < 0 ) if( ret < 0 )
return( ret ); return( ret );
// At this point ret value is positive, verify that adding ret if ( (size_t)ret > len )
// value to ssl->in_left doesn't cause a wraparound
if (ssl->in_left + (size_t)ret < ssl->in_left)
{ {
MBEDTLS_SSL_DEBUG_MSG( 1, ( "wraparound happened over in_left value" ) ); MBEDTLS_SSL_DEBUG_MSG( 1,
( "f_recv returned %d bytes but only %zu were requested",
ret, len ) );
return( MBEDTLS_ERR_SSL_INTERNAL_ERROR ); return( MBEDTLS_ERR_SSL_INTERNAL_ERROR );
} }
@ -2491,7 +2491,9 @@ int mbedtls_ssl_flush_output( mbedtls_ssl_context *ssl )
if( (size_t)ret > ssl->out_left ) if( (size_t)ret > ssl->out_left )
{ {
MBEDTLS_SSL_DEBUG_MSG( 1, ( "f_send returned value greater than out left size" ) ); MBEDTLS_SSL_DEBUG_MSG( 1,
( "f_send returned %d bytes but only %zu bytes were sent",
ret, ssl->out_left ) );
return( MBEDTLS_ERR_SSL_INTERNAL_ERROR ); return( MBEDTLS_ERR_SSL_INTERNAL_ERROR );
} }