1
0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-08-01 10:06:53 +03:00

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>
This commit is contained in:
Pengyu Lv
2023-12-01 14:25:40 +08:00
committed by Manuel Pégourié-Gonnard
parent 8fa06dc6fa
commit ac0b350504

View File

@ -147,16 +147,10 @@ list_test_cases() {
add_openssl_ciphersuites add_openssl_ciphersuites
add_gnutls_ciphersuites add_gnutls_ciphersuites
add_mbedtls_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 m O "$O_CIPHERS"
print_test_case O m "$O_CIPHERS" print_test_case O m "$O_CIPHERS"
print_test_case m G "$G_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" print_test_case m m "$M_CIPHERS"
done done
done done
@ -289,12 +283,6 @@ filter_ciphersuites()
# Ciphersuite for GnuTLS # Ciphersuite for GnuTLS
G_CIPHERS=$( filter "$G_CIPHERS" ) G_CIPHERS=$( filter "$G_CIPHERS" )
fi 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() reset_ciphersuites()
@ -1298,13 +1286,7 @@ run_client() {
;; ;;
[Gg]nu*) [Gg]nu*)
# need to force IPv4 with UDP, but keep localhost for auth CLIENT_CMD="$GNUTLS_CLI $G_CLIENT_ARGS --priority $G_PRIO_MODE:$2 localhost"
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"
log "$CLIENT_CMD" log "$CLIENT_CMD"
echo "$CLIENT_CMD" > $CLI_OUT echo "$CLIENT_CMD" > $CLI_OUT
printf 'GET HTTP/1.0\r\n\r\n' | $CLIENT_CMD >> $CLI_OUT 2>&1 & printf 'GET HTTP/1.0\r\n\r\n' | $CLIENT_CMD >> $CLI_OUT 2>&1 &