commit 1ab322bb514b5a4dbc1a33293e5bbde503665065
author Hanno Becker <hanno.becker@arm.com> Tue Jun 11 14:50:54 2019 +0100
committer Hanno Becker <hanno.becker@arm.com> Tue Jun 25 08:42:20 2019 +0100
tree 79cd38401576a21fc16846f6bf6f6e3fc7bc2e9e
parent a49ec56f5199ddd895a8ddf7a646049a9aa1b7c8

Remove extended_ms field from HS param if ExtendedMS enforced

include/mbedtls/ssl_internal.h

diff --git a/include/mbedtls/ssl_internal.h b/include/mbedtls/ssl_internal.h
index 35b3a90..c9253bf 100644
--- a/include/mbedtls/ssl_internal.h
+++ b/include/mbedtls/ssl_internal.h
@@ -517,7 +517,8 @@
 #if defined(MBEDTLS_SSL_SESSION_TICKETS)
     int new_session_ticket;             /*!< use NewSessionTicket?    */
 #endif /* MBEDTLS_SSL_SESSION_TICKETS */
-#if defined(MBEDTLS_SSL_EXTENDED_MASTER_SECRET)
+#if defined(MBEDTLS_SSL_EXTENDED_MASTER_SECRET) &&      \
+    !defined(MBEDTLS_SSL_EXTENDED_MS_ENFORCED)
     int extended_ms;                    /*!< use Extended Master Secret? */
 #endif
 

library/ssl_cli.c

diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index 257a517..17611d6 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -2097,7 +2097,9 @@
     {
         if( extended_ms_seen )
         {
+#if !defined(MBEDTLS_SSL_EXTENDED_MS_ENFORCED)
             ssl->handshake->extended_ms = MBEDTLS_SSL_EXTENDED_MS_ENABLED;
+#endif /* !MBEDTLS_SSL_EXTENDED_MS_ENFORCED */
         }
         else if( mbedtls_ssl_conf_get_ems_enforced( ssl->conf ) ==
                  MBEDTLS_SSL_EXTENDED_MS_ENFORCE_ENABLED )

library/ssl_srv.c

diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index 023e0a8..ecde1b0 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -2042,7 +2042,9 @@
     {
         if( extended_ms_seen )
         {
+#if !defined(MBEDTLS_SSL_EXTENDED_MS_ENFORCED)
             ssl->handshake->extended_ms = MBEDTLS_SSL_EXTENDED_MS_ENABLED;
+#endif /* !MBEDTLS_SSL_EXTENDED_MS_ENFORCED */
         }
         else if( mbedtls_ssl_conf_get_ems_enforced( ssl->conf ) ==
                  MBEDTLS_SSL_EXTENDED_MS_ENFORCE_ENABLED )