| commit | a9fc8c0b807896f4c8a76c3ccbc076c99ced6cd2 | [log] [tgz] |
|---|---|---|
| author | Gilles Peskine <Gilles.Peskine@arm.com> | Tue Jan 23 01:06:53 2018 +0100 |
| committer | Gilles Peskine <Gilles.Peskine@arm.com> | Tue Jan 23 01:06:53 2018 +0100 |
| tree | 33c0e14421f1b895ed473f33c293bd5cb6f95283 | |
| parent | d3df16fc0a38eee1018a6760e7ae3e10cfe70f65 [diff] | |
| parent | 17f6477a1e3d4abe3180b98fcfc2a05ff79121fe [diff] |
Merge branch 'mbedtls-1.3' into mbedtls-1.3-restricted
diff --git a/library/ssl_srv.c b/library/ssl_srv.c index 90995c0..dd6397c 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;