Merge remote-tracking branch 'public/pr/1955' into iotssl-165-dtls-hs-fragmentation-new

* public/pr/1955:
  Adapt ChangeLog
  Fix overly strict bounds check in ssl_parse_certificate_request()
This commit is contained in:
Manuel Pégourié-Gonnard 2018-08-17 10:49:47 +02:00
commit 3879fdfece
2 changed files with 4 additions and 1 deletions

View file

@ -2730,7 +2730,7 @@ static int ssl_parse_certificate_request( mbedtls_ssl_context *ssl )
* therefore the buffer length at this point must be greater than that
* regardless of the actual code path.
*/
if( ssl->in_hslen <= mbedtls_ssl_hs_hdr_len( ssl ) + 3 + n )
if( ssl->in_hslen <= mbedtls_ssl_hs_hdr_len( ssl ) + 2 + n )
{
MBEDTLS_SSL_DEBUG_MSG( 1, ( "bad certificate request message" ) );
mbedtls_ssl_send_alert_message( ssl, MBEDTLS_SSL_ALERT_LEVEL_FATAL,