From: Daiki Ueno <ueno@gnu.org>
Date: Mon, 20 Dec 2021 08:28:10 +0000 (+0100)
Subject: tls-fuzzer: prolong timeout for FFDHE tests
X-Git-Tag: 3.7.4~24^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45bb90e9057ca9e4f36dc0fb26caa23b527d751b;p=thirdparty%2Fgnutls.git

tls-fuzzer: prolong timeout for FFDHE tests

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

diff --git a/tests/suite/tls-fuzzer/gnutls-nocert-tls13.json b/tests/suite/tls-fuzzer/gnutls-nocert-tls13.json
index 3b6404c045..4166ef8fdc 100644
--- a/tests/suite/tls-fuzzer/gnutls-nocert-tls13.json
+++ b/tests/suite/tls-fuzzer/gnutls-nocert-tls13.json
@@ -68,9 +68,11 @@
 			"-e", "ffdhe3072 - duplicated key share entry",
 			"-e", "ffdhe4096 - duplicated key share entry",
 			"-e", "ffdhe6144 - duplicated key share entry",
-			"-e", "ffdhe8192 - duplicated key share entry"]},
+			"-e", "ffdhe8192 - duplicated key share entry",
+                        "-t", "180"]},
 	 {"name" : "test-tls13-ffdhe-sanity.py",
-	  "arguments": ["-p", "@PORT@"]},
+	  "arguments": ["-p", "@PORT@",
+                        "-t", "180"]},
 	 {"name" : "test-tls13-finished.py",
 	  "comment" : "the disabled tests timeout very often due to slow tls-fuzzer implementation",
 	  "arguments": ["-p", "@PORT@", "-n", "5",
diff --git a/tests/suite/tls-fuzzer/gnutls-nocert.json b/tests/suite/tls-fuzzer/gnutls-nocert.json
index 2a6f47d68d..d74a756f29 100644
--- a/tests/suite/tls-fuzzer/gnutls-nocert.json
+++ b/tests/suite/tls-fuzzer/gnutls-nocert.json
@@ -100,7 +100,8 @@
 	  "comment" : ["we don't prefer DHE over RSA if RSA is preferred by peer"],
 	  "arguments" : ["-p", "@PORT@",
                          "-e", "Check if DHE preferred",
-                         "--alert", "handshake_failure"]},
+                         "--alert", "handshake_failure",
+                         "-t", "180"]},
          {"name" : "test-cve-2016-2107.py",
           "arguments" : ["-p", "@PORT@"] },
          {"name" : "test-dhe-key-share-random.py",
diff --git a/tests/suite/tls-fuzzer/tlsfuzzer b/tests/suite/tls-fuzzer/tlsfuzzer
index 27b48ab9c5..4216d2ca4b 160000
--- a/tests/suite/tls-fuzzer/tlsfuzzer
+++ b/tests/suite/tls-fuzzer/tlsfuzzer
@@ -1 +1 @@
-Subproject commit 27b48ab9c5ce9554c32324cd9813e4b95ff74075
+Subproject commit 4216d2ca4b017a893cc7681c2baa1635dbdf3f0f