Skip to content

Commit 17a38d3

Browse files
committed
Reenable GnuTLS next based tests
1 parent f352f75 commit 17a38d3

File tree

1 file changed

+8
-21
lines changed

1 file changed

+8
-21
lines changed

tests/ssl-opt.sh

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6701,13 +6701,7 @@ run_test "DTLS fragmenting: 3d, gnutls server, DTLS 1.0" \
67016701
-c "fragmenting handshake message" \
67026702
-C "error"
67036703

6704-
## The two tests below are disabled due to a bug in GnuTLS client that causes
6705-
## handshake failures when the NewSessionTicket message is lost, see
6706-
## https://gitlab.com/gnutls/gnutls/issues/543
6707-
## We can re-enable them when a fixed version fo GnuTLS is available
6708-
## and installed in our CI system.
6709-
skip_next_test
6710-
requires_gnutls
6704+
requires_gnutls_next
67116705
requires_config_enabled MBEDTLS_SSL_PROTO_DTLS
67126706
requires_config_enabled MBEDTLS_RSA_C
67136707
requires_config_enabled MBEDTLS_ECDSA_C
@@ -6719,12 +6713,11 @@ run_test "DTLS fragmenting: 3d, gnutls client, DTLS 1.2" \
67196713
crt_file=data_files/server7_int-ca.crt \
67206714
key_file=data_files/server7.key \
67216715
hs_timeout=250-60000 mtu=512 force_version=dtls1_2" \
6722-
"$G_CLI -u --insecure 127.0.0.1" \
6716+
"$G_NEXT_CLI -u --insecure 127.0.0.1" \
67236717
0 \
67246718
-s "fragmenting handshake message"
67256719

6726-
skip_next_test
6727-
requires_gnutls
6720+
requires_gnutls_next
67286721
requires_config_enabled MBEDTLS_SSL_PROTO_DTLS
67296722
requires_config_enabled MBEDTLS_RSA_C
67306723
requires_config_enabled MBEDTLS_ECDSA_C
@@ -6736,7 +6729,7 @@ run_test "DTLS fragmenting: 3d, gnutls client, DTLS 1.0" \
67366729
crt_file=data_files/server7_int-ca.crt \
67376730
key_file=data_files/server7.key \
67386731
hs_timeout=250-60000 mtu=512 force_version=dtls1" \
6739-
"$G_CLI -u --insecure 127.0.0.1" \
6732+
"$G_NEXT_CLI -u --insecure 127.0.0.1" \
67406733
0 \
67416734
-s "fragmenting handshake message"
67426735

@@ -7306,29 +7299,23 @@ run_test "DTLS proxy: 3d, gnutls server" \
73067299
-s "Extra-header:" \
73077300
-c "Extra-header:"
73087301

7309-
# The next two test are disabled because they tend to trigger a bug in the
7310-
# version of GnuTLS that's currently installed on our CI. The bug occurs when
7311-
# different fragments of the same handshake message are received out-of-order
7312-
# by GnuTLS and results in a timeout. It's been fixed in GnuTLS 3.5.2.
7313-
skip_next_test
7314-
requires_gnutls
7302+
requires_gnutls_next
73157303
client_needs_more_time 8
73167304
not_with_valgrind # risk of non-mbedtls peer timing out
73177305
run_test "DTLS proxy: 3d, gnutls server, fragmentation" \
73187306
-p "$P_PXY drop=5 delay=5 duplicate=5" \
7319-
"$G_SRV -u --mtu 512" \
7307+
"$G_NEXT_SRV -u --mtu 512" \
73207308
"$P_CLI dgram_packing=0 dtls=1 hs_timeout=500-60000" \
73217309
0 \
73227310
-s "Extra-header:" \
73237311
-c "Extra-header:"
73247312

7325-
skip_next_test
7326-
requires_gnutls
7313+
requires_gnutls_next
73277314
client_needs_more_time 8
73287315
not_with_valgrind # risk of non-mbedtls peer timing out
73297316
run_test "DTLS proxy: 3d, gnutls server, fragmentation, nbio" \
73307317
-p "$P_PXY drop=5 delay=5 duplicate=5" \
7331-
"$G_SRV -u --mtu 512" \
7318+
"$G_NEXT_SRV -u --mtu 512" \
73327319
"$P_CLI dgram_packing=0 dtls=1 hs_timeout=500-60000 nbio=2" \
73337320
0 \
73347321
-s "Extra-header:" \

0 commit comments

Comments
 (0)