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

Merge remote-tracking branch 'upstream-public/pr/1451' into mbedtls-2.7-proposed

Browse source
This commit is contained in:
Jaeden Amero 2018-03-14 17:50:01 +00:00
parent 6013004fa9 4e0141fc00
commit e1c916ca5e
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -106,6 +106,8 @@ Security
* Change default choice of DHE parameters from untrustworthy RFC 5114 * Change default choice of DHE parameters from untrustworthy RFC 5114
to RFC 3526 containing parameters generated in a nothing-up-my-sleeve to RFC 3526 containing parameters generated in a nothing-up-my-sleeve
manner. manner.
* Fix a buffer overread in ssl_parse_server_key_exchange() that could cause
a crash on invalid input.
Features Features
* Allow comments in test data files. * Allow comments in test data files.
@ -240,6 +242,8 @@ Bugfix
* In mbedtls_entropy_free(), properly free the message digest context. * In mbedtls_entropy_free(), properly free the message digest context.
* Fix status handshake status message in programs/ssl/dtls_client.c. Found * Fix status handshake status message in programs/ssl/dtls_client.c. Found
and fixed by muddog. and fixed by muddog.
* Fix a possible arithmetic overflow in ssl_parse_server_key_exchange()
that could cause a key exchange to fail on valid data.
Changes Changes
* Extend cert_write example program by options to set the certificate version * Extend cert_write example program by options to set the certificate version

9
library/ssl_cli.c
View file

@ -2478,10 +2478,17 @@ static int ssl_parse_server_key_exchange( mbedtls_ssl_context *ssl )
/* /*
* Read signature * Read signature
*/ */
if( p > end - 2 )
{
MBEDTLS_SSL_DEBUG_MSG( 1, ( "bad server key exchange message" ) );
mbedtls_ssl_send_alert_message( ssl, MBEDTLS_SSL_ALERT_LEVEL_FATAL,
MBEDTLS_SSL_ALERT_MSG_DECODE_ERROR );
return( MBEDTLS_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE );
}
sig_len = ( p[0] << 8 ) | p[1]; sig_len = ( p[0] << 8 ) | p[1];
p += 2; p += 2;
if( end != p + sig_len ) if( p != end - sig_len )
{ {
MBEDTLS_SSL_DEBUG_MSG( 1, ( "bad server key exchange message" ) ); MBEDTLS_SSL_DEBUG_MSG( 1, ( "bad server key exchange message" ) );
mbedtls_ssl_send_alert_message( ssl, MBEDTLS_SSL_ALERT_LEVEL_FATAL, mbedtls_ssl_send_alert_message( ssl, MBEDTLS_SSL_ALERT_LEVEL_FATAL,