Refine the psk test cases for m->G
Signed-off-by: Xiaokang Qian <xiaokang.qian@arm.com>
diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index cd73c78..020d6dc 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -12104,57 +12104,6 @@
-c "<= write client hello" \
-c "HTTP/1.0 200 OK"
-requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
-requires_config_enabled MBEDTLS_SSL_SRV_C
-requires_config_enabled MBEDTLS_SSL_CLI_C
-run_test "TLS 1.3, default suite, PSK, psk_all" \
- "$P_SRV nbio=2 debug_level=5 force_version=tls13 psk=010203 psk_identity=0a0b0c tls13_kex_modes=psk_all" \
- "$P_CLI nbio=2 debug_level=5 force_version=tls13 psk=010203 psk_identity=0a0b0c tls13_kex_modes=psk_all" \
- 0 \
- -c "=> write client hello" \
- -c "client hello, adding pre_shared_key extension, omitting PSK binder list" \
- -c "client hello, adding psk_key_exchange_modes extension" \
- -c "client hello, adding PSK binder list" \
- -c "<= write client hello" \
- -c "HTTP/1.0 200 OK"
-
-requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
-requires_config_enabled MBEDTLS_SSL_SRV_C
-requires_config_enabled MBEDTLS_SSL_CLI_C
-run_test "TLS 1.3, default suite, PSK, psk_ephemeral" \
- "$P_SRV nbio=2 debug_level=5 force_version=tls13 psk=010203 psk_identity=0a0b0c tls13_kex_modes=psk_ephemeral" \
- "$P_CLI nbio=2 debug_level=5 force_version=tls13 psk=010203 psk_identity=0a0b0c tls13_kex_modes=psk_ephemeral" \
- 0 \
- -c "=> write client hello" \
- -c "client hello, adding pre_shared_key extension, omitting PSK binder list" \
- -c "client hello, adding psk_key_exchange_modes extension" \
- -c "client hello, adding PSK binder list" \
- -c "<= write client hello" \
- -c "HTTP/1.0 200 OK"
-
-requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
-requires_config_enabled MBEDTLS_SSL_SRV_C
-requires_config_enabled MBEDTLS_SSL_CLI_C
-run_test "TLS 1.3, default suite, PSK, ephemeral" \
- "$P_SRV nbio=2 debug_level=5 force_version=tls13 psk=010203 psk_identity=0a0b0c tls13_kex_modes=ephemeral" \
- "$P_CLI nbio=2 debug_level=5 force_version=tls13 psk=010203 psk_identity=0a0b0c tls13_kex_modes=ephemeral" \
- 0 \
- -c "=> write client hello" \
- -c "<= write client hello" \
- -c "HTTP/1.0 200 OK"
-
-requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
-requires_config_enabled MBEDTLS_SSL_SRV_C
-requires_config_enabled MBEDTLS_SSL_CLI_C
-run_test "TLS 1.3, default suite, PSK, ephemeral_all" \
- "$P_SRV nbio=2 debug_level=5 force_version=tls13 psk=010203 psk_identity=0a0b0c tls13_kex_modes=ephemeral_all" \
- "$P_CLI nbio=2 debug_level=5 force_version=tls13 psk=010203 psk_identity=0a0b0c tls13_kex_modes=ephemeral_all" \
- 0 \
- -c "=> write client hello" \
- -c "<= write client hello" \
- -c "HTTP/1.0 200 OK"
-
-requires_openssl_tls1_3
requires_openssl_tls1_3
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_config_enabled MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE
@@ -12171,68 +12120,6 @@
-c "<= write client hello" \
-c "HTTP/1.0 200 ok"
-requires_openssl_tls1_3
-requires_openssl_tls1_3
-requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
-requires_config_enabled MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE
-requires_config_enabled MBEDTLS_DEBUG_C
-requires_config_enabled MBEDTLS_SSL_CLI_C
-run_test "TLS 1.3, default suite, PSK - openssli psk_all" \
- "$O_NEXT_SRV -msg -debug -tls1_3 -psk_identity 0a0b0c -psk 010203 -allow_no_dhe_kex -nocert" \
- "$P_CLI debug_level=4 psk=010203 psk_identity=0a0b0c tls13_kex_modes=psk_all" \
- 0 \
- -c "=> write client hello" \
- -c "client hello, adding pre_shared_key extension, omitting PSK binder list" \
- -c "client hello, adding psk_key_exchange_modes extension" \
- -c "client hello, adding PSK binder list" \
- -c "<= write client hello" \
- -c "HTTP/1.0 200 ok"
-
-requires_openssl_tls1_3
-requires_openssl_tls1_3
-requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
-requires_config_enabled MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE
-requires_config_enabled MBEDTLS_DEBUG_C
-requires_config_enabled MBEDTLS_SSL_CLI_C
-run_test "TLS 1.3, default suite, PSK - openssl psk_ephemeral" \
- "$O_NEXT_SRV -msg -debug -tls1_3 -psk_identity 0a0b0c -psk 010203 -allow_no_dhe_kex -nocert" \
- "$P_CLI debug_level=4 psk=010203 psk_identity=0a0b0c tls13_kex_modes=psk_ephemeral" \
- 0 \
- -c "=> write client hello" \
- -c "client hello, adding pre_shared_key extension, omitting PSK binder list" \
- -c "client hello, adding psk_key_exchange_modes extension" \
- -c "client hello, adding PSK binder list" \
- -c "<= write client hello" \
- -c "HTTP/1.0 200 ok"
-
-requires_openssl_tls1_3
-requires_openssl_tls1_3
-requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
-requires_config_enabled MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE
-requires_config_enabled MBEDTLS_DEBUG_C
-requires_config_enabled MBEDTLS_SSL_CLI_C
-run_test "TLS 1.3, default suite, PSK - openssl ephemeral" \
- "$O_NEXT_SRV -msg -debug -tls1_3 -psk_identity 0a0b0c -psk 010203 -allow_no_dhe_kex" \
- "$P_CLI debug_level=4 psk=010203 psk_identity=0a0b0c tls13_kex_modes=ephemeral" \
- 0 \
- -c "=> write client hello" \
- -c "<= write client hello" \
- -c "HTTP/1.0 200 ok"
-
-requires_openssl_tls1_3
-requires_openssl_tls1_3
-requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
-requires_config_enabled MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE
-requires_config_enabled MBEDTLS_DEBUG_C
-requires_config_enabled MBEDTLS_SSL_CLI_C
-run_test "TLS 1.3, default suite, PSK - openssl ephemeral_all" \
- "$O_NEXT_SRV -msg -debug -tls1_3 -psk_identity 0a0b0c -psk 010203 -allow_no_dhe_kex -nocert" \
- "$P_CLI debug_level=4 psk=010203 psk_identity=0a0b0c tls13_kex_modes=ephemeral_all" \
- 0 \
- -c "=> write client hello" \
- -c "<= write client hello" \
- -c "HTTP/1.0 200 ok"
-
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
requires_gnutls_tls1_3
requires_gnutls_next_no_ticket
@@ -12240,7 +12127,7 @@
requires_config_enabled MBEDTLS_DEBUG_C
requires_config_enabled MBEDTLS_SSL_CLI_C
run_test "TLS 1.3, default suite, PSK - gnutls" \
- "$G_NEXT_SRV -d 4 --priority=NORMAL:-VERS-ALL:+VERS-TLS1.3:+PSK:+CIPHER-ALL:%NO_TICKETS --pskhint=0a0b0c --pskpasswd=data_files/simplepass.psk" \
+ "$G_NEXT_SRV -d 4 --priority=NORMAL:-VERS-ALL:+VERS-TLS1.3:+ECDHE-PSK:+DHE-PSK:+PSK:+CIPHER-ALL:%NO_TICKETS --pskhint=0a0b0c --pskpasswd=data_files/simplepass.psk" \
"$P_CLI debug_level=4 psk=010203 psk_identity=0a0b0c tls13_kex_modes=psk" \
0 \
-c "=> write client hello" \
@@ -12252,77 +12139,6 @@
-c "<= write client hello" \
-c "HTTP/1.0 200 OK"
-requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
-requires_gnutls_tls1_3
-requires_gnutls_next_no_ticket
-requires_config_enabled MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE
-requires_config_enabled MBEDTLS_DEBUG_C
-requires_config_enabled MBEDTLS_SSL_CLI_C
-run_test "TLS 1.3, default suite, PSK - gnutls psk_all" \
- "$G_NEXT_SRV -d 4 --priority=NORMAL:-VERS-ALL:+VERS-TLS1.3:+PSK:+CIPHER-ALL:%NO_TICKETS --pskhint=0a0b0c --pskpasswd=data_files/simplepass.psk" \
- "$P_CLI debug_level=4 psk=010203 psk_identity=0a0b0c tls13_kex_modes=psk_all" \
- 0 \
- -c "=> write client hello" \
- -c "client hello, adding pre_shared_key extension, omitting PSK binder list" \
- -c "client hello, adding psk_key_exchange_modes extension" \
- -c "client hello, adding PSK binder list" \
- -s "Parsing extension 'PSK Key Exchange Modes/45'" \
- -s "Parsing extension 'Pre Shared Key/41'" \
- -c "<= write client hello" \
- -c "HTTP/1.0 200 OK"
-
-requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
-requires_gnutls_tls1_3
-requires_gnutls_next_no_ticket
-requires_config_enabled MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE
-requires_config_enabled MBEDTLS_DEBUG_C
-requires_config_enabled MBEDTLS_SSL_CLI_C
-run_test "TLS 1.3, default suite, PSK - gnutls psk_ephemeral" \
- "$G_NEXT_SRV -d 4 --priority=NORMAL:-VERS-ALL:+VERS-TLS1.3:+PSK:+ECDHE-PSK:+DHE-PSK:+CIPHER-ALL --pskhint=0a0b0c --pskpasswd=data_files/simplepass.psk" \
- "$P_CLI debug_level=4 psk=010203 psk_identity=0a0b0c tls13_kex_modes=psk_ephemeral" \
- 0 \
- -c "=> write client hello" \
- -c "client hello, adding pre_shared_key extension, omitting PSK binder list" \
- -c "client hello, adding psk_key_exchange_modes extension" \
- -c "client hello, adding PSK binder list" \
- -s "Parsing extension 'PSK Key Exchange Modes/45'" \
- -s "Parsing extension 'Pre Shared Key/41'" \
- -c "<= write client hello" \
- -c "HTTP/1.0 200 OK"
-
-requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
-requires_gnutls_tls1_3
-requires_gnutls_next_no_ticket
-requires_config_enabled MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE
-requires_config_enabled MBEDTLS_DEBUG_C
-requires_config_enabled MBEDTLS_SSL_CLI_C
-run_test "TLS 1.3, default suite, PSK - gnutls ephemeral" \
- "$G_NEXT_SRV -d 4 --priority=NORMAL:-VERS-ALL:+VERS-TLS1.3:+PSK:+CIPHER-ALL:%NO_TICKETS --pskhint=0a0b0c --pskpasswd=data_files/simplepass.psk" \
- "$P_CLI debug_level=4 psk=010203 psk_identity=0a0b0c tls13_kex_modes=ephemeral" \
- 0 \
- -c "=> write client hello" \
- -c "<= write client hello" \
- -c "HTTP/1.0 200 OK"
-
-requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
-requires_gnutls_tls1_3
-requires_gnutls_next_no_ticket
-requires_config_enabled MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE
-requires_config_enabled MBEDTLS_DEBUG_C
-requires_config_enabled MBEDTLS_SSL_CLI_C
-run_test "TLS 1.3, default suite, PSK - gnutls ephemeral_all" \
- "$G_NEXT_SRV -d 4 --priority=NORMAL:-VERS-ALL:+VERS-TLS1.3:+PSK:+CIPHER-ALL:%NO_TICKETS --pskhint=0a0b0c --pskpasswd=data_files/simplepass.psk" \
- "$P_CLI debug_level=4 psk=010203 psk_identity=0a0b0c tls13_kex_modes=ephemeral_all" \
- 0 \
- -c "=> write client hello" \
- -c "client hello, adding pre_shared_key extension, omitting PSK binder list" \
- -c "client hello, adding psk_key_exchange_modes extension" \
- -c "client hello, adding PSK binder list" \
- -s "Parsing extension 'PSK Key Exchange Modes/45'" \
- -s "Parsing extension 'Pre Shared Key/41'" \
- -c "<= write client hello" \
- -c "HTTP/1.0 200 OK"
-
for i in opt-testcases/*.sh
do
TEST_SUITE_NAME=${i##*/}