ssl-opt: Added tls 1.2 tests for HS defragmentation.
Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>
diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index 1de5776..f460cce 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -14471,6 +14471,17 @@
-c "waiting for more fragments (512 of [0-9]\\+"
requires_openssl_3_x
+requires_protocol_version tls12
+requires_certificate_authentication
+run_test "Handshake defragmentation on client: len=512, TLS 1.2" \
+ "$O_NEXT_SRV -tls1_2 -max_send_frag 512 " \
+ "$P_CLI debug_level=4 " \
+ 0 \
+ -c "reassembled record" \
+ -c "handshake fragment: 0 \\.\\. 512 of [0-9]\\+ msglen 512" \
+ -c "waiting for more fragments (512 of [0-9]\\+"
+
+requires_openssl_3_x
requires_protocol_version tls13
requires_certificate_authentication
run_test "Handshake defragmentation on client: len=513, TLS 1.3" \
@@ -14481,6 +14492,17 @@
-c "handshake fragment: 0 \\.\\. 513 of [0-9]\\+ msglen 513" \
-c "waiting for more fragments (513 of [0-9]\\+"
+requires_openssl_3_x
+requires_protocol_version tls12
+requires_certificate_authentication
+run_test "Handshake defragmentation on client: len=513, TLS 1.2" \
+ "$O_NEXT_SRV -tls1_2 -max_send_frag 513 " \
+ "$P_CLI debug_level=4 " \
+ 0 \
+ -c "reassembled record" \
+ -c "handshake fragment: 0 \\.\\. 513 of [0-9]\\+ msglen 513" \
+ -c "waiting for more fragments (513 of [0-9]\\+"
+
# OpenSSL does not allow max_send_frag to be less than 512
# so we use split_send_frag instead for tests lower than 512 below.
@@ -14499,6 +14521,17 @@
-c "waiting for more fragments (256 of [0-9]\\+"
requires_openssl_3_x
+requires_protocol_version tls12
+requires_certificate_authentication
+run_test "Handshake defragmentation on client: len=256, TLS 1.2" \
+ "$O_NEXT_SRV -tls1_2 -split_send_frag 256 " \
+ "$P_CLI debug_level=4 " \
+ 0 \
+ -c "reassembled record" \
+ -c "handshake fragment: 0 \\.\\. 256 of [0-9]\\+ msglen 256" \
+ -c "waiting for more fragments (256 of [0-9]\\+"
+
+requires_openssl_3_x
requires_protocol_version tls13
requires_certificate_authentication
run_test "Handshake defragmentation on client: len=128, TLS 1.3" \
@@ -14510,6 +14543,17 @@
-c "waiting for more fragments (128"
requires_openssl_3_x
+requires_protocol_version tls12
+requires_certificate_authentication
+run_test "Handshake defragmentation on client: len=128, TLS 1.2" \
+ "$O_NEXT_SRV -tls1_2 -split_send_frag 128 " \
+ "$P_CLI debug_level=4 " \
+ 0 \
+ -c "reassembled record" \
+ -c "handshake fragment: 0 \\.\\. 128 of [0-9]\\+ msglen 128" \
+ -c "waiting for more fragments (128"
+
+requires_openssl_3_x
requires_protocol_version tls13
requires_certificate_authentication
run_test "Handshake defragmentation on client: len=64, TLS 1.3" \
@@ -14521,6 +14565,17 @@
-c "waiting for more fragments (64"
requires_openssl_3_x
+requires_protocol_version tls12
+requires_certificate_authentication
+run_test "Handshake defragmentation on client: len=64, TLS 1.2" \
+ "$O_NEXT_SRV -tls1_2 -split_send_frag 64 " \
+ "$P_CLI debug_level=4 " \
+ 0 \
+ -c "reassembled record" \
+ -c "handshake fragment: 0 \\.\\. 64 of [0-9]\\+ msglen 64" \
+ -c "waiting for more fragments (64"
+
+requires_openssl_3_x
requires_protocol_version tls13
requires_certificate_authentication
run_test "Handshake defragmentation on client: len=36, TLS 1.3" \
@@ -14532,6 +14587,17 @@
-c "waiting for more fragments (36"
requires_openssl_3_x
+requires_protocol_version tls12
+requires_certificate_authentication
+run_test "Handshake defragmentation on client: len=36, TLS 1.2" \
+ "$O_NEXT_SRV -tls1_2 -split_send_frag 36 " \
+ "$P_CLI debug_level=4 " \
+ 0 \
+ -c "reassembled record" \
+ -c "handshake fragment: 0 \\.\\. 36 of [0-9]\\+ msglen 36" \
+ -c "waiting for more fragments (36"
+
+requires_openssl_3_x
requires_protocol_version tls13
requires_certificate_authentication
run_test "Handshake defragmentation on client: len=32, TLS 1.3" \
@@ -14543,6 +14609,17 @@
-c "waiting for more fragments (32"
requires_openssl_3_x
+requires_protocol_version tls12
+requires_certificate_authentication
+run_test "Handshake defragmentation on client: len=32, TLS 1.2" \
+ "$O_NEXT_SRV -tls1_2 -split_send_frag 32 " \
+ "$P_CLI debug_level=4 " \
+ 0 \
+ -c "reassembled record" \
+ -c "handshake fragment: 0 \\.\\. 32 of [0-9]\\+ msglen 32" \
+ -c "waiting for more fragments (32"
+
+requires_openssl_3_x
requires_protocol_version tls13
requires_certificate_authentication
run_test "Handshake defragmentation on client: len=14, TLS 1.3" \
@@ -14554,6 +14631,17 @@
-c "waiting for more fragments (16"
requires_openssl_3_x
+requires_protocol_version tls12
+requires_certificate_authentication
+run_test "Handshake defragmentation on client: len=14, TLS 1.2" \
+ "$O_NEXT_SRV -tls1_2 -split_send_frag 16 " \
+ "$P_CLI debug_level=4 " \
+ 0 \
+ -c "reassembled record" \
+ -c "handshake fragment: 0 \\.\\. 16 of [0-9]\\+ msglen 16" \
+ -c "waiting for more fragments (16"
+
+requires_openssl_3_x
requires_protocol_version tls13
requires_certificate_authentication
run_test "Handshake defragmentation on client: len=13, TLS 1.3" \
@@ -14565,6 +14653,17 @@
-c "waiting for more fragments (13"
requires_openssl_3_x
+requires_protocol_version tls12
+requires_certificate_authentication
+run_test "Handshake defragmentation on client: len=13, TLS 1.2" \
+ "$O_NEXT_SRV -tls1_2 -split_send_frag 13 " \
+ "$P_CLI debug_level=4 " \
+ 0 \
+ -c "reassembled record" \
+ -c "handshake fragment: 0 \\.\\. 13 of [0-9]\\+ msglen 13" \
+ -c "waiting for more fragments (13"
+
+requires_openssl_3_x
requires_protocol_version tls13
requires_certificate_authentication
run_test "Handshake defragmentation on client: len=5, TLS 1.3" \
@@ -14576,6 +14675,17 @@
-c "waiting for more fragments (5"
requires_openssl_3_x
+requires_protocol_version tls12
+requires_certificate_authentication
+run_test "Handshake defragmentation on client: len=5, TLS 1.2" \
+ "$O_NEXT_SRV -tls1_2 -split_send_frag 5 " \
+ "$P_CLI debug_level=4 " \
+ 0 \
+ -c "reassembled record" \
+ -c "handshake fragment: 0 \\.\\. 5 of [0-9]\\+ msglen 5" \
+ -c "waiting for more fragments (5"
+
+requires_openssl_3_x
requires_protocol_version tls13
requires_certificate_authentication
run_test "Handshake defragmentation on server: len=512, TLS 1.3" \
@@ -14587,6 +14697,17 @@
-s "waiting for more fragments (512"
requires_openssl_3_x
+requires_protocol_version tls12
+requires_certificate_authentication
+run_test "Handshake defragmentation on server: len=512, TLS 1.2" \
+ "$P_SRV debug_level=4 auth_mode=required" \
+ "$O_NEXT_CLI -tls1_2 -max_send_frag 512 -cert $DATA_FILES_PATH/server5.crt -key $DATA_FILES_PATH/server5.key" \
+ 0 \
+ -s "reassembled record" \
+ -s "handshake fragment: 0 \\.\\. 512 of [0-9]\\+ msglen 512" \
+ -s "waiting for more fragments (512"
+
+requires_openssl_3_x
requires_protocol_version tls13
requires_certificate_authentication
run_test "Handshake defragmentation on server: len=513, TLS 1.3" \
@@ -14598,6 +14719,17 @@
-s "waiting for more fragments (513"
requires_openssl_3_x
+requires_protocol_version tls12
+requires_certificate_authentication
+run_test "Handshake defragmentation on server: len=513, TLS 1.2" \
+ "$P_SRV debug_level=4 auth_mode=required" \
+ "$O_NEXT_CLI -tls1_2 -max_send_frag 513 -cert $DATA_FILES_PATH/server5.crt -key $DATA_FILES_PATH/server5.key" \
+ 0 \
+ -s "reassembled record" \
+ -s "handshake fragment: 0 \\.\\. 513 of [0-9]\\+ msglen 513" \
+ -s "waiting for more fragments (513"
+
+requires_openssl_3_x
requires_protocol_version tls13
requires_certificate_authentication
run_test "Handshake defragmentation on server: len=256, TLS 1.3" \
@@ -14609,6 +14741,18 @@
-s "waiting for more fragments (256"
requires_openssl_3_x
+requires_protocol_version tls12
+requires_certificate_authentication
+run_test "Handshake defragmentation on server: len=256, TLS 1.2" \
+ "$P_SRV debug_level=4 auth_mode=required" \
+ "$O_NEXT_CLI -tls1_3 -split_send_frag 256 -cert $DATA_FILES_PATH/server5.crt -key $DATA_FILES_PATH/server5.key" \
+ 0 \
+ -s "reassembled record" \
+ -s "handshake fragment: 0 \\.\\. 256 of [0-9]\\+ msglen 256" \
+ -s "waiting for more fragments (256"
+
+
+requires_openssl_3_x
requires_protocol_version tls13
requires_certificate_authentication
run_test "Handshake defragmentation on server: len=128, TLS 1.3" \
@@ -14620,6 +14764,17 @@
-s "waiting for more fragments (128"
requires_openssl_3_x
+requires_protocol_version tls12
+requires_certificate_authentication
+run_test "Handshake defragmentation on server: len=128, TLS 1.2" \
+ "$P_SRV debug_level=4 auth_mode=required" \
+ "$O_NEXT_CLI -tls1_2 -split_send_frag 128 -cert $DATA_FILES_PATH/server5.crt -key $DATA_FILES_PATH/server5.key" \
+ 0 \
+ -s "reassembled record" \
+ -s "handshake fragment: 0 \\.\\. 128 of [0-9]\\+ msglen 128" \
+ -s "waiting for more fragments (128"
+
+requires_openssl_3_x
requires_protocol_version tls13
requires_certificate_authentication
run_test "Handshake defragmentation on server: len=64, TLS 1.3" \
@@ -14631,6 +14786,17 @@
-s "waiting for more fragments (64"
requires_openssl_3_x
+requires_protocol_version tls12
+requires_certificate_authentication
+run_test "Handshake defragmentation on server: len=64, TLS 1.2" \
+ "$P_SRV debug_level=4 auth_mode=required" \
+ "$O_NEXT_CLI -tls1_2 -split_send_frag 64 -cert $DATA_FILES_PATH/server5.crt -key $DATA_FILES_PATH/server5.key" \
+ 0 \
+ -s "reassembled record" \
+ -s "handshake fragment: 0 \\.\\. 64 of [0-9]\\+ msglen 64" \
+ -s "waiting for more fragments (64"
+
+requires_openssl_3_x
requires_protocol_version tls13
requires_certificate_authentication
run_test "Handshake defragmentation on server: len=36, TLS 1.3" \
@@ -14642,6 +14808,17 @@
-s "waiting for more fragments (36"
requires_openssl_3_x
+requires_protocol_version tls12
+requires_certificate_authentication
+run_test "Handshake defragmentation on server: len=36, TLS 1.2" \
+ "$P_SRV debug_level=4 auth_mode=required" \
+ "$O_NEXT_CLI -tls1_2 -split_send_frag 36 -cert $DATA_FILES_PATH/server5.crt -key $DATA_FILES_PATH/server5.key" \
+ 0 \
+ -s "reassembled record" \
+ -s "handshake fragment: 0 \\.\\. 36 of [0-9]\\+ msglen 36" \
+ -s "waiting for more fragments (36"
+
+requires_openssl_3_x
requires_protocol_version tls13
requires_certificate_authentication
run_test "Handshake defragmentation on server: len=32, TLS 1.3" \
@@ -14653,6 +14830,17 @@
-s "waiting for more fragments (32"
requires_openssl_3_x
+requires_protocol_version tls12
+requires_certificate_authentication
+run_test "Handshake defragmentation on server: len=32, TLS 1.2" \
+ "$P_SRV debug_level=4 auth_mode=required" \
+ "$O_NEXT_CLI -tls1_2 -split_send_frag 32 -cert $DATA_FILES_PATH/server5.crt -key $DATA_FILES_PATH/server5.key" \
+ 0 \
+ -s "reassembled record" \
+ -s "handshake fragment: 0 \\.\\. 32 of [0-9]\\+ msglen 32" \
+ -s "waiting for more fragments (32"
+
+requires_openssl_3_x
requires_protocol_version tls13
requires_certificate_authentication
run_test "Handshake defragmentation on server: len=16, TLS 1.3" \
@@ -14664,6 +14852,17 @@
-s "waiting for more fragments (16"
requires_openssl_3_x
+requires_protocol_version tls12
+requires_certificate_authentication
+run_test "Handshake defragmentation on server: len=16, TLS 1.2" \
+ "$P_SRV debug_level=4 auth_mode=required" \
+ "$O_NEXT_CLI -tls1_2 -split_send_frag 16 -cert $DATA_FILES_PATH/server5.crt -key $DATA_FILES_PATH/server5.key" \
+ 0 \
+ -s "reassembled record" \
+ -s "handshake fragment: 0 \\.\\. 16 of [0-9]\\+ msglen 16" \
+ -s "waiting for more fragments (16"
+
+requires_openssl_3_x
requires_protocol_version tls13
requires_certificate_authentication
run_test "Handshake defragmentation on server: len=13, TLS 1.3" \
@@ -14675,6 +14874,17 @@
-s "waiting for more fragments (13"
requires_openssl_3_x
+requires_protocol_version tls12
+requires_certificate_authentication
+run_test "Handshake defragmentation on server: len=13, TLS 1.2" \
+ "$P_SRV debug_level=4 auth_mode=required" \
+ "$O_NEXT_CLI -tls1_2 -split_send_frag 13 -cert $DATA_FILES_PATH/server5.crt -key $DATA_FILES_PATH/server5.key" \
+ 0 \
+ -s "reassembled record" \
+ -s "handshake fragment: 0 \\.\\. 13 of [0-9]\\+ msglen 13" \
+ -s "waiting for more fragments (13"
+
+requires_openssl_3_x
requires_protocol_version tls13
requires_certificate_authentication
run_test "Handshake defragmentation on server: len=5, TLS 1.3" \
@@ -14685,6 +14895,17 @@
-s "handshake fragment: 0 \\.\\. 5 of [0-9]\\+ msglen 5" \
-s "waiting for more fragments (5"
+requires_openssl_3_x
+requires_protocol_version tls12
+requires_certificate_authentication
+run_test "Handshake defragmentation on server: len=5, TLS 1.2" \
+ "$P_SRV debug_level=4 auth_mode=required" \
+ "$O_NEXT_CLI -tls1_2 -split_send_frag 5 -cert $DATA_FILES_PATH/server5.crt -key $DATA_FILES_PATH/server5.key" \
+ 0 \
+ -s "reassembled record" \
+ -s "handshake fragment: 0 \\.\\. 5 of [0-9]\\+ msglen 5" \
+ -s "waiting for more fragments (5"
+
# Test heap memory usage after handshake
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
requires_config_enabled MBEDTLS_MEMORY_DEBUG