From c1685d1c1112fa245084aca0b1c291f2c8f3593f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Tue, 9 Apr 2024 11:38:55 +0200 Subject: [PATCH] compat.sh: use correct names in --list-test-cases MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The main fix here is that m->O and m->G should use `M_CIPHERS`. In order to apply that though, we need to change the structure with a new for loop and case statement. The new structure matches what's done when actually running tests. Note: this issue only exists in 2.28. In 3.x we now use the standard name for display everywhere, but in 2.28 we use the name as seen by the client for display. Signed-off-by: Manuel Pégourié-Gonnard --- tests/compat.sh | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/tests/compat.sh b/tests/compat.sh index f21619a16..03e7298c9 100755 --- a/tests/compat.sh +++ b/tests/compat.sh @@ -147,17 +147,31 @@ list_test_cases() { fi for VERIFY in $SUB_VERIFIES; do VERIF=$(echo $VERIFY | tr '[:upper:]' '[:lower:]') - reset_ciphersuites - add_common_ciphersuites - add_openssl_ciphersuites - add_gnutls_ciphersuites - add_mbedtls_ciphersuites - filter_ciphersuites - print_test_case m O "$O_CIPHERS" - print_test_case O m "$O_CIPHERS" - print_test_case m G "$G_CIPHERS" - print_test_case G m "$G_CIPHERS" - print_test_case m m "$M_CIPHERS" + for PEER in $PEERS; do + reset_ciphersuites + add_common_ciphersuites + case "$PEER" in + [Oo]pen*) + add_openssl_ciphersuites + filter_ciphersuites + print_test_case m O "$M_CIPHERS" + print_test_case O m "$O_CIPHERS" + ;; + [Gg]nu*) + add_gnutls_ciphersuites + filter_ciphersuites + print_test_case m G "$M_CIPHERS" + print_test_case G m "$G_CIPHERS" + ;; + mbed*) + add_openssl_ciphersuites + add_gnutls_ciphersuites + add_mbedtls_ciphersuites + filter_ciphersuites + print_test_case m m "$M_CIPHERS" + ;; + esac + done done done done