tests: make any ad-hoc timeout setting controllable through envvar

Signed-off-by: Daiki Ueno <ueno@gnu.org>

diff --git a/tests/anonself.c b/tests/anonself.c
index 26e360743feb06b7a2ef520976221f3c8c3f3645..9d4926f424980489a898e391e50b24e62f4af2b5 100644 (file)
--- a/tests/anonself.c
+++ b/tests/anonself.c
@@ -192,7 +192,7 @@ static void server(int sd, const char *prio)
 
        assert(gnutls_priority_set_direct(session, prio, NULL) >= 0);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
        gnutls_credentials_set(session, GNUTLS_CRD_ANON, anoncred);
 
        gnutls_dh_set_prime_bits(session, DH_BITS);

diff --git a/tests/client-fastopen.c b/tests/client-fastopen.c
index e0473569893d8fdbc404d2e86ab91738b1afc1f8..5a1457a8e869a6672ba190d467f7e2f91c481d01 100644 (file)
--- a/tests/client-fastopen.c
+++ b/tests/client-fastopen.c
@@ -89,7 +89,7 @@ static void client(int fd, struct sockaddr *connect_addr, socklen_t connect_addr
        /* Initialize TLS session
         */
        gnutls_init(&session, GNUTLS_CLIENT);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        /* Use default priorities */
        assert(gnutls_priority_set_direct(session, prio, NULL) >= 0);
@@ -183,7 +183,7 @@ static void server(int fd, const char *prio)
                exit(1);
 
        gnutls_init(&session, GNUTLS_SERVER);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        /* avoid calling all the priority functions, since the defaults
         * are adequate.

diff --git a/tests/client-sign-md5-rep.c b/tests/client-sign-md5-rep.c
index b1ad46ce9200ded245e364b746f65a0000b3c954..10ae99bdfa23dd83baa94b557a1ed7b8bcc1895f 100644 (file)
--- a/tests/client-sign-md5-rep.c
+++ b/tests/client-sign-md5-rep.c
@@ -47,6 +47,7 @@ int main(int argc, char **argv)
 #include <unistd.h>
 #include <gnutls/gnutls.h>
 #include <signal.h>
+#include <limits.h>
 #include <poll.h>
 #include <errno.h>
 
@@ -378,6 +379,7 @@ static void server(int sd)
        char buf[1024];
        int ret;
        struct pollfd pfd;
+       unsigned int timeout;
 
        /* send a TLS 1.x message trace accepting RSA-MD5 */
 
@@ -389,8 +391,12 @@ static void server(int sd)
        pfd.events = POLLIN;
        pfd.revents = 0;
 
+       timeout = get_timeout();
+       if (timeout > INT_MAX)
+               fail("invalid timeout value\n");
+
        do {
-               ret = poll(&pfd, 1, 10000);
+               ret = poll(&pfd, 1, (int)timeout);
        } while (ret == -1 && errno == EINTR);
 
        if (ret == -1 || ret == 0) {
@@ -435,7 +441,7 @@ static void client(int sd)
         * are adequate.
         */
        gnutls_priority_set_direct(session, "NORMAL:-VERS-ALL:+VERS-TLS1.2:-KX-ALL:+DHE-RSA:+AES-128-GCM", NULL);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
        gnutls_server_name_set(session, GNUTLS_NAME_DNS, "localhost", strlen("localhost"));
 
        gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred);

diff --git a/tests/dhepskself.c b/tests/dhepskself.c
index 9081f953c95a5aba54f2a4be6d22d1a154c2158a..6358cc8cfd4091e7acaa960f7c53ae43d06b61ac 100644 (file)
--- a/tests/dhepskself.c
+++ b/tests/dhepskself.c
@@ -160,7 +160,7 @@ static gnutls_session_t initialize_tls_session(void)
         */
        gnutls_priority_set_direct(session, "NORMAL:-VERS-ALL:+VERS-TLS1.2:+DHE-PSK", NULL);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
        gnutls_credentials_set(session, GNUTLS_CRD_PSK, server_pskcred);
 
        return session;

diff --git a/tests/dhex509self.c b/tests/dhex509self.c
index 8a21ba097a61ed99273f9cae761b697087642961..d9ed7ca98a3b9f4b9b5dfda26a4a9f7cae558820 100644 (file)
--- a/tests/dhex509self.c
+++ b/tests/dhex509self.c
@@ -218,7 +218,7 @@ static gnutls_session_t initialize_tls_session(void)
         * are adequate.
         */
        gnutls_priority_set_direct(session, "NORMAL:-VERS-ALL:+VERS-TLS1.2:-KX-ALL:+DHE-RSA", NULL);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred);
 

diff --git a/tests/dtls-client-with-seccomp.c b/tests/dtls-client-with-seccomp.c
index 34b2409b46bba7015d01641246629a505529434f..7fc77263b42d4f16d0bfc36c9880d39451618220 100644 (file)
--- a/tests/dtls-client-with-seccomp.c
+++ b/tests/dtls-client-with-seccomp.c
@@ -99,7 +99,7 @@ static void client(int fd, const char *prio)
         */
        gnutls_init(&session, GNUTLS_CLIENT | GNUTLS_DATAGRAM);
        gnutls_dtls_set_mtu(session, 1500);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        /* Use default priorities */
        assert(gnutls_priority_set_direct(session,
@@ -200,7 +200,7 @@ static void server(int fd, const char *prio)
                exit(1);
 
        gnutls_init(&session, GNUTLS_SERVER | GNUTLS_DATAGRAM);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
        gnutls_dtls_set_mtu(session, 1500);
 
        /* avoid calling all the priority functions, since the defaults

diff --git a/tests/dtls-pthread.c b/tests/dtls-pthread.c
index 31c2ce5ee4fa6cc9edc60ec3dd4fdd40c977f0e9..aab1e73d3d9fa1d569626159db9281ddcfcaf4f8 100644 (file)
--- a/tests/dtls-pthread.c
+++ b/tests/dtls-pthread.c
@@ -220,7 +220,7 @@ static void client(int fd, const char *prio, unsigned do_thread, unsigned false_
 
        assert(gnutls_init(&session, flags|GNUTLS_DATAGRAM) >= 0);
        gnutls_dtls_set_mtu(session, 1500);
-       gnutls_dtls_set_timeouts(session, 6 * 1000, 60 * 1000);
+       gnutls_dtls_set_timeouts(session, get_dtls_retransmit_timeout(), get_timeout());
 
        assert(gnutls_priority_set_direct(session, prio, NULL)>=0);
 
@@ -276,7 +276,7 @@ static void server(int fd, const char *prio, unsigned do_thread)
                                            GNUTLS_X509_FMT_PEM)>=0);
 
        assert(gnutls_init(&session, GNUTLS_SERVER | GNUTLS_DATAGRAM)>=0);
-       gnutls_dtls_set_timeouts(session, 5 * 1000, 60 * 1000);
+       gnutls_dtls_set_timeouts(session, get_dtls_retransmit_timeout(), get_timeout());
        gnutls_dtls_set_mtu(session, 400);
 
        assert(gnutls_priority_set_direct(session, prio, NULL)>=0);

diff --git a/tests/dtls-rehandshake-cert-3.c b/tests/dtls-rehandshake-cert-3.c
index 38d1cf7631b1d25bf76cb47f0a9316f0f9a17c54..b537a2b6702dfc26e5bbdc3c6c313c730f7a0981 100644 (file)
--- a/tests/dtls-rehandshake-cert-3.c
+++ b/tests/dtls-rehandshake-cert-3.c
@@ -135,7 +135,7 @@ static void client(int fd, const char *prio)
 
        gnutls_transport_set_int(session, fd);
        gnutls_transport_set_push_function(session, push);
-       gnutls_dtls_set_timeouts(session, 2000, 30 * 1000);
+       gnutls_dtls_set_timeouts(session, get_dtls_retransmit_timeout(), get_timeout());
 
        /* Perform the TLS handshake
         */

diff --git a/tests/dtls-with-seccomp.c b/tests/dtls-with-seccomp.c
index 192d4d19cadf173cc4585587bea62a0a4a129179..fa46c3dfc9757c54cd5a585b63b53a688e993183 100644 (file)
--- a/tests/dtls-with-seccomp.c
+++ b/tests/dtls-with-seccomp.c
@@ -93,7 +93,7 @@ static void client(int fd, const char *prio)
         */
        gnutls_init(&session, GNUTLS_CLIENT | GNUTLS_DATAGRAM);
        gnutls_dtls_set_mtu(session, 1500);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        assert(gnutls_priority_set_direct(session, prio, NULL) >= 0);
 
@@ -197,7 +197,7 @@ static void server(int fd, const char *prio)
        }
 
        gnutls_init(&session, GNUTLS_SERVER | GNUTLS_DATAGRAM);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
        gnutls_dtls_set_mtu(session, 1500);
 
        assert(gnutls_priority_set_direct(session, prio, NULL) >= 0);

diff --git a/tests/dtls_hello_random_value.c b/tests/dtls_hello_random_value.c
index 601c8686bf9e5e4b204b24c5669e51547bcaf89a..f4503fa9a467ce44534acd7c7d6d909a855f6ca0 100644 (file)
--- a/tests/dtls_hello_random_value.c
+++ b/tests/dtls_hello_random_value.c
@@ -145,7 +145,7 @@ static void client(int sd, const char *priority)
 
        gnutls_transport_set_int(session, sd);
        gnutls_dtls_set_mtu(session, 1500);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        gnutls_handshake_set_hook_function(session, GNUTLS_HANDSHAKE_ANY,
                                           GNUTLS_HOOK_BOTH, hello_callback);
@@ -261,7 +261,7 @@ static void server(int sd, const char *priority)
                                serverx509cred);
 
        gnutls_transport_set_int(session, sd);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
        gnutls_dtls_set_mtu(session, 1500);
 
        gnutls_dtls_prestate_set(session, &prestate);

diff --git a/tests/duplicate-extensions.c b/tests/duplicate-extensions.c
index d3db925da7eb8428f6773a1c136fe101b3bc8780..819fbb8606334aae2f8157b8750f41a8d5d947f5 100644 (file)
--- a/tests/duplicate-extensions.c
+++ b/tests/duplicate-extensions.c
@@ -24,6 +24,7 @@
 #include <config.h>
 #endif
 
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -92,6 +93,7 @@ static void client(int sd)
        char buf[1024];
        int ret;
        struct pollfd pfd;
+       unsigned int timeout;
 
        /* send a TLS 1.x hello with duplicate extensions */
        
@@ -103,8 +105,12 @@ static void client(int sd)
        pfd.events = POLLIN;
        pfd.revents = 0;
 
+       timeout = get_timeout();
+       if (timeout > INT_MAX)
+               fail("invalid timeout value\n");
+
        do {
-               ret = poll(&pfd, 1, 10000);
+               ret = poll(&pfd, 1, (int)timeout);
        } while (ret == -1 && errno == EINTR);
 
        if (ret == -1 || ret == 0) {
@@ -157,7 +163,7 @@ static void server(int sd)
         * are adequate.
         */
        gnutls_priority_set_direct(session, "NORMAL:-VERS-ALL:+VERS-TLS1.0:+VERS-TLS1.1:+VERS-TLS1.2", NULL);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred);
 

diff --git a/tests/gnutls_ext_raw_parse.c b/tests/gnutls_ext_raw_parse.c
index 283062ec934b7093a0ae9c9a49c2de780191bf6b..247da927d3361174fbf2e43e585f8c1c5c82247b 100644 (file)
--- a/tests/gnutls_ext_raw_parse.c
+++ b/tests/gnutls_ext_raw_parse.c
@@ -147,7 +147,7 @@ static void client(int fd)
        /* Initialize TLS session
         */
        gnutls_init(&session, GNUTLS_CLIENT);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        /* Use default priorities */
        gnutls_priority_set_direct(session, "NORMAL:-VERS-ALL:+VERS-TLS1.2", NULL);
@@ -216,7 +216,7 @@ static void server(int fd)
                                            GNUTLS_X509_FMT_PEM);
 
        gnutls_init(&session, GNUTLS_SERVER);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        gnutls_handshake_set_hook_function(session, GNUTLS_HANDSHAKE_CLIENT_HELLO,
                                           GNUTLS_HOOK_POST,

diff --git a/tests/gnutls_ext_raw_parse_dtls.c b/tests/gnutls_ext_raw_parse_dtls.c
index 8af863b7f5f02a4d69946067c89b4089976b9bfe..3292c804f91608f001c2c795274d5aa7d5cf8566 100644 (file)
--- a/tests/gnutls_ext_raw_parse_dtls.c
+++ b/tests/gnutls_ext_raw_parse_dtls.c
@@ -133,7 +133,7 @@ static void client(int fd)
        /* Initialize TLS session
         */
        gnutls_init(&session, GNUTLS_CLIENT|GNUTLS_DATAGRAM);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        assert(gnutls_priority_set_direct(session, "NORMAL:-VERS-ALL:+VERS-DTLS1.2", NULL)>= 0);
 
@@ -201,7 +201,7 @@ static void server(int fd)
                                            GNUTLS_X509_FMT_PEM);
 
        gnutls_init(&session, GNUTLS_SERVER|GNUTLS_DATAGRAM);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        gnutls_handshake_set_hook_function(session, GNUTLS_HANDSHAKE_CLIENT_HELLO,
                                           GNUTLS_HOOK_POST,

diff --git a/tests/handshake-large-cert.c b/tests/handshake-large-cert.c
index 87220f9502d4644f113f99f83fbef0bf25950e43..66b84edd1929d77c49098d3496e5c022b529eb63 100644 (file)
--- a/tests/handshake-large-cert.c
+++ b/tests/handshake-large-cert.c
@@ -84,7 +84,7 @@ static void client(int sd, const char *prio)
                                clientx509cred);
 
        gnutls_transport_set_int(session, sd);
-       gnutls_handshake_set_timeout(session, 60 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        do {
                ret = gnutls_handshake(session);
@@ -181,7 +181,7 @@ static void server(int sd, const char *prio)
                                serverx509cred);
 
        gnutls_transport_set_int(session, sd);
-       gnutls_handshake_set_timeout(session, 60 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        do {
                ret = gnutls_handshake(session);

diff --git a/tests/handshake-large-packet.c b/tests/handshake-large-packet.c
index a264b3257709af14cf58497b9f7a0a00c24da327..8db73d42b950a8a286434dd41737e68fbccbac1b 100644 (file)
--- a/tests/handshake-large-packet.c
+++ b/tests/handshake-large-packet.c
@@ -138,7 +138,7 @@ static void client(int sd, const char *prio)
                                clientx509cred);
 
        gnutls_transport_set_int(session, sd);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        gnutls_session_ext_register(session, "ext_client1", TLSEXT_TYPE1, GNUTLS_EXT_TLS, ext_recv_client_params, ext_send_client_params, NULL, NULL, NULL, 0);
        gnutls_session_ext_register(session, "ext_client2", TLSEXT_TYPE2, GNUTLS_EXT_TLS, ext_recv_client_params, ext_send_client_params, NULL, NULL, NULL, 0);
@@ -213,7 +213,7 @@ static void server(int sd, const char *prio)
        gnutls_session_ext_register(session, "ext_server5", TLSEXT_TYPE5, GNUTLS_EXT_TLS, ext_recv_server_params, ext_send_server_params, NULL, NULL, NULL, 0);
 
        gnutls_transport_set_int(session, sd);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        do {
                ret = gnutls_handshake(session);

diff --git a/tests/mini-dtls-discard.c b/tests/mini-dtls-discard.c
index 97bc6de29be4ceeaa5e9f14b509f2a43c4ae0e5c..2ad841b1d86f0d8def6d9e89431b32fe6fbf2d03 100644 (file)
--- a/tests/mini-dtls-discard.c
+++ b/tests/mini-dtls-discard.c
@@ -105,7 +105,7 @@ static void client(int fd, const char *prio)
         */
        gnutls_init(&session, GNUTLS_CLIENT | GNUTLS_DATAGRAM);
        gnutls_dtls_set_mtu(session, 1500);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        /* Use default priorities */
        assert(gnutls_priority_set_direct(session, prio, NULL) >= 0);
@@ -194,7 +194,7 @@ static void server(int fd, const char *prio)
        gnutls_anon_allocate_server_credentials(&anoncred);
 
        gnutls_init(&session, GNUTLS_SERVER | GNUTLS_DATAGRAM);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
        gnutls_dtls_set_mtu(session, 1500);
 
        /* avoid calling all the priority functions, since the defaults

diff --git a/tests/mini-dtls-fork.c b/tests/mini-dtls-fork.c
index 16270de273d16eefe26556a2af360895b0d63aea..b3164ef65cdf4a826f61142ce7733d05c61fc801 100644 (file)
--- a/tests/mini-dtls-fork.c
+++ b/tests/mini-dtls-fork.c
@@ -222,7 +222,7 @@ static void client(int fd, unsigned do_fork)
         */
        gnutls_init(&session, GNUTLS_CLIENT | GNUTLS_DATAGRAM);
        gnutls_dtls_set_mtu(session, 1500);
-       gnutls_dtls_set_timeouts(session, 6 * 1000, 60 * 1000);
+       gnutls_dtls_set_timeouts(session, get_dtls_retransmit_timeout(), get_timeout());
        //gnutls_transport_set_push_function(session, push);
 
        /* Use default priorities */
@@ -292,7 +292,7 @@ static void server(int fd, unsigned do_fork)
                                            GNUTLS_X509_FMT_PEM);
 
        gnutls_init(&session, GNUTLS_SERVER | GNUTLS_DATAGRAM);
-       gnutls_dtls_set_timeouts(session, 5 * 1000, 60 * 1000);
+       gnutls_dtls_set_timeouts(session, get_dtls_retransmit_timeout(), get_timeout());
        gnutls_dtls_set_mtu(session, 400);
 
        /* avoid calling all the priority functions, since the defaults

diff --git a/tests/mini-dtls-hello-verify-48.c b/tests/mini-dtls-hello-verify-48.c
index 10516395df04f757318feba32426f911712ae4ba..3594f7c4dc1f198b8f352bb4b4a645ee750a46fb 100644 (file)
--- a/tests/mini-dtls-hello-verify-48.c
+++ b/tests/mini-dtls-hello-verify-48.c
@@ -97,7 +97,7 @@ static void client(int fd)
         */
        gnutls_init(&session, GNUTLS_CLIENT | GNUTLS_DATAGRAM);
        gnutls_dtls_set_mtu(session, 1500);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        /* Use default priorities */
        gnutls_priority_set_direct(session,

diff --git a/tests/mini-dtls-hello-verify.c b/tests/mini-dtls-hello-verify.c
index 683123785cfb68d364b840ccc13ed1aae6373afe..1029c868772fca5a875c79ac4a8eee6de2de4d9a 100644 (file)
--- a/tests/mini-dtls-hello-verify.c
+++ b/tests/mini-dtls-hello-verify.c
@@ -98,7 +98,7 @@ static void client(int fd)
         */
        gnutls_init(&session, GNUTLS_CLIENT | GNUTLS_DATAGRAM);
        gnutls_dtls_set_mtu(session, 1500);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        /* Use default priorities */
        gnutls_priority_set_direct(session,
@@ -203,7 +203,7 @@ static void server(int fd)
        gnutls_anon_allocate_server_credentials(&anoncred);
 
        gnutls_init(&session, GNUTLS_SERVER | GNUTLS_DATAGRAM);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
        gnutls_dtls_set_mtu(session, 1500);
 
        /* avoid calling all the priority functions, since the defaults

diff --git a/tests/mini-dtls-mtu.c b/tests/mini-dtls-mtu.c
index 1ae73256652fa997425b69269f649808fccd346d..fa79cd64479dcbf84cd98347d1694f5d43c9f8da 100644 (file)
--- a/tests/mini-dtls-mtu.c
+++ b/tests/mini-dtls-mtu.c
@@ -148,7 +148,7 @@ static void client(int fd)
         */
        gnutls_init(&session, GNUTLS_CLIENT | GNUTLS_DATAGRAM);
        gnutls_dtls_set_mtu(session, 1500);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        /* Use default priorities */
        gnutls_priority_set_direct(session,
@@ -229,7 +229,7 @@ static void server(int fd)
                                            GNUTLS_X509_FMT_PEM);
 
        gnutls_init(&session, GNUTLS_SERVER | GNUTLS_DATAGRAM);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
        gnutls_dtls_set_mtu(session, SERVER_MTU);
 
        /* avoid calling all the priority functions, since the defaults

diff --git a/tests/mini-dtls-record-asym.c b/tests/mini-dtls-record-asym.c
index 9ace1a533af985541d21608d31130494a3eb6c91..234e51b109a94ac10bce3232b932cf32fcc90f33 100644 (file)
--- a/tests/mini-dtls-record-asym.c
+++ b/tests/mini-dtls-record-asym.c
@@ -44,7 +44,9 @@ void doit(void)
 
 #else
 
+#include <limits.h>
 #include <netinet/in.h>
+#include <poll.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
@@ -147,8 +149,7 @@ static void client(int fd, unsigned cache)
        gnutls_session_t session;
        /* Need to enable anonymous KX specifically. */
 
-       fd_set rfds;
-       struct timeval tv;
+       unsigned int timeout;
 
        global_init();
 
@@ -164,7 +165,7 @@ static void client(int fd, unsigned cache)
         */
        gnutls_init(&session, GNUTLS_CLIENT | GNUTLS_DATAGRAM);
        gnutls_dtls_set_mtu(session, 1500);
-       gnutls_dtls_set_timeouts(session, 6 * 1000, 60 * 1000);
+       gnutls_dtls_set_timeouts(session, get_dtls_retransmit_timeout(), get_timeout());
        //gnutls_transport_set_push_function(session, push);
 
        /* Use default priorities */
@@ -178,22 +179,29 @@ static void client(int fd, unsigned cache)
 
        gnutls_transport_set_int(session, fd);
 
+       timeout = get_timeout();
+       if (timeout > INT_MAX)
+               fail("invalid timeout value\n");
+
        /* Perform the TLS handshake
         */
        do {
+               struct pollfd pfd;
+
                ret = gnutls_handshake(session);
 
                if (ret == GNUTLS_E_AGAIN && gnutls_record_get_direction(session) == 0) {
                        int rv;
-                       FD_ZERO(&rfds);
-                       FD_SET(fd, &rfds);
+                       pfd.fd = fd;
+                       pfd.events = POLLIN;
+                       pfd.revents = 0;
 
-                       tv.tv_sec = 2;
-                       tv.tv_usec = 0;
+                       do {
+                               rv = poll(&pfd, 1, (int)timeout);
+                       } while (rv == -1 && errno == EINTR);
 
-                       rv = select(fd+1, &rfds, NULL, NULL, &tv);
                        if (rv == -1)
-                               perror("select()");
+                               perror("poll()");
                        else if (!rv)
                                fail("test %d: No data were received.\n", cache);
                }
@@ -261,7 +269,7 @@ static void server(int fd, unsigned cache)
                                            GNUTLS_X509_FMT_PEM);
 
        gnutls_init(&session, GNUTLS_SERVER | GNUTLS_DATAGRAM);
-       gnutls_dtls_set_timeouts(session, 5 * 1000, 60 * 1000);
+       gnutls_dtls_set_timeouts(session, get_dtls_retransmit_timeout(), get_timeout());
        gnutls_dtls_set_mtu(session, 400);
        if (cache != 0)
                gnutls_transport_set_push_function(session, push);

diff --git a/tests/mini-dtls-record.c b/tests/mini-dtls-record.c
index 4d92d81c54602b999818535a33b60f54214687e1..4d24f3b33f53a492e0037e4dd6dd282414628700 100644 (file)
--- a/tests/mini-dtls-record.c
+++ b/tests/mini-dtls-record.c
@@ -195,7 +195,7 @@ static void client(int fd)
        /* Initialize TLS session
         */
        gnutls_init(&session, GNUTLS_CLIENT | GNUTLS_DATAGRAM);
-       gnutls_dtls_set_timeouts(session, 50 * 1000, 600 * 1000);
+       gnutls_dtls_set_timeouts(session, get_dtls_retransmit_timeout(), get_timeout());
        gnutls_heartbeat_enable(session, GNUTLS_HB_PEER_ALLOWED_TO_SEND);
        gnutls_dtls_set_mtu(session, 1500);
 
@@ -298,7 +298,7 @@ static void server(int fd)
        gnutls_anon_allocate_server_credentials(&anoncred);
 
        gnutls_init(&session, GNUTLS_SERVER | GNUTLS_DATAGRAM);
-       gnutls_dtls_set_timeouts(session, 50 * 1000, 600 * 1000);
+       gnutls_dtls_set_timeouts(session, get_dtls_retransmit_timeout(), get_timeout());
        gnutls_transport_set_push_function(session, odd_push);
        gnutls_heartbeat_enable(session, GNUTLS_HB_PEER_ALLOWED_TO_SEND);
        gnutls_dtls_set_mtu(session, 1500);

diff --git a/tests/mini-dtls0-9.c b/tests/mini-dtls0-9.c
index 852d03ff6b692111f45a09444cd1fbec8e3215d4..496df46aab90f2b9b380bdb3380e83b068cb3cc9 100644 (file)
--- a/tests/mini-dtls0-9.c
+++ b/tests/mini-dtls0-9.c
@@ -102,7 +102,7 @@ static void client(int fd, int proto, int cipher, int mac)
         */
        gnutls_init(&session, GNUTLS_CLIENT | GNUTLS_DATAGRAM);
        gnutls_dtls_set_mtu(session, 1500);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        /* Use default priorities */
        gnutls_priority_set_direct(session,
@@ -205,7 +205,7 @@ static void server(int fd, int proto, int cipher, int mac)
        gnutls_certificate_allocate_credentials(&xcred);
 
        gnutls_init(&session, GNUTLS_SERVER | GNUTLS_DATAGRAM);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
        gnutls_dtls_set_mtu(session, 1500);
 
        /* avoid calling all the priority functions, since the defaults

diff --git a/tests/no-signal.c b/tests/no-signal.c
index 3b08417ff40e1fdef29bdcbaa68886cef92210a2..c73d02c5c7363af196084ebe02b1da800c0e8dd4 100644 (file)
--- a/tests/no-signal.c
+++ b/tests/no-signal.c
@@ -84,7 +84,7 @@ static void client(int fd)
        /* Initialize TLS session
         */
        gnutls_init(&session, GNUTLS_CLIENT);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        /* Use default priorities */
        gnutls_priority_set_direct(session,

diff --git a/tests/openconnect-dtls12.c b/tests/openconnect-dtls12.c
index 21d1b2a1fb70374b0630ff89ced5ad01aaece1ad..bfe486adc3b624163fce7afdaf0a8b4dc8e67502 100644 (file)
--- a/tests/openconnect-dtls12.c
+++ b/tests/openconnect-dtls12.c
@@ -96,7 +96,7 @@ static void client(int fd, const char *prio, int proto, int cipher, int kx, int
 
        gnutls_init(&session, GNUTLS_CLIENT | GNUTLS_DATAGRAM);
        gnutls_dtls_set_mtu(session, 1500);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        assert(gnutls_priority_set_direct(session,
                                          prio,
@@ -193,7 +193,7 @@ static void server(int fd, const char *prio, int proto, int cipher, int kx, int
        gnutls_certificate_allocate_credentials(&xcred);
 
        gnutls_init(&session, GNUTLS_SERVER | GNUTLS_DATAGRAM);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
        gnutls_dtls_set_mtu(session, 1500);
 
        /* avoid calling all the priority functions, since the defaults

diff --git a/tests/pkcs11/tls-neg-pkcs11-no-key.c b/tests/pkcs11/tls-neg-pkcs11-no-key.c
index af32c33ab911997b50506c37e212cb961a34a30c..ac098ba142aaec6811f9669993fcfab37b557dcd 100644 (file)
--- a/tests/pkcs11/tls-neg-pkcs11-no-key.c
+++ b/tests/pkcs11/tls-neg-pkcs11-no-key.c
@@ -108,7 +108,7 @@ static void client(int fd)
         */
        assert(gnutls_init(&session, GNUTLS_CLIENT)>=0);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        ret = gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred);
        if (ret < 0)
@@ -271,7 +271,7 @@ static void server(int fd)
 
        gnutls_init(&session, GNUTLS_SERVER);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        assert(gnutls_certificate_set_x509_key_file(x509_cred,
                                                    SOFTHSM_URL

diff --git a/tests/resume-dtls.c b/tests/resume-dtls.c
index b5b214313a6bcf76006096484fc872b2ebe9a3ff..7232af2297c228ee96fe50055b7c1c5d8b5086c3 100644 (file)
--- a/tests/resume-dtls.c
+++ b/tests/resume-dtls.c
@@ -147,7 +147,7 @@ static void client(int sds[], struct params_res *params)
 
                /* Perform the TLS handshake
                 */
-               gnutls_dtls_set_timeouts(session, 3*1000, 240 * 1000);
+               gnutls_dtls_set_timeouts(session, get_dtls_retransmit_timeout(), get_timeout());
                do {
                        ret = gnutls_handshake(session);
                } while (ret < 0 && gnutls_error_is_fatal(ret) == 0);
@@ -310,7 +310,7 @@ static void server(int sds[], struct params_res *params)
                                                    &session_ticket_key);
 
                gnutls_transport_set_int(session, sd);
-               gnutls_dtls_set_timeouts(session, 3*1000, 240 * 1000);
+               gnutls_dtls_set_timeouts(session, get_dtls_retransmit_timeout(), get_timeout());
                
                do {
                        ret = gnutls_handshake(session);

diff --git a/tests/resume-with-previous-stek.c b/tests/resume-with-previous-stek.c
index 3bbba8f89604534e79559e65292ffd092ac9da52..7e473894596e9413273f09dfd8185be38e6d9380 100644 (file)
--- a/tests/resume-with-previous-stek.c
+++ b/tests/resume-with-previous-stek.c
@@ -113,7 +113,7 @@ static void client(int fd, int *resume, unsigned rounds, const char *prio)
                                       clientx509cred);
 
                gnutls_transport_set_int(session, fd);
-               gnutls_handshake_set_timeout(session, 20 * 1000);
+               gnutls_handshake_set_timeout(session, get_timeout());
 
                /* Perform TLS handshake and obtain session ticket */
                if (client_handshake(session, &session_data,
@@ -171,7 +171,7 @@ static void server(int fd, unsigned rounds, const char *prio)
                }
 
                gnutls_transport_set_int(session, fd);
-               gnutls_handshake_set_timeout(session, 20 * 1000);
+               gnutls_handshake_set_timeout(session, get_timeout());
 
                virt_sec_sleep(TICKET_ROTATION_PERIOD-1);
 

diff --git a/tests/resume-with-record-size-limit.c b/tests/resume-with-record-size-limit.c
index 58f71c39afcb66343365a7635de2d21662407bb7..d805db43cc05f02d223df1d0b9bec34e832489f6 100644 (file)
--- a/tests/resume-with-record-size-limit.c
+++ b/tests/resume-with-record-size-limit.c
@@ -189,7 +189,7 @@ static void client(int sds[], const char *prio)
 
                /* Perform the TLS handshake
                 */
-               gnutls_handshake_set_timeout(session, 20 * 1000);
+               gnutls_handshake_set_timeout(session, get_timeout());
                do {
                        ret = gnutls_handshake(session);
                } while (ret < 0 && gnutls_error_is_fatal(ret) == 0);
@@ -305,7 +305,7 @@ static void server(int sds[], const char *prio)
 
                gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, serverx509cred);
                gnutls_transport_set_int(session, sd);
-               gnutls_handshake_set_timeout(session, 20 * 1000);
+               gnutls_handshake_set_timeout(session, get_timeout());
 
                do {
                        ret = gnutls_handshake(session);

diff --git a/tests/resume-with-stek-expiration.c b/tests/resume-with-stek-expiration.c
index de0f07012b14771b47e9e88424619456c30dcbe5..d9131512ddf8a6a5b3c59035cb9d7b68e8485abe 100644 (file)
--- a/tests/resume-with-stek-expiration.c
+++ b/tests/resume-with-stek-expiration.c
@@ -165,7 +165,7 @@ static void client(int fd, int *resumption_should_succeed, unsigned num_sessions
                                clientx509cred);
 
        gnutls_transport_set_int(session, fd);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        if (handshake(session, &session_data, resumption_should_succeed[0]) < 0)
                return;
@@ -235,7 +235,7 @@ static void server(int fd, int *resumption_should_succeed, unsigned num_sessions
                _gnutls_set_session_ticket_key_rotation_callback(session, stek_rotation_callback);
 
                gnutls_transport_set_int(session, fd);
-               gnutls_handshake_set_timeout(session, 20 * 1000);
+               gnutls_handshake_set_timeout(session, get_timeout());
 
                do {
                        retval = gnutls_handshake(session);

diff --git a/tests/resume.c b/tests/resume.c
index 04309fba6a6f67cfba2d1f47b78014350ea00c9e..3123e78af28c9f90e1edc47d014c41bce0f88480 100644 (file)
--- a/tests/resume.c
+++ b/tests/resume.c
@@ -560,7 +560,7 @@ static void client(int sds[], struct params_res *params)
 
                /* Perform the TLS handshake
                 */
-               gnutls_handshake_set_timeout(session, 20 * 1000);
+               gnutls_handshake_set_timeout(session, get_timeout());
                do {
                        ret = gnutls_handshake(session);
                } while (ret < 0 && gnutls_error_is_fatal(ret) == 0);
@@ -827,7 +827,7 @@ static void server(int sds[], struct params_res *params)
                gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, serverx509cred);
 #endif
                gnutls_transport_set_int(session, sd);
-               gnutls_handshake_set_timeout(session, 20 * 1000);
+               gnutls_handshake_set_timeout(session, get_timeout());
 
                if (params->call_post_client_hello) {
                        gnutls_session_set_ptr(session, PRIO_STR);

diff --git a/tests/rsa-psk-cb.c b/tests/rsa-psk-cb.c
index 6919f7209a8b59138bec9f7d956adb8202305938..6036c18a76a343576b594c0fc4f00559ac1fad0d 100644 (file)
--- a/tests/rsa-psk-cb.c
+++ b/tests/rsa-psk-cb.c
@@ -117,7 +117,7 @@ static void client(int sd)
        gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE,
                                clientx509cred);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
        gnutls_transport_set_int(session, sd);
 
        /* Perform the TLS handshake
@@ -236,7 +236,7 @@ static void server(int sd)
        gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE,
                                serverx509cred);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
        gnutls_transport_set_int(session, sd);
        ret = gnutls_handshake(session);
        if (ret < 0) {

diff --git a/tests/rsa-psk.c b/tests/rsa-psk.c
index b86a9c6021cd0a2c68dc5f9f3d48ce01e0de6bbb..a0c8602525830d0c0ee469da770d5b7f9b2e8bff 100644 (file)
--- a/tests/rsa-psk.c
+++ b/tests/rsa-psk.c
@@ -101,7 +101,7 @@ static void client(int sd)
        gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE,
                                clientx509cred);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
        gnutls_transport_set_int(session, sd);
 
        /* Perform the TLS handshake
@@ -220,7 +220,7 @@ static void server(int sd)
        gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE,
                                serverx509cred);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
        gnutls_transport_set_int(session, sd);
        ret = gnutls_handshake(session);
        if (ret < 0) {

diff --git a/tests/server-sign-md5-rep.c b/tests/server-sign-md5-rep.c
index dd944b767ced56d0ab26599e8f3cc1cff2b8376e..3a44e087f50a4208ada08f52872e84bda845e95f 100644 (file)
--- a/tests/server-sign-md5-rep.c
+++ b/tests/server-sign-md5-rep.c
@@ -47,6 +47,7 @@ int main(int argc, char **argv)
 #include <unistd.h>
 #include <gnutls/gnutls.h>
 #include <signal.h>
+#include <limits.h>
 #include <poll.h>
 #include <errno.h>
 #include <assert.h>
@@ -93,6 +94,7 @@ static void client(int sd)
        char buf[1024];
        int ret;
        struct pollfd pfd;
+       unsigned int timeout;
 
        /* send a TLS 1.x hello advertising RSA-MD5 */
 
@@ -104,8 +106,12 @@ static void client(int sd)
        pfd.events = POLLIN;
        pfd.revents = 0;
 
+       timeout = get_timeout();
+       if (timeout > INT_MAX)
+               fail("invalid timeout value\n");
+
        do {
-               ret = poll(&pfd, 1, 10000);
+               ret = poll(&pfd, 1, (int)timeout);
        } while (ret == -1 && errno == EINTR);
 
        if (ret == -1 || ret == 0) {
@@ -158,7 +164,7 @@ static void server(int sd)
         * are adequate.
         */
        assert(gnutls_priority_set_direct(session, "NORMAL:-VERS-ALL:+VERS-TLS1.2:-RSA", NULL)>=0);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred);
 

diff --git a/tests/srp.c b/tests/srp.c
index 607e52ae46e7c23ff339fc588996291012fa1461..64eb52aaf22dfba9c5acd837c4752d4610ad4a6b 100644 (file)
--- a/tests/srp.c
+++ b/tests/srp.c
@@ -131,7 +131,7 @@ static void client(int fd, const char *prio, const char *user, const char *pass,
 
        /* Use default priorities */
        assert(gnutls_priority_set_direct(session, prio, NULL)>=0);
-       gnutls_handshake_set_timeout(session, 100 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        /* put the anonymous credentials to the current session
         */
@@ -229,7 +229,7 @@ static void server(int fd, const char *prio)
                                s_x509_cred);
 
        gnutls_transport_set_int(session, fd);
-       gnutls_handshake_set_timeout(session, 100 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        do {
                ret = gnutls_handshake(session);

diff --git a/tests/tls-client-with-seccomp.c b/tests/tls-client-with-seccomp.c
index 7577317bfd8c2036b7849215a100a45720dae9d8..53e8e972397d9ad1cba9f9c41d81e35c4cdfa664 100644 (file)
--- a/tests/tls-client-with-seccomp.c
+++ b/tests/tls-client-with-seccomp.c
@@ -89,7 +89,7 @@ static void client(int fd, const char *prio)
        /* Initialize TLS session
         */
        gnutls_init(&session, GNUTLS_CLIENT);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        /* Use default priorities */
        assert(gnutls_priority_set_direct(session,
@@ -189,7 +189,7 @@ static void server(int fd, const char *prio)
                exit(1);
 
        gnutls_init(&session, GNUTLS_SERVER);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        /* avoid calling all the priority functions, since the defaults
         * are adequate.

diff --git a/tests/tls-ext-not-in-dtls.c b/tests/tls-ext-not-in-dtls.c
index 4115b64b756aff542a96afee4a5af3160b8fba0d..b754d0301424ab315cc2e61efbfd5cdce34763d2 100644 (file)
--- a/tests/tls-ext-not-in-dtls.c
+++ b/tests/tls-ext-not-in-dtls.c
@@ -105,7 +105,7 @@ static void client(int fd, int type)
                assert(gnutls_session_ext_register(session, "explicit-tls", TLS_EXT_EXPL_TLS, GNUTLS_EXT_TLS, ext_recv, ext_send, NULL, NULL, NULL, GNUTLS_EXT_FLAG_CLIENT_HELLO|GNUTLS_EXT_FLAG_TLS12_SERVER_HELLO|GNUTLS_EXT_FLAG_TLS13_SERVER_HELLO|GNUTLS_EXT_FLAG_TLS)>=0);
        }
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        assert(gnutls_priority_set_direct(session, "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.3:+VERS-TLS1.2:+VERS-TLS1.0", NULL) >= 0);
 
@@ -209,7 +209,7 @@ static void server(int fd, int type)
 
        assert(gnutls_init(&session, GNUTLS_SERVER|GNUTLS_POST_HANDSHAKE_AUTH|GNUTLS_DATAGRAM) >= 0);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
        gnutls_handshake_set_hook_function(session, GNUTLS_HANDSHAKE_ANY,
                                           GNUTLS_HOOK_BOTH,
                                           hellos_callback);

diff --git a/tests/tls-ext-register.c b/tests/tls-ext-register.c
index 1eee4708569db816026170ef7ca9c5dd824c8f8e..cc548d506c1416e13e5dfe98382dead04f9397de 100644 (file)
--- a/tests/tls-ext-register.c
+++ b/tests/tls-ext-register.c
@@ -148,7 +148,7 @@ static void client(int sd, const char *prio)
                                clientx509cred);
 
        gnutls_transport_set_int(session, sd);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        /* Perform the TLS handshake
         */
@@ -259,7 +259,7 @@ static void server(int sd, const char *prio)
        assert(gnutls_ext_register("ext_server", TLSEXT_TYPE_SAMPLE, GNUTLS_EXT_TLS, ext_recv_server_params, ext_send_server_params, NULL, NULL, NULL)>=0);
 
        gnutls_transport_set_int(session, sd);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        ret = gnutls_handshake(session);
        if (ret < 0) {

diff --git a/tests/tls-force-etm.c b/tests/tls-force-etm.c
index 8dce6e9f34fb76d4fbe314ec1ef43448f88b2836..f30be1de32f5fc49e6c64891f3695ae46b54d1fe 100644 (file)
--- a/tests/tls-force-etm.c
+++ b/tests/tls-force-etm.c
@@ -85,7 +85,7 @@ static void client(int fd, const char *prio, unsigned etm, int eret)
        gnutls_certificate_allocate_credentials(&x509_cred);
 
        assert(gnutls_init(&session, GNUTLS_CLIENT)>=0);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        /* Use default priorities */
        assert(gnutls_priority_set_direct(session, prio, NULL)>=0);
@@ -200,7 +200,7 @@ static void server(int fd, const char *prio, unsigned etm, int eret)
        gnutls_anon_allocate_server_credentials(&anoncred);
 
        assert(gnutls_init(&session, GNUTLS_SERVER)>=0);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        /* avoid calling all the priority functions, since the defaults
         * are adequate.

diff --git a/tests/tls-pthread.c b/tests/tls-pthread.c
index 0d8eb27a51966ce74611348204824552e65612a4..2ac2da443ae4b591fda5d34520b3cc7222af6e32 100644 (file)
--- a/tests/tls-pthread.c
+++ b/tests/tls-pthread.c
@@ -230,7 +230,7 @@ static void client(int fd, const char *prio, unsigned flags)
                init_flags |= GNUTLS_ENABLE_FALSE_START;
 
        assert(gnutls_init(&session, init_flags) >= 0);
-       gnutls_handshake_set_timeout(session, 60 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        assert(gnutls_priority_set_direct(session, prio, NULL)>=0);
 
@@ -294,7 +294,7 @@ static void server(int fd, const char *prio, unsigned flags)
                init_flags |= GNUTLS_ENABLE_EARLY_START;
 
        assert(gnutls_init(&session, init_flags)>=0);
-       gnutls_handshake_set_timeout(session, 60 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        assert(gnutls_priority_set_direct(session, prio, NULL)>=0);
 

diff --git a/tests/tls-session-ext-override.c b/tests/tls-session-ext-override.c
index e83967c3286dfa24d7fe72e4c06a279ba17123d3..699e9a3e6f2bf6c0be9ea67f8efa7f77c54ba2ea 100644 (file)
--- a/tests/tls-session-ext-override.c
+++ b/tests/tls-session-ext-override.c
@@ -144,7 +144,7 @@ static void client(int sd)
                                clientx509cred);
 
        gnutls_transport_set_int(session, sd);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        ret = gnutls_session_ext_register(session, "ext_client", overridden_extension, GNUTLS_EXT_TLS, ext_recv_client_params, ext_send_client_params, NULL, NULL, NULL, 0);
        if (ret != GNUTLS_E_ALREADY_REGISTERED)
@@ -235,7 +235,7 @@ static void server(int sd)
                fail("client: register extension\n");
 
        gnutls_transport_set_int(session, sd);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        ret = gnutls_handshake(session);
        if (ret < 0) {

diff --git a/tests/tls-session-ext-register.c b/tests/tls-session-ext-register.c
index 6e44b9e60e69a1507011b463cb0aaef51827fd76..cac94cc4c759d12a3a87ca0a7d83cae192f10fa0 100644 (file)
--- a/tests/tls-session-ext-register.c
+++ b/tests/tls-session-ext-register.c
@@ -174,7 +174,7 @@ static void client(int sd, const char *name, const char *prio, unsigned flags, u
                                clientx509cred);
 
        gnutls_transport_set_int(session, sd);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        ret = gnutls_session_ext_register(session, "ext_ign", TLSEXT_TYPE_IGN, GNUTLS_EXT_TLS, ext_recv_client_ign_params, ext_send_client_ign_params, NULL, NULL, NULL, flags);
        if (ret < 0)
@@ -271,7 +271,7 @@ static void server(int sd, const char *name, const char *prio, unsigned flags, u
        assert(gnutls_session_ext_register(session, "ext_server", TLSEXT_TYPE_SAMPLE, GNUTLS_EXT_TLS, ext_recv_server_params, ext_send_server_params, NULL, NULL, NULL, flags) >= 0);
 
        gnutls_transport_set_int(session, sd);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        ret = gnutls_handshake(session);
        if (ret < 0) {

diff --git a/tests/tls-session-supplemental.c b/tests/tls-session-supplemental.c
index 718f11eb342b54073ed22b4056a33079fb4cdff5..9431346c41264311d19d793fd6adadead06c448e 100644 (file)
--- a/tests/tls-session-supplemental.c
+++ b/tests/tls-session-supplemental.c
@@ -133,7 +133,7 @@ static void client(int sd, const char *prio, unsigned server_only)
        /* Initialize TLS session
         */
        gnutls_init(&session, GNUTLS_CLIENT);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        assert(gnutls_priority_set_direct(session, prio, NULL) >= 0);
 
@@ -206,7 +206,7 @@ static void server(int sd, const char *prio, unsigned server_only)
                                            GNUTLS_X509_FMT_PEM);
 
        gnutls_init(&session, GNUTLS_SERVER);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        assert(gnutls_priority_set_direct(session, prio, NULL) >= 0);
 

diff --git a/tests/tls-with-seccomp.c b/tests/tls-with-seccomp.c
index 97b0dfb1bc85d9720f39834dc293ba647cb3101f..9aff7a95a355def249b62e339a903b65a436a205 100644 (file)
--- a/tests/tls-with-seccomp.c
+++ b/tests/tls-with-seccomp.c
@@ -84,7 +84,7 @@ static void client(int fd, const char *prio)
        /* Initialize TLS session
         */
        gnutls_init(&session, GNUTLS_CLIENT);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        assert(gnutls_priority_set_direct(session, prio, NULL) >= 0);
 
@@ -187,7 +187,7 @@ static void server(int fd, const char *prio)
        }
 
        gnutls_init(&session, GNUTLS_SERVER);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        assert(gnutls_priority_set_direct(session, prio, NULL) >= 0);
 

diff --git a/tests/tls12-rehandshake-cert-2.c b/tests/tls12-rehandshake-cert-2.c
index f21f2cbd33f1793bb2817f0df3c5d199654a5957..c1e3013ff1974456ef879d2c97a0b7665d2f0562 100644 (file)
--- a/tests/tls12-rehandshake-cert-2.c
+++ b/tests/tls12-rehandshake-cert-2.c
@@ -92,7 +92,7 @@ static void client(int fd, unsigned test)
        /* Initialize TLS session
         */
        gnutls_init(&session, GNUTLS_CLIENT);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        /* Use default priorities */
        gnutls_priority_set_direct(session, "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.1:+VERS-TLS1.2", NULL);
@@ -231,7 +231,7 @@ static void server(int fd, unsigned test)
        gnutls_anon_allocate_server_credentials(&anoncred);
 
        gnutls_init(&session, GNUTLS_SERVER);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        /* avoid calling all the priority functions, since the defaults
         * are adequate.

diff --git a/tests/tls12-rehandshake-cert-3.c b/tests/tls12-rehandshake-cert-3.c
index 5d609d882f67b0280ab24d3d0da709c912302b76..1d3d61fc9aa6d0ba18f43b01181487b2797f8fdb 100644 (file)
--- a/tests/tls12-rehandshake-cert-3.c
+++ b/tests/tls12-rehandshake-cert-3.c
@@ -94,7 +94,7 @@ static void client(int fd)
        /* Initialize TLS session
         */
        gnutls_init(&session, GNUTLS_CLIENT);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        /* Use default priorities */
        gnutls_priority_set_direct(session, "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2:+VERS-TLS1.1", NULL);
@@ -194,7 +194,7 @@ static void server(int fd)
                                            &server_key, GNUTLS_X509_FMT_PEM);
 
        gnutls_init(&session, GNUTLS_SERVER);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        /* avoid calling all the priority functions, since the defaults
         * are adequate.

diff --git a/tests/tls12-rehandshake-cert-auto.c b/tests/tls12-rehandshake-cert-auto.c
index 88975c9ed46ea40af9c0f060ce7d24c2ef9b98c1..f2c2b276fc35cebe2652e8b0f11742deaee1082d 100644 (file)
--- a/tests/tls12-rehandshake-cert-auto.c
+++ b/tests/tls12-rehandshake-cert-auto.c
@@ -91,7 +91,7 @@ static void client(int fd)
        /* Initialize TLS session
         */
        gnutls_init(&session, GNUTLS_CLIENT|GNUTLS_AUTO_REAUTH);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        /* Use default priorities */
        gnutls_priority_set_direct(session, "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.1:+VERS-TLS1.2", NULL);
@@ -172,7 +172,7 @@ static void server(int fd)
        gnutls_anon_allocate_server_credentials(&anoncred);
 
        gnutls_init(&session, GNUTLS_SERVER);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        /* avoid calling all the priority functions, since the defaults
         * are adequate.

diff --git a/tests/tls13-early-data-neg.c b/tests/tls13-early-data-neg.c
index d3a7c9e218e02dfc29322e4f47d6c077f282847e..075c21f4ceb83e9407ec7ff28af5fe9efc015b9c 100644 (file)
--- a/tests/tls13-early-data-neg.c
+++ b/tests/tls13-early-data-neg.c
@@ -161,7 +161,7 @@ static void client(int sds[])
 
                /* Perform the TLS handshake
                 */
-               gnutls_handshake_set_timeout(session, 20 * 1000);
+               gnutls_handshake_set_timeout(session, get_timeout());
                do {
                        ret = gnutls_handshake(session);
                }

diff --git a/tests/tls13-early-data.c b/tests/tls13-early-data.c
index 2115d70d5d5c71adb829295123f29e23d923d398..4235e12e2a3e75ceba2922be20562639d699a383 100644 (file)
--- a/tests/tls13-early-data.c
+++ b/tests/tls13-early-data.c
@@ -139,7 +139,7 @@ static void client(int sds[], const char *data, size_t size, size_t maxsize)
 
                /* Perform the TLS handshake
                 */
-               gnutls_handshake_set_timeout(session, 20 * 1000);
+               gnutls_handshake_set_timeout(session, get_timeout());
                do {
                        ret = gnutls_handshake(session);
                }

diff --git a/tests/tls13/change_cipher_spec.c b/tests/tls13/change_cipher_spec.c
index 70d769832aeda8baab042786a44486f56227aecf..81baa7683b3b9e02f3329ff25de76dbeaa0ff050 100644 (file)
--- a/tests/tls13/change_cipher_spec.c
+++ b/tests/tls13/change_cipher_spec.c
@@ -94,7 +94,7 @@ static void client(int fd, unsigned ccs_check)
        gnutls_init(&session, GNUTLS_CLIENT|GNUTLS_POST_HANDSHAKE_AUTH);
 
        gnutls_session_set_ptr(session, &ccs_check);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
        if (ccs_check) {
                gnutls_handshake_set_hook_function(session, GNUTLS_HANDSHAKE_ANY,
                                                   GNUTLS_HOOK_PRE,
@@ -243,7 +243,7 @@ static void server(int fd, unsigned ccs_check)
 
        gnutls_init(&session, GNUTLS_SERVER);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        if (ccs_check)
                gnutls_handshake_set_hook_function(session, GNUTLS_HANDSHAKE_CHANGE_CIPHER_SPEC,

diff --git a/tests/tls13/cookie.c b/tests/tls13/cookie.c
index aa4d07417887c3cb5af75a8331eaa854d1ac8d24..dde00af67388befaa52fbb22151645ab1c76b2f3 100644 (file)
--- a/tests/tls13/cookie.c
+++ b/tests/tls13/cookie.c
@@ -125,7 +125,7 @@ static void client(int sd)
                                clientx509cred);
 
        gnutls_transport_set_int(session, sd);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        /* Perform the TLS handshake
         */
@@ -191,7 +191,7 @@ static void server(int sd)
                fail("server: cannot register: %s", gnutls_strerror(ret));
 
        gnutls_transport_set_int(session, sd);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        ret = gnutls_handshake(session);
        if (ret < 0) {

diff --git a/tests/tls13/hello_random_value.c b/tests/tls13/hello_random_value.c
index 62bdde46d89b51ce6c4b2fb319541017008d0cbd..d91663c5a090f7af096c56b8216ce13504163bfc 100644 (file)
--- a/tests/tls13/hello_random_value.c
+++ b/tests/tls13/hello_random_value.c
@@ -132,7 +132,7 @@ static void client(int sd)
                                clientx509cred);
 
        gnutls_transport_set_int(session, sd);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
        gnutls_handshake_set_hook_function(session, GNUTLS_HANDSHAKE_ANY,
                                           GNUTLS_HOOK_BOTH, client_hello_callback);
 
@@ -198,7 +198,7 @@ static void server(int sd)
                                serverx509cred);
 
        gnutls_transport_set_int(session, sd);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        ret = gnutls_handshake(session);
        if (ret < 0) {

diff --git a/tests/tls13/hello_retry_request.c b/tests/tls13/hello_retry_request.c
index c0d270ca4180be0119e54e5f8686558d22a79025..f90d4ad6760c8f1c909cf5ed46ec3035cda1091d 100644 (file)
--- a/tests/tls13/hello_retry_request.c
+++ b/tests/tls13/hello_retry_request.c
@@ -115,7 +115,7 @@ static void client(int fd)
 
        assert(gnutls_init(&session, GNUTLS_CLIENT|GNUTLS_KEY_SHARE_TOP)>=0);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
        gnutls_session_set_ptr(session, &ctx);
 
        ret = gnutls_priority_set_direct(session, "NORMAL:-VERS-ALL:+VERS-TLS1.3:-GROUP-ALL:+GROUP-SECP256R1:+GROUP-X25519", NULL);
@@ -162,7 +162,7 @@ static void server(int fd)
 
        gnutls_init(&session, GNUTLS_SERVER);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        /* server only supports x25519, client advertises secp256r1 */
        assert(gnutls_priority_set_direct(session, "NORMAL:-VERS-ALL:+VERS-TLS1.3:-GROUP-ALL:+GROUP-X25519", NULL)>=0);

diff --git a/tests/tls13/hello_retry_request_resume.c b/tests/tls13/hello_retry_request_resume.c
index 6672bc7a9cd8ac8e49e519ca47d7d48ba7dbc926..f75ea53c60e9704444368538ff0b24049ddd1f80 100644 (file)
--- a/tests/tls13/hello_retry_request_resume.c
+++ b/tests/tls13/hello_retry_request_resume.c
@@ -109,7 +109,7 @@ static void client(int fd)
         */
        assert(gnutls_init(&session, GNUTLS_CLIENT)>=0);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        ret = gnutls_priority_set_direct(session, "NORMAL:-VERS-ALL:+VERS-TLS1.3:-GROUP-ALL:+GROUP-SECP256R1:+GROUP-X25519", NULL);
        if (ret < 0)
@@ -210,7 +210,7 @@ static void server(int fd)
        assert(gnutls_init(&session, GNUTLS_SERVER)>=0);
 
        assert(gnutls_session_ticket_enable_server(session, &skey) >= 0);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        /* server only supports x25519, client advertises secp256r1 */
        assert(gnutls_priority_set_direct(session, "NORMAL:-VERS-ALL:+VERS-TLS1.3:-GROUP-ALL:+GROUP-X25519", NULL)>=0);

diff --git a/tests/tls13/key_share.c b/tests/tls13/key_share.c
index 6f8b1e929315f3e0be9d6fd16459d782b323ff30..7f8f6295cea3fb47f5f2fad80ccbdaec706dc605 100644 (file)
--- a/tests/tls13/key_share.c
+++ b/tests/tls13/key_share.c
@@ -92,7 +92,7 @@ static void client(int fd, unsigned flag, const char *prio)
         */
        gnutls_init(&session, GNUTLS_CLIENT|flag);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        ret = gnutls_priority_set_direct(session, prio, NULL);
        if (ret < 0)
@@ -215,7 +215,7 @@ static void server(int fd, gnutls_group_t exp_group, unsigned ngroups)
 
        gnutls_init(&session, GNUTLS_SERVER);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
        gnutls_handshake_set_hook_function(session, GNUTLS_HANDSHAKE_ANY,
                                           GNUTLS_HOOK_BOTH,
                                           client_hello_callback);

diff --git a/tests/tls13/no-auto-send-ticket.c b/tests/tls13/no-auto-send-ticket.c
index 7c52cd916fbef4eab2df9297781adbdebb19bb81..64facf79de1a02901302c115f45a2c99be015a14 100644 (file)
--- a/tests/tls13/no-auto-send-ticket.c
+++ b/tests/tls13/no-auto-send-ticket.c
@@ -112,7 +112,7 @@ static void client(int fd, unsigned flags, unsigned tickets)
         */
        assert(gnutls_init(&session, GNUTLS_CLIENT|flags)>=0);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        ret = gnutls_priority_set_direct(session, "NORMAL:-VERS-ALL:+VERS-TLS1.3:+VERS-TLS1.2:+VERS-TLS1.0", NULL);
        if (ret < 0)
@@ -195,7 +195,7 @@ static void server(int fd, unsigned flags,
        assert(gnutls_init(&session, GNUTLS_SERVER|flags)>=0);
 
        assert(gnutls_session_ticket_enable_server(session, &skey) >= 0);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        assert(gnutls_priority_set_direct(session, "NORMAL:+VERS-TLS1.3", NULL)>=0);
 
@@ -227,7 +227,7 @@ static void server(int fd, unsigned flags,
                assert(gnutls_init(&session, GNUTLS_SERVER|flags)>=0);
 
                assert(gnutls_session_ticket_enable_server(session, &skey) >= 0);
-               gnutls_handshake_set_timeout(session, 20 * 1000);
+               gnutls_handshake_set_timeout(session, get_timeout());
                assert(gnutls_priority_set_direct(session, "NORMAL:+VERS-TLS1.3", NULL)>=0);
 
                gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred);

diff --git a/tests/tls13/no-psk-exts.c b/tests/tls13/no-psk-exts.c
index e26beeef2c4cacfeaf36b623af39af3365ad5b33..f11d15ec1e8d2a243f6277d58d29d2631be20236 100644 (file)
--- a/tests/tls13/no-psk-exts.c
+++ b/tests/tls13/no-psk-exts.c
@@ -86,7 +86,7 @@ static void client(int fd)
         */
        gnutls_init(&session, GNUTLS_CLIENT|GNUTLS_NO_TICKETS);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        ret = gnutls_priority_set_direct(session, "NORMAL:-VERS-ALL:+VERS-TLS1.3:+VERS-TLS1.2:+VERS-TLS1.0", NULL);
        if (ret < 0)
@@ -177,7 +177,7 @@ static void server(int fd)
 
        gnutls_init(&session, GNUTLS_SERVER);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
        gnutls_handshake_set_hook_function(session, GNUTLS_HANDSHAKE_ANY,
                                           GNUTLS_HOOK_BOTH,
                                           hellos_callback);

diff --git a/tests/tls13/post-handshake-with-cert-auto.c b/tests/tls13/post-handshake-with-cert-auto.c
index ed6776b0f0bd021229ef8cf35c9c1d72eb5a1261..8d3c4e8252f9c4869a427d26fddc5fb99d3f4e45 100644 (file)
--- a/tests/tls13/post-handshake-with-cert-auto.c
+++ b/tests/tls13/post-handshake-with-cert-auto.c
@@ -93,7 +93,7 @@ static void client(int fd, unsigned send_cert, unsigned max_auths)
         */
        assert(gnutls_init(&session, GNUTLS_CLIENT|GNUTLS_POST_HANDSHAKE_AUTH|GNUTLS_AUTO_REAUTH)>=0);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        ret = gnutls_priority_set_direct(session, "NORMAL:-VERS-ALL:+VERS-TLS1.3:+VERS-TLS1.2:+VERS-TLS1.0", NULL);
        if (ret < 0)
@@ -212,7 +212,7 @@ static void server(int fd, int err, int type, unsigned max_auths)
 
        gnutls_init(&session, GNUTLS_SERVER|GNUTLS_POST_HANDSHAKE_AUTH);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
        gnutls_handshake_set_hook_function(session, GNUTLS_HANDSHAKE_ANY,
                                           GNUTLS_HOOK_BOTH,
                                           hellos_callback);

diff --git a/tests/tls13/post-handshake-with-cert-pkcs11.c b/tests/tls13/post-handshake-with-cert-pkcs11.c
index 01aa2d08a7ff60f0c6cf28a0147fd4cab8de844d..faf901dbed5099130fc257d5cdedb719e02e7dce 100644 (file)
--- a/tests/tls13/post-handshake-with-cert-pkcs11.c
+++ b/tests/tls13/post-handshake-with-cert-pkcs11.c
@@ -209,7 +209,7 @@ static void client(int fd, int err)
         */
        assert(gnutls_init(&session, GNUTLS_CLIENT|GNUTLS_POST_HANDSHAKE_AUTH|GNUTLS_AUTO_REAUTH)>=0);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        ret = gnutls_priority_set_direct(session, "NORMAL:-VERS-ALL:+VERS-TLS1.3:-SIGN-RSA-SHA256", NULL);
        if (ret < 0)
@@ -329,7 +329,7 @@ static void server(int fd, int err, int type)
 
        gnutls_init(&session, GNUTLS_SERVER|GNUTLS_POST_HANDSHAKE_AUTH);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
        gnutls_handshake_set_hook_function(session, GNUTLS_HANDSHAKE_ANY,
                                           GNUTLS_HOOK_BOTH,
                                           hellos_callback);

diff --git a/tests/tls13/post-handshake-with-cert-ticket.c b/tests/tls13/post-handshake-with-cert-ticket.c
index bcf331e0f08c98d7ab5aaa75797d919adef87f18..b19720fa769600a1e5ca12bf1f2668cf72564c42 100644 (file)
--- a/tests/tls13/post-handshake-with-cert-ticket.c
+++ b/tests/tls13/post-handshake-with-cert-ticket.c
@@ -119,7 +119,7 @@ static void client(int fd, unsigned tickets)
         */
        assert(gnutls_init(&session, GNUTLS_CLIENT|GNUTLS_POST_HANDSHAKE_AUTH)>=0);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        ret = gnutls_priority_set_direct(session, "NORMAL:-VERS-ALL:+VERS-TLS1.3:+VERS-TLS1.2:+VERS-TLS1.0", NULL);
        if (ret < 0)
@@ -246,7 +246,7 @@ static void server(int fd, unsigned tickets)
        assert(gnutls_init(&session, GNUTLS_SERVER|GNUTLS_POST_HANDSHAKE_AUTH)>=0);
 
        assert(gnutls_session_ticket_enable_server(session, &skey) >= 0);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        assert(gnutls_priority_set_direct(session, "NORMAL:+VERS-TLS1.3", NULL)>=0);
 
@@ -292,7 +292,7 @@ static void server(int fd, unsigned tickets)
        assert(gnutls_init(&session, GNUTLS_SERVER|GNUTLS_POST_HANDSHAKE_AUTH)>=0);
 
        assert(gnutls_session_ticket_enable_server(session, &skey) >= 0);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
        assert(gnutls_priority_set_direct(session, "NORMAL:+VERS-TLS1.3", NULL)>=0);
 
        gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred);

diff --git a/tests/tls13/post-handshake-with-cert.c b/tests/tls13/post-handshake-with-cert.c
index 72863e38a503f68df128a5ddbf69a1ecc85d6160..54159913dc256eb9c965f0dbc4783c30273abfab 100644 (file)
--- a/tests/tls13/post-handshake-with-cert.c
+++ b/tests/tls13/post-handshake-with-cert.c
@@ -93,7 +93,7 @@ static void client(int fd, unsigned send_cert, unsigned max_auths)
         */
        assert(gnutls_init(&session, GNUTLS_CLIENT|GNUTLS_POST_HANDSHAKE_AUTH)>=0);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        ret = gnutls_priority_set_direct(session, "NORMAL:-VERS-ALL:+VERS-TLS1.3:+VERS-TLS1.2:+VERS-TLS1.0", NULL);
        if (ret < 0)
@@ -228,7 +228,7 @@ static void server(int fd, int err, int type, unsigned max_auths)
 
        gnutls_init(&session, GNUTLS_SERVER|GNUTLS_POST_HANDSHAKE_AUTH);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
        gnutls_handshake_set_hook_function(session, GNUTLS_HANDSHAKE_ANY,
                                           GNUTLS_HOOK_BOTH,
                                           hellos_callback);

diff --git a/tests/tls13/post-handshake-with-psk.c b/tests/tls13/post-handshake-with-psk.c
index d11512928efb79feccf353314f2ec2fe98d9e945..8921bbd00b7f20bceebcb6cf991792d4e316b3bc 100644 (file)
--- a/tests/tls13/post-handshake-with-psk.c
+++ b/tests/tls13/post-handshake-with-psk.c
@@ -95,7 +95,7 @@ static void client(int fd, unsigned send_cert, unsigned max_auths)
         */
        assert(gnutls_init(&session, GNUTLS_CLIENT|GNUTLS_POST_HANDSHAKE_AUTH)>=0);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        ret = gnutls_priority_set_direct(session, "NORMAL:-VERS-ALL:+VERS-TLS1.3:+VERS-TLS1.2:+VERS-TLS1.0:+ECDHE-PSK:+PSK", NULL);
        if (ret < 0)
@@ -242,7 +242,7 @@ static void server(int fd, int err, int type, unsigned max_auths)
 
        assert(gnutls_init(&session, GNUTLS_SERVER|GNUTLS_POST_HANDSHAKE_AUTH)>=0);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
        gnutls_handshake_set_hook_function(session, GNUTLS_HANDSHAKE_ANY,
                                           GNUTLS_HOOK_BOTH,
                                           hellos_callback);

diff --git a/tests/tls13/post-handshake-without-cert.c b/tests/tls13/post-handshake-without-cert.c
index 130b55b5b56d598b203a36b72ab8147e14399c2a..cd3545e4e4c02b3201ba68d6e49649864cc26e42 100644 (file)
--- a/tests/tls13/post-handshake-without-cert.c
+++ b/tests/tls13/post-handshake-without-cert.c
@@ -90,7 +90,7 @@ static void client(int fd)
         */
        gnutls_init(&session, GNUTLS_CLIENT);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        ret = gnutls_priority_set_direct(session, "NORMAL:-VERS-ALL:+VERS-TLS1.3:+VERS-TLS1.2:+VERS-TLS1.0", NULL);
        if (ret < 0)
@@ -172,7 +172,7 @@ static void server(int fd)
 
        gnutls_init(&session, GNUTLS_SERVER);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
        gnutls_handshake_set_hook_function(session, GNUTLS_HANDSHAKE_ANY,
                                           GNUTLS_HOOK_BOTH,
                                           hellos_callback);

diff --git a/tests/tls13/rnd-check-rollback-val.c b/tests/tls13/rnd-check-rollback-val.c
index 72399208a9dfc2d13157fda004db5de3b1c265eb..ea61728d4a4a33a0bb766cbe6d0c53110f981337 100644 (file)
--- a/tests/tls13/rnd-check-rollback-val.c
+++ b/tests/tls13/rnd-check-rollback-val.c
@@ -109,7 +109,7 @@ static void client(int fd)
         */
        gnutls_init(&session, GNUTLS_CLIENT);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        ret = gnutls_priority_set_direct(session, PRIO, NULL);
        if (ret < 0)
@@ -212,7 +212,7 @@ static void server(int fd)
  retry:
        gnutls_init(&session, GNUTLS_SERVER);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        assert(gnutls_priority_set_direct(session, "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.3:+VERS-TLS1.2:+VERS-TLS1.1:+VERS-TLS1.0", NULL)>=0);
 

diff --git a/tests/tls13/rnd-rollback-detection.c b/tests/tls13/rnd-rollback-detection.c
index b66c91643213d916d3890e5f6e34e8aeb08a98eb..d64daa0c3cf8d08ee39b3ba520455fc49e0481cb 100644 (file)
--- a/tests/tls13/rnd-rollback-detection.c
+++ b/tests/tls13/rnd-rollback-detection.c
@@ -88,7 +88,7 @@ static void client(int fd)
         */
        gnutls_init(&session, GNUTLS_CLIENT);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        ret = gnutls_priority_set_direct(session, "NORMAL:-VERS-ALL:+VERS-TLS1.3:+VERS-TLS1.2:+VERS-TLS1.1:+VERS-TLS1.0", NULL);
        if (ret < 0)
@@ -164,7 +164,7 @@ static void server(int fd)
 
        gnutls_init(&session, GNUTLS_SERVER);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
        gnutls_handshake_set_random(session, &RND);
 
        assert(gnutls_priority_set_direct(session, PRIO, NULL)>=0);

diff --git a/tests/tls13/supported_versions.c b/tests/tls13/supported_versions.c
index 5917fd8d50743b922f3fd09ed5695670ec9b7347..7d14eeb77a59c652aa627a593394210cce879b76 100644 (file)
--- a/tests/tls13/supported_versions.c
+++ b/tests/tls13/supported_versions.c
@@ -87,7 +87,7 @@ static void client(int fd)
         */
        gnutls_init(&session, GNUTLS_CLIENT);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        ret = gnutls_priority_set_direct(session, "NORMAL:-VERS-ALL:+VERS-TLS1.3:+VERS-TLS1.2:+VERS-TLS1.0", NULL);
        if (ret < 0)
@@ -267,7 +267,7 @@ static void server(int fd)
 
        gnutls_init(&session, GNUTLS_SERVER);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
        gnutls_handshake_set_hook_function(session, GNUTLS_HANDSHAKE_ANY,
                                           GNUTLS_HOOK_BOTH,
                                           client_hello_callback);

diff --git a/tests/tls13/tls12-no-tls13-exts.c b/tests/tls13/tls12-no-tls13-exts.c
index 36fae5b2be47579f8b545f940c486f82dc87d6cc..03d32714732f49f524013382e0347cff5b4990c1 100644 (file)
--- a/tests/tls13/tls12-no-tls13-exts.c
+++ b/tests/tls13/tls12-no-tls13-exts.c
@@ -89,7 +89,7 @@ static void client(int fd)
         */
        gnutls_init(&session, GNUTLS_CLIENT);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        ret = gnutls_priority_set_direct(session, "NORMAL:-VERS-ALL:+VERS-TLS1.2:+VERS-TLS1.0", NULL);
        if (ret < 0)
@@ -160,7 +160,7 @@ static void server(int fd)
 
        gnutls_init(&session, GNUTLS_SERVER);
 
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
        gnutls_handshake_set_hook_function(session, GNUTLS_HANDSHAKE_ANY,
                                           GNUTLS_HOOK_BOTH,
                                           client_hello_callback);

diff --git a/tests/tls_hello_random_value.c b/tests/tls_hello_random_value.c
index 8841d2e2ccb9cd2f6f122cd04c313c59e9bf091d..4410000a4ccd666122c32ed296db3d357180a789 100644 (file)
--- a/tests/tls_hello_random_value.c
+++ b/tests/tls_hello_random_value.c
@@ -138,7 +138,7 @@ static void client(int sd, const char *priority)
                                clientx509cred);
 
        gnutls_transport_set_int(session, sd);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        gnutls_handshake_set_hook_function(session, GNUTLS_HANDSHAKE_ANY,
                                           GNUTLS_HOOK_BOTH, hello_callback);
@@ -194,7 +194,7 @@ static void server(int sd, const char *priority)
                                serverx509cred);
 
        gnutls_transport_set_int(session, sd);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        ret = gnutls_handshake(session);
        if (ret < 0) {

diff --git a/tests/tlsext-decoding.c b/tests/tlsext-decoding.c
index a397ee55fba3fac23260a6660f750a92ee45d6d8..b0734b4b11854ae75e38480641ad0e92858f163e 100644 (file)
--- a/tests/tlsext-decoding.c
+++ b/tests/tlsext-decoding.c
@@ -137,7 +137,7 @@ static void client(int fd, const char *prio)
        /* Initialize TLS session
         */
        gnutls_init(&session, GNUTLS_CLIENT);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        assert(gnutls_priority_set_direct(session, prio, NULL) >= 0);
 
@@ -204,7 +204,7 @@ static void server(int fd, const char *prio)
                exit(1);
 
        gnutls_init(&session, GNUTLS_SERVER);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        /* avoid calling all the priority functions, since the defaults
         * are adequate.

diff --git a/tests/utils.h b/tests/utils.h
index 935368088a0dbfa175bc510fe5b61ce731ef523f..bc8d0c6d3e12c459f9082db96340c2058d9c4d00 100644 (file)
--- a/tests/utils.h
+++ b/tests/utils.h
@@ -23,6 +23,8 @@
 #ifndef GNUTLS_TESTS_UTILS_H
 #define GNUTLS_TESTS_UTILS_H
 
+#include <assert.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
@@ -177,4 +179,32 @@ inline static void check_wait_status_for_sig(int status)
        _check_wait_status(status, 1);
 }
 
+inline static unsigned int get_timeout(void) {
+       const char *envvar;
+       unsigned long int ul;
+
+       envvar = getenv("GNUTLS_TEST_TIMEOUT");
+       if (!envvar || *envvar == '\0')
+               return 20 * 1000;
+
+       ul = strtoul(envvar, NULL, 10);
+       assert(ul <= UINT_MAX);
+
+       return (unsigned int) ul;
+}
+
+inline static unsigned int get_dtls_retransmit_timeout(void) {
+       const char *envvar;
+       unsigned long int ul;
+
+       envvar = getenv("GNUTLS_TEST_DTLS_RETRANSMIT_TIMEOUT");
+       if (!envvar || *envvar == '\0')
+               return get_timeout() / 10;
+
+       ul = strtoul(envvar, NULL, 10);
+       assert(ul <= UINT_MAX);
+
+       return (unsigned int) ul;
+}
+
 #endif /* GNUTLS_TESTS_UTILS_H */

diff --git a/tests/x509dn.c b/tests/x509dn.c
index 056351c19d4a499a53bb0d49fa073794beb31ca2..2ca592f109abea31cc58f232f9448dddc9df41dc 100644 (file)
--- a/tests/x509dn.c
+++ b/tests/x509dn.c
@@ -270,7 +270,7 @@ static void server(int sd, const char *prio)
                                              GNUTLS_CERT_REQUEST);
 
        gnutls_transport_set_int(session, sd);
-       gnutls_handshake_set_timeout(session, 20 * 1000);
+       gnutls_handshake_set_timeout(session, get_timeout());
 
        ret = gnutls_handshake(session);
        if (ret < 0) {