commit ac0b3505047d23fa3b9dab867439c1f93b556bba
author Pengyu Lv <pengyu.lv@arm.com> Fri Dec 01 14:25:40 2023 +0800
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Wed Mar 20 11:35:39 2024 +0100
tree f3da9babee2fbfff4cd924ef6eb4903635281eb5
parent 8fa06dc6fad9d5c6280ad1801d9fdbb714b8bade

Remove the workarround for G->m dtls12 tests

Signed-off-by: Pengyu Lv <pengyu.lv@arm.com>
Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>

tests/compat.sh

diff --git a/tests/compat.sh b/tests/compat.sh
index 2b742e3..92fcce3 100755
--- a/tests/compat.sh
+++ b/tests/compat.sh
@@ -147,16 +147,10 @@
                 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 @@
         # 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 @@
             ;;
 
         [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 &