Merge remote-tracking branch 'gilles/iotssl-1223/development' into development

* gilles/iotssl-1223/development:
  Fix FALLBACK_SCSV parsing
This commit is contained in:
Manuel Pégourié-Gonnard 2017-06-06 20:11:36 +02:00
commit ddc6e52cc1
4 changed files with 122 additions and 3 deletions

View file

@ -1820,7 +1820,7 @@ read_record_header:
#endif
#if defined(MBEDTLS_SSL_FALLBACK_SCSV)
for( i = 0, p = buf + 41 + sess_len; i < ciph_len; i += 2, p += 2 )
for( i = 0, p = buf + ciph_offset + 2; i < ciph_len; i += 2, p += 2 )
{
if( p[0] == (unsigned char)( ( MBEDTLS_SSL_FALLBACK_SCSV_VALUE >> 8 ) & 0xff ) &&
p[1] == (unsigned char)( ( MBEDTLS_SSL_FALLBACK_SCSV_VALUE ) & 0xff ) )