Normalize messages in defragmentation test cases
Make some test case descriptions and log patterns follow more systematic
patterns.
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
diff --git a/tests/opt-testcases/handshake-manual.sh b/tests/opt-testcases/handshake-manual.sh
index 0ad37ca..9f24fb5 100644
--- a/tests/opt-testcases/handshake-manual.sh
+++ b/tests/opt-testcases/handshake-manual.sh
@@ -2,7 +2,7 @@
# into fragments, the tests require certificate authentication. The party in control
# of the fragmentation operations is OpenSSL and will always use server5.crt (548 Bytes).
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" \
"$P_CLI debug_level=4" \
0 \
@@ -17,7 +17,7 @@
0 \
-c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 512 of [0-9]\\+ msglen 512" \
- -c "waiting for more fragments (512 of [0-9]\\+"
+ -c "waiting for more fragments (512 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_certificate_authentication
@@ -27,7 +27,7 @@
0 \
-c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 512 of [0-9]\\+ msglen 512" \
- -c "waiting for more fragments (512 of [0-9]\\+"
+ -c "waiting for more fragments (512 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication
@@ -37,7 +37,7 @@
0 \
-c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 513 of [0-9]\\+ msglen 513" \
- -c "waiting for more fragments (513 of [0-9]\\+"
+ -c "waiting for more fragments (513 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_certificate_authentication
@@ -47,7 +47,7 @@
0 \
-c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 513 of [0-9]\\+ msglen 513" \
- -c "waiting for more fragments (513 of [0-9]\\+"
+ -c "waiting for more fragments (513 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication
@@ -57,7 +57,7 @@
0 \
-c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 256 of [0-9]\\+ msglen 256" \
- -c "waiting for more fragments (256 of [0-9]\\+"
+ -c "waiting for more fragments (256 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_certificate_authentication
@@ -67,7 +67,7 @@
0 \
-c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 256 of [0-9]\\+ msglen 256" \
- -c "waiting for more fragments (256 of [0-9]\\+"
+ -c "waiting for more fragments (256 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication
@@ -77,7 +77,7 @@
0 \
-c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 128 of [0-9]\\+ msglen 128" \
- -c "waiting for more fragments (128"
+ -c "waiting for more fragments (128 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_certificate_authentication
@@ -87,7 +87,7 @@
0 \
-c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 128 of [0-9]\\+ msglen 128" \
- -c "waiting for more fragments (128"
+ -c "waiting for more fragments (128 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication
@@ -97,7 +97,7 @@
0 \
-c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 64 of [0-9]\\+ msglen 64" \
- -c "waiting for more fragments (64"
+ -c "waiting for more fragments (64 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_certificate_authentication
@@ -107,7 +107,7 @@
0 \
-c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 64 of [0-9]\\+ msglen 64" \
- -c "waiting for more fragments (64"
+ -c "waiting for more fragments (64 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication
@@ -117,7 +117,7 @@
0 \
-c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 36 of [0-9]\\+ msglen 36" \
- -c "waiting for more fragments (36"
+ -c "waiting for more fragments (36 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_certificate_authentication
@@ -127,7 +127,7 @@
0 \
-c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 36 of [0-9]\\+ msglen 36" \
- -c "waiting for more fragments (36"
+ -c "waiting for more fragments (36 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication
@@ -137,7 +137,7 @@
0 \
-c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 32 of [0-9]\\+ msglen 32" \
- -c "waiting for more fragments (32"
+ -c "waiting for more fragments (32 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_certificate_authentication
@@ -147,7 +147,7 @@
0 \
-c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 32 of [0-9]\\+ msglen 32" \
- -c "waiting for more fragments (32"
+ -c "waiting for more fragments (32 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication
@@ -157,7 +157,7 @@
0 \
-c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 16 of [0-9]\\+ msglen 16" \
- -c "waiting for more fragments (16"
+ -c "waiting for more fragments (16 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_certificate_authentication
@@ -167,7 +167,7 @@
0 \
-c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 16 of [0-9]\\+ msglen 16" \
- -c "waiting for more fragments (16"
+ -c "waiting for more fragments (16 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication
@@ -177,7 +177,7 @@
0 \
-c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 13 of [0-9]\\+ msglen 13" \
- -c "waiting for more fragments (13"
+ -c "waiting for more fragments (13 of"
skip_next_test
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
@@ -188,7 +188,7 @@
0 \
-c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 13 of [0-9]\\+ msglen 13" \
- -c "waiting for more fragments (13"
+ -c "waiting for more fragments (13 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication
@@ -198,7 +198,7 @@
0 \
-c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 5 of [0-9]\\+ msglen 5" \
- -c "waiting for more fragments (5"
+ -c "waiting for more fragments (5 of"
skip_next_test
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
@@ -209,7 +209,7 @@
0 \
-c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 5 of [0-9]\\+ msglen 5" \
- -c "waiting for more fragments (5"
+ -c "waiting for more fragments (5 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication
@@ -219,7 +219,7 @@
0 \
-c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 4 of [0-9]\\+ msglen 4" \
- -c "waiting for more fragments (4"
+ -c "waiting for more fragments (4 of"
skip_next_test
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
@@ -230,7 +230,7 @@
0 \
-c "reassembled record" \
-c "handshake fragment: 0 \\.\\. 4 of [0-9]\\+ msglen 4" \
- -c "waiting for more fragments (4"
+ -c "waiting for more fragments (4 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication
@@ -251,7 +251,7 @@
-c "SSL - An invalid SSL record was received"
requires_certificate_authentication
-run_test "Handshake defragmentation on server (no fragmentation, for reference)." \
+run_test "Handshake defragmentation on server: no fragmentation, for reference" \
"$P_SRV debug_level=4 auth_mode=required" \
"$O_NEXT_CLI -cert $DATA_FILES_PATH/server5.crt -key $DATA_FILES_PATH/server5.key" \
0 \
@@ -266,7 +266,7 @@
0 \
-s "reassembled record" \
-s "handshake fragment: 0 \\.\\. 512 of [0-9]\\+ msglen 512" \
- -s "waiting for more fragments (512"
+ -s "waiting for more fragments (512 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_certificate_authentication
@@ -276,7 +276,7 @@
0 \
-s "reassembled record" \
-s "handshake fragment: 0 \\.\\. 512 of [0-9]\\+ msglen 512" \
- -s "waiting for more fragments (512"
+ -s "waiting for more fragments (512 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication
@@ -286,7 +286,7 @@
0 \
-s "reassembled record" \
-s "handshake fragment: 0 \\.\\. 513 of [0-9]\\+ msglen 513" \
- -s "waiting for more fragments (513"
+ -s "waiting for more fragments (513 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_certificate_authentication
@@ -296,7 +296,7 @@
0 \
-s "reassembled record" \
-s "handshake fragment: 0 \\.\\. 513 of [0-9]\\+ msglen 513" \
- -s "waiting for more fragments (513"
+ -s "waiting for more fragments (513 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication
@@ -306,7 +306,7 @@
0 \
-s "reassembled record" \
-s "handshake fragment: 0 \\.\\. 256 of [0-9]\\+ msglen 256" \
- -s "waiting for more fragments (256"
+ -s "waiting for more fragments (256 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_certificate_authentication
@@ -316,7 +316,7 @@
0 \
-s "reassembled record" \
-s "handshake fragment: 0 \\.\\. 256 of [0-9]\\+ msglen 256" \
- -s "waiting for more fragments (256"
+ -s "waiting for more fragments (256 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication
@@ -326,7 +326,7 @@
0 \
-s "reassembled record" \
-s "handshake fragment: 0 \\.\\. 128 of [0-9]\\+ msglen 128" \
- -s "waiting for more fragments (128"
+ -s "waiting for more fragments (128 of"
# Server-side ClientHello defragmentationis only supported for MBEDTLS_SSL_PROTO_TLS1_3. For TLS 1.2 testing
# the server should suport both protocols and downgrade to client-requested TL1.2 after proccessing the ClientHello.
@@ -339,7 +339,7 @@
0 \
-s "reassembled record" \
-s "handshake fragment: 0 \\.\\. 128 of [0-9]\\+ msglen 128" \
- -s "waiting for more fragments (128"
+ -s "waiting for more fragments (128 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication
@@ -349,7 +349,7 @@
0 \
-s "reassembled record" \
-s "handshake fragment: 0 \\.\\. 64 of [0-9]\\+ msglen 64" \
- -s "waiting for more fragments (64"
+ -s "waiting for more fragments (64 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
@@ -360,7 +360,7 @@
0 \
-s "reassembled record" \
-s "handshake fragment: 0 \\.\\. 64 of [0-9]\\+ msglen 64" \
- -s "waiting for more fragments (64"
+ -s "waiting for more fragments (64 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication
@@ -370,7 +370,7 @@
0 \
-s "reassembled record" \
-s "handshake fragment: 0 \\.\\. 36 of [0-9]\\+ msglen 36" \
- -s "waiting for more fragments (36"
+ -s "waiting for more fragments (36 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
@@ -381,7 +381,7 @@
0 \
-s "reassembled record" \
-s "handshake fragment: 0 \\.\\. 36 of [0-9]\\+ msglen 36" \
- -s "waiting for more fragments (36"
+ -s "waiting for more fragments (36 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication
@@ -391,7 +391,7 @@
0 \
-s "reassembled record" \
-s "handshake fragment: 0 \\.\\. 32 of [0-9]\\+ msglen 32" \
- -s "waiting for more fragments (32"
+ -s "waiting for more fragments (32 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
@@ -402,7 +402,7 @@
0 \
-s "reassembled record" \
-s "handshake fragment: 0 \\.\\. 32 of [0-9]\\+ msglen 32" \
- -s "waiting for more fragments (32"
+ -s "waiting for more fragments (32 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication
@@ -412,7 +412,7 @@
0 \
-s "reassembled record" \
-s "handshake fragment: 0 \\.\\. 16 of [0-9]\\+ msglen 16" \
- -s "waiting for more fragments (16"
+ -s "waiting for more fragments (16 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
@@ -423,7 +423,7 @@
0 \
-s "reassembled record" \
-s "handshake fragment: 0 \\.\\. 16 of [0-9]\\+ msglen 16" \
- -s "waiting for more fragments (16"
+ -s "waiting for more fragments (16 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication
@@ -433,7 +433,7 @@
0 \
-s "reassembled record" \
-s "handshake fragment: 0 \\.\\. 13 of [0-9]\\+ msglen 13" \
- -s "waiting for more fragments (13"
+ -s "waiting for more fragments (13 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
@@ -444,7 +444,7 @@
0 \
-s "reassembled record" \
-s "handshake fragment: 0 \\.\\. 13 of [0-9]\\+ msglen 13" \
- -s "waiting for more fragments (13"
+ -s "waiting for more fragments (13 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication
@@ -454,7 +454,7 @@
0 \
-s "reassembled record" \
-s "handshake fragment: 0 \\.\\. 5 of [0-9]\\+ msglen 5" \
- -s "waiting for more fragments (5"
+ -s "waiting for more fragments (5 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
@@ -465,7 +465,7 @@
0 \
-s "reassembled record" \
-s "handshake fragment: 0 \\.\\. 5 of [0-9]\\+ msglen 5" \
- -s "waiting for more fragments (5"
+ -s "waiting for more fragments (5 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication
@@ -475,7 +475,7 @@
0 \
-s "reassembled record" \
-s "handshake fragment: 0 \\.\\. 4 of [0-9]\\+ msglen 4" \
- -s "waiting for more fragments (4"
+ -s "waiting for more fragments (4 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
@@ -486,7 +486,7 @@
0 \
-s "reassembled record" \
-s "handshake fragment: 0 \\.\\. 4 of [0-9]\\+ msglen 4" \
- -s "waiting for more fragments (4"
+ -s "waiting for more fragments (4 of"
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication
@@ -501,7 +501,7 @@
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_certificate_authentication
-run_test "Handshake defragmentation on server: len=3, TLS 1.3 ClientHello -> 1.2 Handshake" \
+run_test "Handshake defragmentation on server: len=3, TLS 1.2 TLS 1.3 ClientHello -> 1.2 Handshake" \
"$P_SRV debug_level=4 auth_mode=required" \
"$O_NEXT_CLI -tls1_2 -split_send_frag 3 -cert $DATA_FILES_PATH/server5.crt -key $DATA_FILES_PATH/server5.key" \
1 \