ssl-opt: Fragmented HS renegotiation, updated matching regex
Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>
diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index 045e144..14270a8 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -14487,9 +14487,9 @@
-s "Reallocating in_buf" \
-s "Reallocating out_buf" \
-s "reassembled record" \
- -s "initial handshake fragment: 256, 0..256 of [0-9]\\+" \
- -s "Prepare: waiting for more handshake fragments 256/[0-9]\\+" \
- -s "Consume: waiting for more handshake fragments 256/[0-9]\\+"
+ -s "initial handshake fragment: 256, 0\\.\\.256 of [0-9]\\+" \
+ -s "Prepare: waiting for more handshake fragments 256/" \
+ -s "Consume: waiting for more handshake fragments 256/"
# Test client-initiated renegotiation with fragmented handshake on TLS1.2
requires_openssl_3_x
@@ -14506,9 +14506,9 @@
-s "=> renegotiate" \
-S "write hello request" \
-s "reassembled record" \
- -s "initial handshake fragment: 512, 0..512 of [0-9]\\+" \
- -s "Prepare: waiting for more handshake fragments 512/[0-9]\\+" \
- -s "Consume: waiting for more handshake fragments 512/[0-9]\\+" \
+ -s "initial handshake fragment: 512, 0\\.\\.512 of [0-9]\\+" \
+ -s "Prepare: waiting for more handshake fragments 512/" \
+ -s "Consume: waiting for more handshake fragments 512/" \
requires_openssl_3_x
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
@@ -14524,9 +14524,9 @@
-s "=> renegotiate" \
-S "write hello request" \
-s "reassembled record" \
- -s "initial handshake fragment: 256, 0..256 of [0-9]\\+" \
- -s "Prepare: waiting for more handshake fragments 256/[0-9]\\+" \
- -s "Consume: waiting for more handshake fragments 256/[0-9]\\+" \
+ -s "initial handshake fragment: 256, 0\\.\\.256 of [0-9]\\+" \
+ -s "Prepare: waiting for more handshake fragments 256/" \
+ -s "Consume: waiting for more handshake fragments 256/" \
requires_openssl_3_x
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
@@ -14543,9 +14543,9 @@
-s "=> renegotiate" \
-S "write hello request" \
-s "reassembled record" \
- -s "initial handshake fragment: 128, 0..128 of [0-9]\\+" \
- -s "Prepare: waiting for more handshake fragments 128/[0-9]\\+" \
- -s "Consume: waiting for more handshake fragments 128/[0-9]\\+" \
+ -s "initial handshake fragment: 128, 0\\.\\.128 of [0-9]\\+" \
+ -s "Prepare: waiting for more handshake fragments 128/" \
+ -s "Consume: waiting for more handshake fragments 128/" \
requires_openssl_3_x
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
@@ -14561,9 +14561,9 @@
-s "=> renegotiate" \
-S "write hello request" \
-s "reassembled record" \
- -s "initial handshake fragment: 4, 0..4 of [0-9]\\+" \
- -s "Prepare: waiting for more handshake fragments 4/[0-9]\\+" \
- -s "Consume: waiting for more handshake fragments 4/[0-9]\\+" \
+ -s "initial handshake fragment: 4, 0\\.\\.4 of [0-9]\\+" \
+ -s "Prepare: waiting for more handshake fragments 4/" \
+ -s "Consume: waiting for more handshake fragments 4/" \
# Test server-initiated renegotiation with fragmented handshake on TLS1.2
requires_openssl_3_x
@@ -14574,9 +14574,9 @@
"$O_NEXT_SRV -tls1_2 -split_send_frag 512 -legacy_renegotiation -cert $DATA_FILES_PATH/server5.crt -key $DATA_FILES_PATH/server5.key" \
"$P_CLI debug_level=3 renegotiation=1 request_page=/reneg" \
0 \
- -c "initial handshake fragment: 512, 0..512 of [0-9]\\+" \
- -c "Prepare: waiting for more handshake fragments 512/[0-9]\\+" \
- -c "Consume: waiting for more handshake fragments 512/[0-9]\\+" \
+ -c "initial handshake fragment: 512, 0\\.\\.512 of [0-9]\\+" \
+ -c "Prepare: waiting for more handshake fragments 512/" \
+ -c "Consume: waiting for more handshake fragments 512/" \
-c "client hello, adding renegotiation extension" \
-c "found renegotiation extension" \
-c "=> renegotiate"
@@ -14596,9 +14596,9 @@
"$O_NEXT_SRV -tls1_2 -split_send_frag 256 -legacy_renegotiation -cert $DATA_FILES_PATH/server5.crt -key $DATA_FILES_PATH/server5.key" \
"$P_CLI debug_level=3 renegotiation=1 renego_delay=32 request_page=/reneg" \
0 \
- -c "initial handshake fragment: 256, 0..256 of [0-9]\\+" \
- -c "Prepare: waiting for more handshake fragments 256/[0-9]\\+" \
- -c "Consume: waiting for more handshake fragments 256/[0-9]\\+" \
+ -c "initial handshake fragment: 256, 0\\.\\.256 of [0-9]\\+" \
+ -c "Prepare: waiting for more handshake fragments 256/" \
+ -c "Consume: waiting for more handshake fragments 256/" \
-c "client hello, adding renegotiation extension" \
-c "found renegotiation extension" \
-c "=> renegotiate"