yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-06-11 04:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use more specific name in debug message for testing

Browse source 
While 'session hash' is currently unique, so suitable to prove that the
intended code path has been taken, it's a generic enough phrase that in the
future we might add other debug messages containing it in completely unrelated
code paths. In order to future-proof the accuracy of the test, let's use a
more specific string.
This commit is contained in:
Manuel Pégourié-Gonnard 2019-05-20 12:09:50 +02:00
parent 762d011ece
commit 9c5bcc9220
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
library/ssl_tls.c
View file

@ -1143,7 +1143,8 @@ static int ssl_compute_master( mbedtls_ssl_handshake_params *handshake,
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 for extended master secret",
session_hash, hash_len );
ret = handshake->tls_prf( handshake->premaster, handshake->pmslen, ret = handshake->tls_prf( handshake->premaster, handshake->pmslen,
"extended master secret", "extended master secret",

20
tests/ssl-opt.sh
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 "session hash" \ -c "session hash for extended master secret" \
-s "session hash" -s "session hash for extended master secret"
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 "session hash" \ -C "session hash for extended master secret" \
-S "session hash" -S "session hash for extended master secret"
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 "session hash" \ -C "session hash for extended master secret" \
-S "session hash" -S "session hash for extended master secret"
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 "session hash" \ -C "session hash for extended master secret" \
-S "session hash" -S "session hash for extended master secret"
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 "session hash" \ -C "session hash for extended master secret" \
-S "session hash" -S "session hash for extended master secret"
# Tests for FALLBACK_SCSV # Tests for FALLBACK_SCSV