| commit | 17f6477a1e3d4abe3180b98fcfc2a05ff79121fe | [log] [tgz] |
|---|---|---|
| author | Gilles Peskine <Gilles.Peskine@arm.com> | Tue Jan 23 01:06:33 2018 +0100 |
| committer | Gilles Peskine <Gilles.Peskine@arm.com> | Tue Jan 23 01:06:33 2018 +0100 |
| tree | 926d113b9dfe7e6bb2ebe6b5d96e438b60ed014b | |
| parent | d3e3725dda64abf02a18f4bc702dbfc1fea1cd14 [diff] | |
| parent | c2f52b4b7b886093d823227fa35bce2b95be7d98 [diff] |
Merge remote-tracking branch 'upstream-public/pr/1152' into mbedtls-1.3
diff --git a/library/ssl_srv.c b/library/ssl_srv.c index 0f0369a..d141b05 100644 --- a/library/ssl_srv.c +++ b/library/ssl_srv.c
@@ -1963,7 +1963,7 @@ const ssl_ciphersuite_t *suite = 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 ) { *olen = 0;