From ac0b3505047d23fa3b9dab867439c1f93b556bba Mon Sep 17 00:00:00 2001 From: Pengyu Lv Date: Fri, 1 Dec 2023 14:25:40 +0800 Subject: [PATCH] Remove the workarround for G->m dtls12 tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Pengyu Lv Signed-off-by: Manuel Pégourié-Gonnard --- tests/compat.sh | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/tests/compat.sh b/tests/compat.sh index 2b742e345c..92fcce39f7 100755 --- a/tests/compat.sh +++ b/tests/compat.sh @@ -147,16 +147,10 @@ list_test_cases() { add_openssl_ciphersuites add_gnutls_ciphersuites add_mbedtls_ciphersuites - # For GnuTLS client -> Mbed TLS server, - # we need to force IPv4 by connecting to 127.0.0.1 but then auth fails - SUB_G_CIPHERS=$G_CIPHERS - if is_dtls "$MODE" && [ "X$VERIFY" = "XYES" ]; then - SUB_G_CIPHERS="" - fi 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 "$SUB_G_CIPHERS" + print_test_case G m "$G_CIPHERS" print_test_case m m "$M_CIPHERS" done done @@ -289,12 +283,6 @@ filter_ciphersuites() # Ciphersuite for GnuTLS G_CIPHERS=$( filter "$G_CIPHERS" ) fi - - # For GnuTLS client -> Mbed TLS server, - # we need to force IPv4 by connecting to 127.0.0.1 but then auth fails - if is_dtls "$MODE" && [ "X$VERIFY" = "XYES" ]; then - G_CIPHERS="" - fi } reset_ciphersuites() @@ -1298,13 +1286,7 @@ run_client() { ;; [Gg]nu*) - # need to force IPv4 with UDP, but keep localhost for auth - if is_dtls "$MODE"; then - G_HOST="127.0.0.1" - else - G_HOST="localhost" - fi - CLIENT_CMD="$GNUTLS_CLI $G_CLIENT_ARGS --priority $G_PRIO_MODE:$2 $G_HOST" + CLIENT_CMD="$GNUTLS_CLI $G_CLIENT_ARGS --priority $G_PRIO_MODE:$2 localhost" log "$CLIENT_CMD" echo "$CLIENT_CMD" > $CLI_OUT printf 'GET HTTP/1.0\r\n\r\n' | $CLIENT_CMD >> $CLI_OUT 2>&1 &