tests/suite/tls-fuzzer: remove most of the -n limiters...

... since tlsfuzzer now sets reasonable (~<10s/script) limits
for most of the scripts by default

Signed-off-by: Alexander Sosedkin <asosedkin@redhat.com>

diff --git a/tests/suite/tls-fuzzer/gnutls-cert.json b/tests/suite/tls-fuzzer/gnutls-cert.json
index e49cb432ff6f02bbfbfef19ddca251d0df77476b..b43e686f4d2fb4e17a7e82e634ccca6d738b52e2 100644 (file)
--- a/tests/suite/tls-fuzzer/gnutls-cert.json
+++ b/tests/suite/tls-fuzzer/gnutls-cert.json
@@ -15,7 +15,6 @@
           "comment" : "tlsfuzzer doesn't like our set of algorithms (e.g., ed25519)",
           "arguments" : ["-k", "tests/clientX509Key.pem",
                          "-c", "tests/clientX509Cert.pem",
-                         "-n", "10",
                          "-e", "check sigalgs in cert request",
                         "-p", "@PORT@"]},
         {"name" : "test-tls13-ecdsa-in-certificate-verify.py",
@@ -24,7 +23,6 @@
           "comment" : "tlsfuzzer doesn't like our set of algorithms (e.g., ed25519)",
           "arguments" : ["-k", "tests/serverECKey.pem",
                          "-c", "tests/serverECCert.pem",
-                         "-n", "10",
                          "-e", "check sigalgs in cert request",
                         "-p", "@PORT@"]},
          {"name": "test-rsa-sigs-on-certificate-verify.py",
@@ -73,7 +71,6 @@
                          "-c", "tests/clientX509Cert.pem",
                          "-e", "check CertificateRequest sigalgs",
                          "--illegpar",
-                         "-n", "100",
                          "-p", "@PORT@"]
           },
          {"name" : "test-rsa-pss-sigs-on-certificate-verify.py",
@@ -82,7 +79,6 @@
                          "-c", "tests/clientRSAPSSCert.pem",
                          "-e", "check CertificateRequest sigalgs",
                          "--illegpar",
-                         "-n", "100",
                          "-p", "@PORT@"]
           },
          {"name": "test-certificate-malformed.py",

diff --git a/tests/suite/tls-fuzzer/gnutls-nocert-tls13.json b/tests/suite/tls-fuzzer/gnutls-nocert-tls13.json
index a85fd950026c05e130d09ed86bcff072adb721f8..5502fd569bda79a709b7a702b18ba0df66d1b6da 100644 (file)
--- a/tests/suite/tls-fuzzer/gnutls-nocert-tls13.json
+++ b/tests/suite/tls-fuzzer/gnutls-nocert-tls13.json
@@ -55,8 +55,7 @@
         {"name" : "test-tls13-count-tickets.py",
          "arguments": ["-p", "@PORT@", "-t", "2"]},
         {"name" : "test-tls13-dhe-shared-secret-padding.py",
-         "arguments": ["-p", "@PORT@",
-                       "-n", "4"]},
+         "arguments": ["-p", "@PORT@"]},
         {"name" : "test-tls13-ecdhe-curves.py",
          "arguments": ["-p", "@PORT@"]},
         {"name" : "test-tls13-ecdsa-support.py",
@@ -82,24 +81,27 @@
                        "-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",
+         "arguments": ["-p", "@PORT@",
                        "-e", "padding - cipher TLS_AES_128_GCM_SHA256, pad_byte 0, pad_left 0, pad_right 16777183",
                        "-e", "padding - cipher TLS_AES_256_GCM_SHA384, pad_byte 0, pad_left 0, pad_right 16777167"]},
         {"name" : "test-tls13-hrr.py",
          "arguments": ["-p", "@PORT@"]},
         {"name" : "test-tls13-invalid-ciphers.py",
-         "arguments": ["-p", "@PORT@",
-                       "-n", "5"]},
+         "arguments": ["-p", "@PORT@"]},
         {"name" : "test-tls13-keyshare-omitted.py",
          "arguments": ["-p", "@PORT@"]},
         {"name" : "test-tls13-keyupdate.py",
          "comment" : "we have limits that prohibit the running multiple messages test; app data split timeouts waiting for new session ticket",
-         "arguments": ["-p", "@PORT@", "-n", "5",
+         "arguments": ["-p", "@PORT@",
                        "-e", "app data split, conversation with KeyUpdate msg",
                        "-e", "multiple KeyUpdate messages"]},
         {"name" : "test-tls13-large-number-of-extensions.py",
          "comment" : "This test assumes that 22 (EtM) is unassigned which is incorrect - see #632",
-         "arguments": ["-p", "@PORT@", "-n", "5"]},
+         "arguments": ["-p", "@PORT@",
+                       "--exc", "11",
+                       "--exc", "12",
+                       "--exc", "22",
+                       "--exc", "23"]},
         {"name" : "test-tls13-legacy-version.py",
          "arguments": ["-p", "@PORT@"]},
         {"name" : "test-tls13-nociphers.py",
@@ -118,8 +120,7 @@
         {"name" : "test-tls13-session-resumption.py",
          "arguments": ["-p", "@PORT@"]},
         {"name" : "test-tls13-serverhello-random.py",
-         "arguments": ["-p", "@PORT@",
-                       "-n", "5"]},
+         "arguments": ["-p", "@PORT@"]},
         {"name" : "test-tls13-signature-algorithms.py",
           "comment" : "gnutls doesn't handle well duplicated signature algorithms; this is not an issue in practice",
          "arguments": ["-p", "@PORT@",
@@ -134,8 +135,7 @@
                        "-x", "32715 invalid schemes",
                        "-X", "Unexpected message from peer: Alert(fatal, handshake_failure)"]},
         {"name" : "test-tls13-symetric-ciphers.py",
-         "arguments": ["-p", "@PORT@",
-                       "-n", "5"]},
+         "arguments": ["-p", "@PORT@"]},
         {"name" : "test-tls13-unrecognised-groups.py",
          "arguments": ["-p", "@PORT@"]},
         {"name" : "test-tls13-version-negotiation.py",

diff --git a/tests/suite/tls-fuzzer/gnutls-nocert.json b/tests/suite/tls-fuzzer/gnutls-nocert.json
index 98237e7a18be2bea9068e31150977025ef4edac9..3be1928737c2d84a39dcd96dd78a81caa3049574 100644 (file)
--- a/tests/suite/tls-fuzzer/gnutls-nocert.json
+++ b/tests/suite/tls-fuzzer/gnutls-nocert.json
@@ -17,8 +17,7 @@
      "server_port": @PORT@,
      "tests" : [
          {"name" : "test-fuzzed-plaintext.py",
-          "arguments" : ["-p", "@PORT@",
-                         "-n", "4"] },
+          "arguments" : ["-p", "@PORT@"] },
          {"name" : "test-large-hello.py",
           "arguments" : [
           "-p", "@PORT@",
@@ -71,8 +70,7 @@
          {"name" : "test-atypical-padding.py",
           "arguments" : ["-p", "@PORT@"] },
          {"name" : "test-bleichenbacher-workaround.py",
-          "arguments" : ["-p", "@PORT@",
-                         "-n", "5"]
+          "arguments" : ["-p", "@PORT@", "-n", "5"]
          },
          {"name" : "test-clienthello-md5.py",
           "arguments" : ["-p", "@PORT@"] },
@@ -115,7 +113,6 @@
                          "-X", "Unexpected message from peer: Alert(fatal, protocol_version)",
                          "-x", "Protocol (3, 0) in SSLv2 compatible ClientHello",
                          "-X", "Unexpected message from peer: Alert(fatal, protocol_version)",
-                         "-n", "5",
                          "-z"]},
          {"name" : "test-dhe-rsa-key-exchange.py",
           "arguments" : ["-p", "@PORT@"] },
@@ -143,8 +140,7 @@
                          "-X", "Unexpected message from peer: Alert(fatal, protocol_version)",
                          "-x", "Protocol (3, 0)",
                          "-X", "Unexpected message from peer: Alert(fatal, protocol_version)",
-                         "-z",
-                         "-n", "5"]},
+                         "-z"]},
          {"name" : "test-ecdhe-rsa-key-exchange.py",
           "arguments" : ["-p", "@PORT@"] },
          {"name" : "test-ecdhe-rsa-key-exchange-with-bad-messages.py",
@@ -153,8 +149,7 @@
           "arguments" : ["-p", "@PORT@",
                          "-e", "Protocol (3, 0) in SSLv2 compatible ClientHello",
                          "-e", "Protocol (3, 0)",
-                         "-z",
-                         "-n", "5"]},
+                         "-z"]},
          {"name" : "test-empty-extensions.py",
           "arguments" : ["-p", "@PORT@"] },
          {"name" : "test-export-ciphers-rejected.py",
@@ -213,8 +208,7 @@
          {"name" : "test-invalid-client-hello.py",
           "arguments" : ["-p", "@PORT@"] },
          {"name" : "test-invalid-client-hello-w-record-overflow.py",
-          "arguments" : ["-p", "@PORT@",
-                         "-n", "10"] },
+          "arguments" : ["-p", "@PORT@"] },
          {"name" : "test-invalid-compression-methods.py",
           "arguments" : ["-p", "@PORT@"] },
          {"name" : "test-invalid-content-type.py",
@@ -277,8 +271,7 @@
           "arguments" : ["-p", "@PORT@",
                          "-e", "Protocol (3, 0) in SSLv2 compatible ClientHello",
                          "-e", "Protocol (3, 0)",
-                         "-z",
-                         "-n", "6"]},
+                         "-z"]},
          {"name" : "test-sig-algs.py",
           "arguments" : ["-p", "@PORT@",
                          "-x", "rsa_pss_pss_sha256 only",