commit 0295634b21b6ab5c70b4fbde3c7fa1eb33853bae
author Jaeden Amero <jaeden.amero@arm.com> Wed Jan 24 10:55:56 2018 +0000
committer Jaeden Amero <jaeden.amero@arm.com> Wed Jan 24 10:55:56 2018 +0000
tree e21ae7eb033c0257f37993dcd6bfea675195a64b
parent 6598af0bef67822729023e430574772a6f44b8d5
parent f700ef38fa325d996c5006eef1d345b9d98dda25

Merge remote-tracking branch 'upstream-public/pr/1278' into mbedtls-2.1

library/ssl_srv.c

diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index 1002adf..9d1904c 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -1941,7 +1941,7 @@
     const mbedtls_ssl_ciphersuite_t *suite = NULL;
     const mbedtls_cipher_info_t *cipher = NULL;
 
-    if( ssl->session_negotiate->encrypt_then_mac == MBEDTLS_SSL_EXTENDED_MS_DISABLED ||
+    if( ssl->session_negotiate->encrypt_then_mac == MBEDTLS_SSL_ETM_DISABLED ||
         ssl->minor_ver == MBEDTLS_SSL_MINOR_VERSION_0 )
     {
         *olen = 0;