Merge branch 'mbedtls-1.3' into mbedtls-1.3-restricted

This commit is contained in:
Gilles Peskine 2018-01-23 01:06:53 +01:00
commit a9fc8c0b80

View File

@ -1963,7 +1963,7 @@ static void ssl_write_encrypt_then_mac_ext( ssl_context *ssl,
const ssl_ciphersuite_t *suite = NULL; const ssl_ciphersuite_t *suite = NULL;
const cipher_info_t *cipher = NULL; const cipher_info_t *cipher = NULL;
if( ssl->session_negotiate->encrypt_then_mac == SSL_EXTENDED_MS_DISABLED || if( ssl->session_negotiate->encrypt_then_mac == SSL_ETM_DISABLED ||
ssl->minor_ver == SSL_MINOR_VERSION_0 ) ssl->minor_ver == SSL_MINOR_VERSION_0 )
{ {
*olen = 0; *olen = 0;