commit 5478e1e5ede50c9c881dcdbafa51dbbc20c58d20
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Mon May 20 10:07:29 2019 +0200
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Mon May 20 10:07:29 2019 +0200
tree 47ba5767b1749610cd09990124d6475ce112ee9d
parent 84ef8bde6847f19d0fbff5413a8b3abfd1210464

Remove redundant debug message.

Two consecutive messages (ie no branch between them) at the same level are not
needed, so only keep the one that has the most information.

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 4329c08..cb47059 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -1141,8 +1141,6 @@
         unsigned char session_hash[48];
         size_t hash_len;
 
-        MBEDTLS_SSL_DEBUG_MSG( 3, ( "using extended master secret" ) );
-
         handshake->calc_verify( ssl, session_hash, &hash_len );
 
         MBEDTLS_SSL_DEBUG_BUF( 3, "session hash", session_hash, hash_len );

tests/ssl-opt.sh

diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index 9a96294..92eb62c 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -1210,8 +1210,8 @@
             -s "found extended master secret extension" \
             -s "server hello, adding extended master secret extension" \
             -c "found extended_master_secret extension" \
-            -c "using extended master secret" \
-            -s "using extended master secret"
+            -c "session hash" \
+            -s "session hash"
 
 run_test    "Extended Master Secret: client enabled, server disabled" \
             "$P_SRV debug_level=3 extended_ms=0" \
@@ -1221,8 +1221,8 @@
             -s "found extended master secret extension" \
             -S "server hello, adding extended master secret extension" \
             -C "found extended_master_secret extension" \
-            -C "using extended master secret" \
-            -S "using extended master secret"
+            -C "session hash" \
+            -S "session hash"
 
 run_test    "Extended Master Secret: client disabled, server enabled" \
             "$P_SRV debug_level=3 extended_ms=1" \
@@ -1232,8 +1232,8 @@
             -S "found extended master secret extension" \
             -S "server hello, adding extended master secret extension" \
             -C "found extended_master_secret extension" \
-            -C "using extended master secret" \
-            -S "using extended master secret"
+            -C "session hash" \
+            -S "session hash"
 
 requires_config_enabled MBEDTLS_SSL_PROTO_SSL3
 run_test    "Extended Master Secret: client SSLv3, server enabled" \
@@ -1244,8 +1244,8 @@
             -S "found extended master secret extension" \
             -S "server hello, adding extended master secret extension" \
             -C "found extended_master_secret extension" \
-            -C "using extended master secret" \
-            -S "using extended master secret"
+            -C "session hash" \
+            -S "session hash"
 
 requires_config_enabled MBEDTLS_SSL_PROTO_SSL3
 run_test    "Extended Master Secret: client enabled, server SSLv3" \
@@ -1256,8 +1256,8 @@
             -S "found extended master secret extension" \
             -S "server hello, adding extended master secret extension" \
             -C "found extended_master_secret extension" \
-            -C "using extended master secret" \
-            -S "using extended master secret"
+            -C "session hash" \
+            -S "session hash"
 
 # Tests for FALLBACK_SCSV