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.
This commit is contained in:
Manuel Pégourié-Gonnard 2019-05-20 10:07:29 +02:00
parent 84ef8bde68
commit 5478e1e5ed
2 changed files with 10 additions and 12 deletions

View file

@ -1141,8 +1141,6 @@ static int ssl_compute_master( mbedtls_ssl_handshake_params *handshake,
unsigned char session_hash[48]; unsigned char session_hash[48];
size_t hash_len; size_t hash_len;
MBEDTLS_SSL_DEBUG_MSG( 3, ( "using extended master secret" ) );
handshake->calc_verify( ssl, session_hash, &hash_len ); handshake->calc_verify( ssl, session_hash, &hash_len );
MBEDTLS_SSL_DEBUG_BUF( 3, "session hash", session_hash, hash_len ); MBEDTLS_SSL_DEBUG_BUF( 3, "session hash", session_hash, hash_len );

View file

@ -1210,8 +1210,8 @@ run_test "Extended Master Secret: default" \
-s "found extended master secret extension" \ -s "found extended master secret extension" \
-s "server hello, adding extended master secret extension" \ -s "server hello, adding extended master secret extension" \
-c "found extended_master_secret extension" \ -c "found extended_master_secret extension" \
-c "using extended master secret" \ -c "session hash" \
-s "using extended master secret" -s "session hash"
run_test "Extended Master Secret: client enabled, server disabled" \ run_test "Extended Master Secret: client enabled, server disabled" \
"$P_SRV debug_level=3 extended_ms=0" \ "$P_SRV debug_level=3 extended_ms=0" \
@ -1221,8 +1221,8 @@ run_test "Extended Master Secret: client enabled, server disabled" \
-s "found extended master secret extension" \ -s "found extended master secret extension" \
-S "server hello, adding extended master secret extension" \ -S "server hello, adding extended master secret extension" \
-C "found extended_master_secret extension" \ -C "found extended_master_secret extension" \
-C "using extended master secret" \ -C "session hash" \
-S "using extended master secret" -S "session hash"
run_test "Extended Master Secret: client disabled, server enabled" \ run_test "Extended Master Secret: client disabled, server enabled" \
"$P_SRV debug_level=3 extended_ms=1" \ "$P_SRV debug_level=3 extended_ms=1" \
@ -1232,8 +1232,8 @@ run_test "Extended Master Secret: client disabled, server enabled" \
-S "found extended master secret extension" \ -S "found extended master secret extension" \
-S "server hello, adding extended master secret extension" \ -S "server hello, adding extended master secret extension" \
-C "found extended_master_secret extension" \ -C "found extended_master_secret extension" \
-C "using extended master secret" \ -C "session hash" \
-S "using extended master secret" -S "session hash"
requires_config_enabled MBEDTLS_SSL_PROTO_SSL3 requires_config_enabled MBEDTLS_SSL_PROTO_SSL3
run_test "Extended Master Secret: client SSLv3, server enabled" \ run_test "Extended Master Secret: client SSLv3, server enabled" \
@ -1244,8 +1244,8 @@ run_test "Extended Master Secret: client SSLv3, server enabled" \
-S "found extended master secret extension" \ -S "found extended master secret extension" \
-S "server hello, adding extended master secret extension" \ -S "server hello, adding extended master secret extension" \
-C "found extended_master_secret extension" \ -C "found extended_master_secret extension" \
-C "using extended master secret" \ -C "session hash" \
-S "using extended master secret" -S "session hash"
requires_config_enabled MBEDTLS_SSL_PROTO_SSL3 requires_config_enabled MBEDTLS_SSL_PROTO_SSL3
run_test "Extended Master Secret: client enabled, server SSLv3" \ run_test "Extended Master Secret: client enabled, server SSLv3" \
@ -1256,8 +1256,8 @@ run_test "Extended Master Secret: client enabled, server SSLv3" \
-S "found extended master secret extension" \ -S "found extended master secret extension" \
-S "server hello, adding extended master secret extension" \ -S "server hello, adding extended master secret extension" \
-C "found extended_master_secret extension" \ -C "found extended_master_secret extension" \
-C "using extended master secret" \ -C "session hash" \
-S "using extended master secret" -S "session hash"
# Tests for FALLBACK_SCSV # Tests for FALLBACK_SCSV