mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2025-01-12 09:45:39 +00:00
Merge pull request #4098 from gstrauss/remove-redundant-condition
remove ssl_parse_client_hello redundant conditions
This commit is contained in:
commit
2aff17b8c5
|
@ -1887,8 +1887,7 @@ read_record_header:
|
||||||
ext_len = ( buf[ext_offset + 0] << 8 )
|
ext_len = ( buf[ext_offset + 0] << 8 )
|
||||||
| ( buf[ext_offset + 1] );
|
| ( buf[ext_offset + 1] );
|
||||||
|
|
||||||
if( ( ext_len > 0 && ext_len < 4 ) ||
|
if( msg_len != ext_offset + 2 + ext_len )
|
||||||
msg_len != ext_offset + 2 + ext_len )
|
|
||||||
{
|
{
|
||||||
MBEDTLS_SSL_DEBUG_MSG( 1, ( "bad client hello message" ) );
|
MBEDTLS_SSL_DEBUG_MSG( 1, ( "bad client hello message" ) );
|
||||||
mbedtls_ssl_send_alert_message( ssl, MBEDTLS_SSL_ALERT_LEVEL_FATAL,
|
mbedtls_ssl_send_alert_message( ssl, MBEDTLS_SSL_ALERT_LEVEL_FATAL,
|
||||||
|
@ -2079,14 +2078,6 @@ read_record_header:
|
||||||
|
|
||||||
ext_len -= 4 + ext_size;
|
ext_len -= 4 + ext_size;
|
||||||
ext += 4 + ext_size;
|
ext += 4 + ext_size;
|
||||||
|
|
||||||
if( ext_len > 0 && ext_len < 4 )
|
|
||||||
{
|
|
||||||
MBEDTLS_SSL_DEBUG_MSG( 1, ( "bad client hello message" ) );
|
|
||||||
mbedtls_ssl_send_alert_message( ssl, MBEDTLS_SSL_ALERT_LEVEL_FATAL,
|
|
||||||
MBEDTLS_SSL_ALERT_MSG_DECODE_ERROR );
|
|
||||||
return( MBEDTLS_ERR_SSL_BAD_HS_CLIENT_HELLO );
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
#if defined(MBEDTLS_SSL_PROTO_SSL3)
|
#if defined(MBEDTLS_SSL_PROTO_SSL3)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue