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 7c9aea9..d22bcca 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -13886,6 +13886,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" \
@@ -13896,6 +13907,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.
@@ -13914,6 +13936,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" \
@@ -13925,6 +13958,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" \
@@ -13936,6 +13980,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" \
@@ -13947,6 +14002,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" \
@@ -13958,6 +14024,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" \
@@ -13969,6 +14046,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" \
@@ -13980,6 +14068,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" \
@@ -13991,6 +14090,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" \
@@ -14002,6 +14112,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" \
@@ -14013,6 +14134,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" \
@@ -14024,6 +14156,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" \
@@ -14035,6 +14179,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" \
@@ -14046,6 +14201,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" \
@@ -14057,6 +14223,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" \
@@ -14068,6 +14245,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" \
@@ -14079,6 +14267,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" \
@@ -14090,6 +14289,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" \
@@ -14100,6 +14310,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