Normalize whitespace in defragmentation test cases

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2025-03-01 13:53:18 +01:00
parent b40d33b7c8
commit aaab090ad8

View File

@ -4,7 +4,7 @@
requires_certificate_authentication requires_certificate_authentication
run_test "Handshake defragmentation on client (no fragmentation, for reference)" \ run_test "Handshake defragmentation on client (no fragmentation, for reference)" \
"$O_NEXT_SRV" \ "$O_NEXT_SRV" \
"$P_CLI debug_level=4 " \ "$P_CLI debug_level=4" \
0 \ 0 \
-C "reassembled record" \ -C "reassembled record" \
-C "waiting for more fragments" -C "waiting for more fragments"
@ -12,8 +12,8 @@ run_test "Handshake defragmentation on client (no fragmentation, for referenc
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication requires_certificate_authentication
run_test "Handshake defragmentation on client: len=512, TLS 1.3" \ run_test "Handshake defragmentation on client: len=512, TLS 1.3" \
"$O_NEXT_SRV -tls1_3 -split_send_frag 512 " \ "$O_NEXT_SRV -tls1_3 -split_send_frag 512" \
"$P_CLI debug_level=4 " \ "$P_CLI debug_level=4" \
0 \ 0 \
-c "reassembled record" \ -c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 512 of [0-9]\\+ msglen 512" \ -c "handshake fragment: 0 \\.\\. 512 of [0-9]\\+ msglen 512" \
@ -24,8 +24,8 @@ requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_certificate_authentication requires_certificate_authentication
requires_config_enabled MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED requires_config_enabled MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
run_test "Handshake defragmentation on client: len=512, TLS 1.2" \ run_test "Handshake defragmentation on client: len=512, TLS 1.2" \
"$O_NEXT_SRV -tls1_2 -split_send_frag 512 " \ "$O_NEXT_SRV -tls1_2 -split_send_frag 512" \
"$P_CLI debug_level=4 " \ "$P_CLI debug_level=4" \
0 \ 0 \
-c "reassembled record" \ -c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 512 of [0-9]\\+ msglen 512" \ -c "handshake fragment: 0 \\.\\. 512 of [0-9]\\+ msglen 512" \
@ -34,8 +34,8 @@ run_test "Handshake defragmentation on client: len=512, TLS 1.2" \
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication requires_certificate_authentication
run_test "Handshake defragmentation on client: len=513, TLS 1.3" \ run_test "Handshake defragmentation on client: len=513, TLS 1.3" \
"$O_NEXT_SRV -tls1_3 -split_send_frag 513 " \ "$O_NEXT_SRV -tls1_3 -split_send_frag 513" \
"$P_CLI debug_level=4 " \ "$P_CLI debug_level=4" \
0 \ 0 \
-c "reassembled record" \ -c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 513 of [0-9]\\+ msglen 513" \ -c "handshake fragment: 0 \\.\\. 513 of [0-9]\\+ msglen 513" \
@ -45,8 +45,8 @@ requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_certificate_authentication requires_certificate_authentication
requires_config_enabled MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED requires_config_enabled MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
run_test "Handshake defragmentation on client: len=513, TLS 1.2" \ run_test "Handshake defragmentation on client: len=513, TLS 1.2" \
"$O_NEXT_SRV -tls1_2 -split_send_frag 513 " \ "$O_NEXT_SRV -tls1_2 -split_send_frag 513" \
"$P_CLI debug_level=4 " \ "$P_CLI debug_level=4" \
0 \ 0 \
-c "reassembled record" \ -c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 513 of [0-9]\\+ msglen 513" \ -c "handshake fragment: 0 \\.\\. 513 of [0-9]\\+ msglen 513" \
@ -55,8 +55,8 @@ run_test "Handshake defragmentation on client: len=513, TLS 1.2" \
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication requires_certificate_authentication
run_test "Handshake defragmentation on client: len=256, TLS 1.3" \ run_test "Handshake defragmentation on client: len=256, TLS 1.3" \
"$O_NEXT_SRV -tls1_3 -split_send_frag 256 " \ "$O_NEXT_SRV -tls1_3 -split_send_frag 256" \
"$P_CLI debug_level=4 " \ "$P_CLI debug_level=4" \
0 \ 0 \
-c "reassembled record" \ -c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 256 of [0-9]\\+ msglen 256" \ -c "handshake fragment: 0 \\.\\. 256 of [0-9]\\+ msglen 256" \
@ -66,8 +66,8 @@ requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_certificate_authentication requires_certificate_authentication
requires_config_enabled MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED requires_config_enabled MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
run_test "Handshake defragmentation on client: len=256, TLS 1.2" \ run_test "Handshake defragmentation on client: len=256, TLS 1.2" \
"$O_NEXT_SRV -tls1_2 -split_send_frag 256 " \ "$O_NEXT_SRV -tls1_2 -split_send_frag 256" \
"$P_CLI debug_level=4 " \ "$P_CLI debug_level=4" \
0 \ 0 \
-c "reassembled record" \ -c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 256 of [0-9]\\+ msglen 256" \ -c "handshake fragment: 0 \\.\\. 256 of [0-9]\\+ msglen 256" \
@ -76,8 +76,8 @@ run_test "Handshake defragmentation on client: len=256, TLS 1.2" \
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication requires_certificate_authentication
run_test "Handshake defragmentation on client: len=128, TLS 1.3" \ run_test "Handshake defragmentation on client: len=128, TLS 1.3" \
"$O_NEXT_SRV -tls1_3 -split_send_frag 128 " \ "$O_NEXT_SRV -tls1_3 -split_send_frag 128" \
"$P_CLI debug_level=4 " \ "$P_CLI debug_level=4" \
0 \ 0 \
-c "reassembled record" \ -c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 128 of [0-9]\\+ msglen 128" \ -c "handshake fragment: 0 \\.\\. 128 of [0-9]\\+ msglen 128" \
@ -87,8 +87,8 @@ requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_certificate_authentication requires_certificate_authentication
requires_config_enabled MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED requires_config_enabled MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
run_test "Handshake defragmentation on client: len=128, TLS 1.2" \ run_test "Handshake defragmentation on client: len=128, TLS 1.2" \
"$O_NEXT_SRV -tls1_2 -split_send_frag 128 " \ "$O_NEXT_SRV -tls1_2 -split_send_frag 128" \
"$P_CLI debug_level=4 " \ "$P_CLI debug_level=4" \
0 \ 0 \
-c "reassembled record" \ -c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 128 of [0-9]\\+ msglen 128" \ -c "handshake fragment: 0 \\.\\. 128 of [0-9]\\+ msglen 128" \
@ -97,8 +97,8 @@ run_test "Handshake defragmentation on client: len=128, TLS 1.2" \
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication requires_certificate_authentication
run_test "Handshake defragmentation on client: len=64, TLS 1.3" \ run_test "Handshake defragmentation on client: len=64, TLS 1.3" \
"$O_NEXT_SRV -tls1_3 -split_send_frag 64 " \ "$O_NEXT_SRV -tls1_3 -split_send_frag 64" \
"$P_CLI debug_level=4 " \ "$P_CLI debug_level=4" \
0 \ 0 \
-c "reassembled record" \ -c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 64 of [0-9]\\+ msglen 64" \ -c "handshake fragment: 0 \\.\\. 64 of [0-9]\\+ msglen 64" \
@ -108,8 +108,8 @@ requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_certificate_authentication requires_certificate_authentication
requires_config_enabled MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED requires_config_enabled MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
run_test "Handshake defragmentation on client: len=64, TLS 1.2" \ run_test "Handshake defragmentation on client: len=64, TLS 1.2" \
"$O_NEXT_SRV -tls1_2 -split_send_frag 64 " \ "$O_NEXT_SRV -tls1_2 -split_send_frag 64" \
"$P_CLI debug_level=4 " \ "$P_CLI debug_level=4" \
0 \ 0 \
-c "reassembled record" \ -c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 64 of [0-9]\\+ msglen 64" \ -c "handshake fragment: 0 \\.\\. 64 of [0-9]\\+ msglen 64" \
@ -118,8 +118,8 @@ run_test "Handshake defragmentation on client: len=64, TLS 1.2" \
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication requires_certificate_authentication
run_test "Handshake defragmentation on client: len=36, TLS 1.3" \ run_test "Handshake defragmentation on client: len=36, TLS 1.3" \
"$O_NEXT_SRV -tls1_3 -split_send_frag 36 " \ "$O_NEXT_SRV -tls1_3 -split_send_frag 36" \
"$P_CLI debug_level=4 " \ "$P_CLI debug_level=4" \
0 \ 0 \
-c "reassembled record" \ -c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 36 of [0-9]\\+ msglen 36" \ -c "handshake fragment: 0 \\.\\. 36 of [0-9]\\+ msglen 36" \
@ -129,8 +129,8 @@ requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_certificate_authentication requires_certificate_authentication
requires_config_enabled MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED requires_config_enabled MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
run_test "Handshake defragmentation on client: len=36, TLS 1.2" \ run_test "Handshake defragmentation on client: len=36, TLS 1.2" \
"$O_NEXT_SRV -tls1_2 -split_send_frag 36 " \ "$O_NEXT_SRV -tls1_2 -split_send_frag 36" \
"$P_CLI debug_level=4 " \ "$P_CLI debug_level=4" \
0 \ 0 \
-c "reassembled record" \ -c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 36 of [0-9]\\+ msglen 36" \ -c "handshake fragment: 0 \\.\\. 36 of [0-9]\\+ msglen 36" \
@ -139,8 +139,8 @@ run_test "Handshake defragmentation on client: len=36, TLS 1.2" \
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication requires_certificate_authentication
run_test "Handshake defragmentation on client: len=32, TLS 1.3" \ run_test "Handshake defragmentation on client: len=32, TLS 1.3" \
"$O_NEXT_SRV -tls1_3 -split_send_frag 32 " \ "$O_NEXT_SRV -tls1_3 -split_send_frag 32" \
"$P_CLI debug_level=4 " \ "$P_CLI debug_level=4" \
0 \ 0 \
-c "reassembled record" \ -c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 32 of [0-9]\\+ msglen 32" \ -c "handshake fragment: 0 \\.\\. 32 of [0-9]\\+ msglen 32" \
@ -150,8 +150,8 @@ requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_certificate_authentication requires_certificate_authentication
requires_config_enabled MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED requires_config_enabled MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
run_test "Handshake defragmentation on client: len=32, TLS 1.2" \ run_test "Handshake defragmentation on client: len=32, TLS 1.2" \
"$O_NEXT_SRV -tls1_2 -split_send_frag 32 " \ "$O_NEXT_SRV -tls1_2 -split_send_frag 32" \
"$P_CLI debug_level=4 " \ "$P_CLI debug_level=4" \
0 \ 0 \
-c "reassembled record" \ -c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 32 of [0-9]\\+ msglen 32" \ -c "handshake fragment: 0 \\.\\. 32 of [0-9]\\+ msglen 32" \
@ -160,8 +160,8 @@ run_test "Handshake defragmentation on client: len=32, TLS 1.2" \
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication requires_certificate_authentication
run_test "Handshake defragmentation on client: len=16, TLS 1.3" \ run_test "Handshake defragmentation on client: len=16, TLS 1.3" \
"$O_NEXT_SRV -tls1_3 -split_send_frag 16 " \ "$O_NEXT_SRV -tls1_3 -split_send_frag 16" \
"$P_CLI debug_level=4 " \ "$P_CLI debug_level=4" \
0 \ 0 \
-c "reassembled record" \ -c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 16 of [0-9]\\+ msglen 16" \ -c "handshake fragment: 0 \\.\\. 16 of [0-9]\\+ msglen 16" \
@ -171,8 +171,8 @@ requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_certificate_authentication requires_certificate_authentication
requires_config_enabled MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED requires_config_enabled MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
run_test "Handshake defragmentation on client: len=16, TLS 1.2" \ run_test "Handshake defragmentation on client: len=16, TLS 1.2" \
"$O_NEXT_SRV -tls1_2 -split_send_frag 16 " \ "$O_NEXT_SRV -tls1_2 -split_send_frag 16" \
"$P_CLI debug_level=4 " \ "$P_CLI debug_level=4" \
0 \ 0 \
-c "reassembled record" \ -c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 16 of [0-9]\\+ msglen 16" \ -c "handshake fragment: 0 \\.\\. 16 of [0-9]\\+ msglen 16" \
@ -181,8 +181,8 @@ run_test "Handshake defragmentation on client: len=16, TLS 1.2" \
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication requires_certificate_authentication
run_test "Handshake defragmentation on client: len=13, TLS 1.3" \ run_test "Handshake defragmentation on client: len=13, TLS 1.3" \
"$O_NEXT_SRV -tls1_3 -split_send_frag 13 " \ "$O_NEXT_SRV -tls1_3 -split_send_frag 13" \
"$P_CLI debug_level=4 " \ "$P_CLI debug_level=4" \
0 \ 0 \
-c "reassembled record" \ -c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 13 of [0-9]\\+ msglen 13" \ -c "handshake fragment: 0 \\.\\. 13 of [0-9]\\+ msglen 13" \
@ -192,8 +192,8 @@ skip_next_test
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_certificate_authentication requires_certificate_authentication
run_test "Handshake defragmentation on client: len=13, TLS 1.2" \ run_test "Handshake defragmentation on client: len=13, TLS 1.2" \
"$O_NEXT_SRV -tls1_2 -split_send_frag 13 " \ "$O_NEXT_SRV -tls1_2 -split_send_frag 13" \
"$P_CLI debug_level=4 " \ "$P_CLI debug_level=4" \
0 \ 0 \
-c "reassembled record" \ -c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 13 of [0-9]\\+ msglen 13" \ -c "handshake fragment: 0 \\.\\. 13 of [0-9]\\+ msglen 13" \
@ -202,8 +202,8 @@ run_test "Handshake defragmentation on client: len=13, TLS 1.2" \
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication requires_certificate_authentication
run_test "Handshake defragmentation on client: len=5, TLS 1.3" \ run_test "Handshake defragmentation on client: len=5, TLS 1.3" \
"$O_NEXT_SRV -tls1_3 -split_send_frag 5 " \ "$O_NEXT_SRV -tls1_3 -split_send_frag 5" \
"$P_CLI debug_level=4 " \ "$P_CLI debug_level=4" \
0 \ 0 \
-c "reassembled record" \ -c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 5 of [0-9]\\+ msglen 5" \ -c "handshake fragment: 0 \\.\\. 5 of [0-9]\\+ msglen 5" \
@ -213,8 +213,8 @@ skip_next_test
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_certificate_authentication requires_certificate_authentication
run_test "Handshake defragmentation on client: len=5, TLS 1.2" \ run_test "Handshake defragmentation on client: len=5, TLS 1.2" \
"$O_NEXT_SRV -tls1_2 -split_send_frag 5 " \ "$O_NEXT_SRV -tls1_2 -split_send_frag 5" \
"$P_CLI debug_level=4 " \ "$P_CLI debug_level=4" \
0 \ 0 \
-c "reassembled record" \ -c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 5 of [0-9]\\+ msglen 5" \ -c "handshake fragment: 0 \\.\\. 5 of [0-9]\\+ msglen 5" \
@ -223,8 +223,8 @@ run_test "Handshake defragmentation on client: len=5, TLS 1.2" \
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication requires_certificate_authentication
run_test "Handshake defragmentation on client: len=4, TLS 1.3" \ run_test "Handshake defragmentation on client: len=4, TLS 1.3" \
"$O_NEXT_SRV -tls1_3 -split_send_frag 4 " \ "$O_NEXT_SRV -tls1_3 -split_send_frag 4" \
"$P_CLI debug_level=4 " \ "$P_CLI debug_level=4" \
0 \ 0 \
-c "reassembled record" \ -c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 4 of [0-9]\\+ msglen 4" \ -c "handshake fragment: 0 \\.\\. 4 of [0-9]\\+ msglen 4" \
@ -234,8 +234,8 @@ skip_next_test
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_certificate_authentication requires_certificate_authentication
run_test "Handshake defragmentation on client: len=4, TLS 1.2" \ run_test "Handshake defragmentation on client: len=4, TLS 1.2" \
"$O_NEXT_SRV -tls1_2 -split_send_frag 4 " \ "$O_NEXT_SRV -tls1_2 -split_send_frag 4" \
"$P_CLI debug_level=4 " \ "$P_CLI debug_level=4" \
0 \ 0 \
-c "reassembled record" \ -c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 4 of [0-9]\\+ msglen 4" \ -c "handshake fragment: 0 \\.\\. 4 of [0-9]\\+ msglen 4" \
@ -244,8 +244,8 @@ run_test "Handshake defragmentation on client: len=4, TLS 1.2" \
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication requires_certificate_authentication
run_test "Handshake defragmentation on client: len=3, TLS 1.3" \ run_test "Handshake defragmentation on client: len=3, TLS 1.3" \
"$O_NEXT_SRV -tls1_3 -split_send_frag 3 " \ "$O_NEXT_SRV -tls1_3 -split_send_frag 3" \
"$P_CLI debug_level=4 " \ "$P_CLI debug_level=4" \
1 \ 1 \
-c "=> ssl_tls13_process_server_hello" \ -c "=> ssl_tls13_process_server_hello" \
-c "handshake message too short: 3" \ -c "handshake message too short: 3" \
@ -253,8 +253,8 @@ run_test "Handshake defragmentation on client: len=3, TLS 1.3" \
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
run_test "Handshake defragmentation on client: len=3, TLS 1.2" \ run_test "Handshake defragmentation on client: len=3, TLS 1.2" \
"$O_NEXT_SRV -tls1_2 -split_send_frag 3 " \ "$O_NEXT_SRV -tls1_2 -split_send_frag 3" \
"$P_CLI debug_level=4 " \ "$P_CLI debug_level=4" \
1 \ 1 \
-c "handshake message too short: 3" \ -c "handshake message too short: 3" \
-c "SSL - An invalid SSL record was received" -c "SSL - An invalid SSL record was received"