yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-10-19 04:31: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 committed by Jarno Lamsa
parent d91efa47c0
commit 8faa70e810
2 changed files with 44 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
library/ssl_tls.c
View file

@ -1656,7 +1656,8 @@ static int ssl_compute_master( mbedtls_ssl_handshake_params *handshake,
salt = session_hash; salt = session_hash;
handshake->calc_verify( ssl, session_hash, &salt_len ); handshake->calc_verify( ssl, session_hash, &salt_len );
MBEDTLS_SSL_DEBUG_BUF( 3, "session hash", session_hash, salt_len ); MBEDTLS_SSL_DEBUG_BUF( 3, "session hash for extended master secret",
session_hash, salt_len );
} }
#endif /* MBEDTLS_SSL_EXTENDED_MS_ENABLED */ #endif /* MBEDTLS_SSL_EXTENDED_MS_ENABLED */

84
tests/ssl-opt.sh
View file

@ -1939,8 +1939,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" \
@ -1950,8 +1950,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" \
@ -1961,8 +1961,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" \
@ -1973,8 +1973,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" \
@ -1985,8 +1985,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
@ -4782,8 +4782,8 @@ run_test "PSK callback: opaque psk on client, no callback" \
0 \ 0 \
-c "skip PMS generation for opaque PSK"\ -c "skip PMS generation for opaque PSK"\
-S "skip PMS generation for opaque PSK"\ -S "skip PMS generation for opaque PSK"\
-C "session hash"\ -C "session hash for extended master secret"\
-S "session hash"\ -S "session hash for extended master secret"\
-S "SSL - None of the common ciphersuites is usable" \ -S "SSL - None of the common ciphersuites is usable" \
-S "SSL - Unknown identity received" \ -S "SSL - Unknown identity received" \
-S "SSL - Verification of the message MAC failed" -S "SSL - Verification of the message MAC failed"
@ -4796,8 +4796,8 @@ run_test "PSK callback: opaque psk on client, no callback, SHA-384" \
0 \ 0 \
-c "skip PMS generation for opaque PSK"\ -c "skip PMS generation for opaque PSK"\
-S "skip PMS generation for opaque PSK"\ -S "skip PMS generation for opaque PSK"\
-C "session hash"\ -C "session hash for extended master secret"\
-S "session hash"\ -S "session hash for extended master secret"\
-S "SSL - None of the common ciphersuites is usable" \ -S "SSL - None of the common ciphersuites is usable" \
-S "SSL - Unknown identity received" \ -S "SSL - Unknown identity received" \
-S "SSL - Verification of the message MAC failed" -S "SSL - Verification of the message MAC failed"
@ -4810,8 +4810,8 @@ run_test "PSK callback: opaque psk on client, no callback, EMS" \
0 \ 0 \
-c "skip PMS generation for opaque PSK"\ -c "skip PMS generation for opaque PSK"\
-S "skip PMS generation for opaque PSK"\ -S "skip PMS generation for opaque PSK"\
-c "session hash"\ -c "session hash for extended master secret"\
-s "session hash"\ -s "session hash for extended master secret"\
-S "SSL - None of the common ciphersuites is usable" \ -S "SSL - None of the common ciphersuites is usable" \
-S "SSL - Unknown identity received" \ -S "SSL - Unknown identity received" \
-S "SSL - Verification of the message MAC failed" -S "SSL - Verification of the message MAC failed"
@ -4824,8 +4824,8 @@ run_test "PSK callback: opaque psk on client, no callback, SHA-384, EMS" \
0 \ 0 \
-c "skip PMS generation for opaque PSK"\ -c "skip PMS generation for opaque PSK"\
-S "skip PMS generation for opaque PSK"\ -S "skip PMS generation for opaque PSK"\
-c "session hash"\ -c "session hash for extended master secret"\
-s "session hash"\ -s "session hash for extended master secret"\
-S "SSL - None of the common ciphersuites is usable" \ -S "SSL - None of the common ciphersuites is usable" \
-S "SSL - Unknown identity received" \ -S "SSL - Unknown identity received" \
-S "SSL - Verification of the message MAC failed" -S "SSL - Verification of the message MAC failed"
@ -4838,8 +4838,8 @@ run_test "PSK callback: raw psk on client, static opaque on server, no callba
0 \ 0 \
-C "skip PMS generation for opaque PSK"\ -C "skip PMS generation for opaque PSK"\
-s "skip PMS generation for opaque PSK"\ -s "skip PMS generation for opaque PSK"\
-C "session hash"\ -C "session hash for extended master secret"\
-S "session hash"\ -S "session hash for extended master secret"\
-S "SSL - None of the common ciphersuites is usable" \ -S "SSL - None of the common ciphersuites is usable" \
-S "SSL - Unknown identity received" \ -S "SSL - Unknown identity received" \
-S "SSL - Verification of the message MAC failed" -S "SSL - Verification of the message MAC failed"
@ -4852,8 +4852,8 @@ run_test "PSK callback: raw psk on client, static opaque on server, no callba
0 \ 0 \
-C "skip PMS generation for opaque PSK"\ -C "skip PMS generation for opaque PSK"\
-s "skip PMS generation for opaque PSK"\ -s "skip PMS generation for opaque PSK"\
-C "session hash"\ -C "session hash for extended master secret"\
-S "session hash"\ -S "session hash for extended master secret"\
-S "SSL - None of the common ciphersuites is usable" \ -S "SSL - None of the common ciphersuites is usable" \
-S "SSL - Unknown identity received" \ -S "SSL - Unknown identity received" \
-S "SSL - Verification of the message MAC failed" -S "SSL - Verification of the message MAC failed"
@ -4865,8 +4865,8 @@ run_test "PSK callback: raw psk on client, static opaque on server, no callba
"$P_CLI debug_level=3 min_version=tls1_2 force_ciphersuite=TLS-PSK-WITH-AES-128-CBC-SHA \ "$P_CLI debug_level=3 min_version=tls1_2 force_ciphersuite=TLS-PSK-WITH-AES-128-CBC-SHA \
psk_identity=foo psk=abc123 extended_ms=1" \ psk_identity=foo psk=abc123 extended_ms=1" \
0 \ 0 \
-c "session hash"\ -c "session hash for extended master secret"\
-s "session hash"\ -s "session hash for extended master secret"\
-C "skip PMS generation for opaque PSK"\ -C "skip PMS generation for opaque PSK"\
-s "skip PMS generation for opaque PSK"\ -s "skip PMS generation for opaque PSK"\
-S "SSL - None of the common ciphersuites is usable" \ -S "SSL - None of the common ciphersuites is usable" \
@ -4880,8 +4880,8 @@ run_test "PSK callback: raw psk on client, static opaque on server, no callba
"$P_CLI debug_level=3 min_version=tls1_2 force_ciphersuite=TLS-PSK-WITH-AES-256-CBC-SHA384 \ "$P_CLI debug_level=3 min_version=tls1_2 force_ciphersuite=TLS-PSK-WITH-AES-256-CBC-SHA384 \
psk_identity=foo psk=abc123 extended_ms=1" \ psk_identity=foo psk=abc123 extended_ms=1" \
0 \ 0 \
-c "session hash"\ -c "session hash for extended master secret"\
-s "session hash"\ -s "session hash for extended master secret"\
-C "skip PMS generation for opaque PSK"\ -C "skip PMS generation for opaque PSK"\
-s "skip PMS generation for opaque PSK"\ -s "skip PMS generation for opaque PSK"\
-S "SSL - None of the common ciphersuites is usable" \ -S "SSL - None of the common ciphersuites is usable" \
@ -4896,8 +4896,8 @@ run_test "PSK callback: raw psk on client, no static PSK on server, opaque PS
0 \ 0 \
-C "skip PMS generation for opaque PSK"\ -C "skip PMS generation for opaque PSK"\
-s "skip PMS generation for opaque PSK"\ -s "skip PMS generation for opaque PSK"\
-C "session hash"\ -C "session hash for extended master secret"\
-S "session hash"\ -S "session hash for extended master secret"\
-S "SSL - None of the common ciphersuites is usable" \ -S "SSL - None of the common ciphersuites is usable" \
-S "SSL - Unknown identity received" \ -S "SSL - Unknown identity received" \
-S "SSL - Verification of the message MAC failed" -S "SSL - Verification of the message MAC failed"
@ -4910,8 +4910,8 @@ run_test "PSK callback: raw psk on client, no static PSK on server, opaque PS
0 \ 0 \
-C "skip PMS generation for opaque PSK"\ -C "skip PMS generation for opaque PSK"\
-s "skip PMS generation for opaque PSK"\ -s "skip PMS generation for opaque PSK"\
-C "session hash"\ -C "session hash for extended master secret"\
-S "session hash"\ -S "session hash for extended master secret"\
-S "SSL - None of the common ciphersuites is usable" \ -S "SSL - None of the common ciphersuites is usable" \
-S "SSL - Unknown identity received" \ -S "SSL - Unknown identity received" \
-S "SSL - Verification of the message MAC failed" -S "SSL - Verification of the message MAC failed"
@ -4923,8 +4923,8 @@ run_test "PSK callback: raw psk on client, no static PSK on server, opaque PS
"$P_CLI debug_level=3 min_version=tls1_2 force_ciphersuite=TLS-PSK-WITH-AES-128-CBC-SHA \ "$P_CLI debug_level=3 min_version=tls1_2 force_ciphersuite=TLS-PSK-WITH-AES-128-CBC-SHA \
psk_identity=abc psk=dead extended_ms=1" \ psk_identity=abc psk=dead extended_ms=1" \
0 \ 0 \
-c "session hash"\ -c "session hash for extended master secret"\
-s "session hash"\ -s "session hash for extended master secret"\
-C "skip PMS generation for opaque PSK"\ -C "skip PMS generation for opaque PSK"\
-s "skip PMS generation for opaque PSK"\ -s "skip PMS generation for opaque PSK"\
-S "SSL - None of the common ciphersuites is usable" \ -S "SSL - None of the common ciphersuites is usable" \
@ -4938,8 +4938,8 @@ run_test "PSK callback: raw psk on client, no static PSK on server, opaque PS
"$P_CLI debug_level=3 min_version=tls1_2 force_ciphersuite=TLS-PSK-WITH-AES-256-CBC-SHA384 \ "$P_CLI debug_level=3 min_version=tls1_2 force_ciphersuite=TLS-PSK-WITH-AES-256-CBC-SHA384 \
psk_identity=abc psk=dead extended_ms=1" \ psk_identity=abc psk=dead extended_ms=1" \
0 \ 0 \
-c "session hash"\ -c "session hash for extended master secret"\
-s "session hash"\ -s "session hash for extended master secret"\
-C "skip PMS generation for opaque PSK"\ -C "skip PMS generation for opaque PSK"\
-s "skip PMS generation for opaque PSK"\ -s "skip PMS generation for opaque PSK"\
-S "SSL - None of the common ciphersuites is usable" \ -S "SSL - None of the common ciphersuites is usable" \
@ -4954,8 +4954,8 @@ run_test "PSK callback: raw psk on client, mismatching static raw PSK on serv
0 \ 0 \
-C "skip PMS generation for opaque PSK"\ -C "skip PMS generation for opaque PSK"\
-s "skip PMS generation for opaque PSK"\ -s "skip PMS generation for opaque PSK"\
-C "session hash"\ -C "session hash for extended master secret"\
-S "session hash"\ -S "session hash for extended master secret"\
-S "SSL - None of the common ciphersuites is usable" \ -S "SSL - None of the common ciphersuites is usable" \
-S "SSL - Unknown identity received" \ -S "SSL - Unknown identity received" \
-S "SSL - Verification of the message MAC failed" -S "SSL - Verification of the message MAC failed"
@ -4968,8 +4968,8 @@ run_test "PSK callback: raw psk on client, mismatching static opaque PSK on s
0 \ 0 \
-C "skip PMS generation for opaque PSK"\ -C "skip PMS generation for opaque PSK"\
-s "skip PMS generation for opaque PSK"\ -s "skip PMS generation for opaque PSK"\
-C "session hash"\ -C "session hash for extended master secret"\
-S "session hash"\ -S "session hash for extended master secret"\
-S "SSL - None of the common ciphersuites is usable" \ -S "SSL - None of the common ciphersuites is usable" \
-S "SSL - Unknown identity received" \ -S "SSL - Unknown identity received" \
-S "SSL - Verification of the message MAC failed" -S "SSL - Verification of the message MAC failed"
@ -4981,8 +4981,8 @@ run_test "PSK callback: raw psk on client, mismatching static opaque PSK on s
psk_identity=def psk=beef" \ psk_identity=def psk=beef" \
0 \ 0 \
-C "skip PMS generation for opaque PSK"\ -C "skip PMS generation for opaque PSK"\
-C "session hash"\ -C "session hash for extended master secret"\
-S "session hash"\ -S "session hash for extended master secret"\
-S "SSL - None of the common ciphersuites is usable" \ -S "SSL - None of the common ciphersuites is usable" \
-S "SSL - Unknown identity received" \ -S "SSL - Unknown identity received" \
-S "SSL - Verification of the message MAC failed" -S "SSL - Verification of the message MAC failed"
@ -4994,8 +4994,8 @@ run_test "PSK callback: raw psk on client, id-matching but wrong raw PSK on s
psk_identity=def psk=beef" \ psk_identity=def psk=beef" \
0 \ 0 \
-C "skip PMS generation for opaque PSK"\ -C "skip PMS generation for opaque PSK"\
-C "session hash"\ -C "session hash for extended master secret"\
-S "session hash"\ -S "session hash for extended master secret"\
-S "SSL - None of the common ciphersuites is usable" \ -S "SSL - None of the common ciphersuites is usable" \
-S "SSL - Unknown identity received" \ -S "SSL - Unknown identity received" \
-S "SSL - Verification of the message MAC failed" -S "SSL - Verification of the message MAC failed"