tlsfuzzer: updated to include RSA and RSA-PSS related tests

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

diff --git a/tests/suite/tls-fuzzer/gnutls-nocert-tls13.json b/tests/suite/tls-fuzzer/gnutls-nocert-tls13.json
index 8c73c904ce79eb3716c26bbd365f43812a540cc2..89c8853c68a10be68a5771de30823cf61b1036e0 100644 (file)
--- a/tests/suite/tls-fuzzer/gnutls-nocert-tls13.json
+++ b/tests/suite/tls-fuzzer/gnutls-nocert-tls13.json
@@ -2,6 +2,8 @@
     {"server_command": ["@SERVER@", "--http",
                  "--x509keyfile", "tests/serverX509Key.pem",
                  "--x509certfile", "tests/serverX509Cert.pem",
+                 "--x509keyfile", "tests/serverRSAPSSKey.pem",
+                 "--x509certfile", "tests/serverRSAPSSCert.pem",
                  "--x509keyfile", "../../../certs/ecc256.pem",
                  "--x509certfile", "../../../certs/cert-ecc256.pem",
                  "--debug=3",
@@ -10,6 +12,20 @@
      "server_hostname": "localhost",
      "server_port": @PORT@,
      "tests" : [
+        {"name" : "test-tls13-legacy-version.py",
+         "arguments": ["-p", "@PORT@"]},
+        {"name" : "test-tls13-empty-alert.py",
+         "arguments": ["-p", "@PORT@"]},
+        {"name" : "test-tls13-hrr.py",
+         "arguments": ["-p", "@PORT@"]},
+        {"name" : "test-tls13-nociphers.py",
+         "arguments": ["-p", "@PORT@"]},
+        {"name" : "test-tls13-pkcs-signature.py",
+         "arguments": ["-p", "@PORT@"]},
+        {"name" : "test-tls13-rsa-signatures.py",
+         "arguments": ["-p", "@PORT@", "-b"]},
+        {"name" : "test-tls13-rsapss-signatures.py",
+         "arguments": ["-p", "@PORT@", "-b"]},
         {"name" : "test-tls13-conversation.py",
          "arguments": ["-p", "@PORT@"]},
         {"name" : "test-tls13-empty-alert.py",
@@ -27,11 +43,18 @@
         {"name" : "test-tls13-version-negotiation.py",
          "arguments": ["-p", "@PORT@"]},
         {"name" : "test-tls13-zero-length-data.py",
-         "comment" : "in these tests tlsfuzzer splits ClientHello into the first 2 bytes and the remainder, which gnutls doesn't support",
-         "arguments": ["-e", "zero-length app data interleaved in handshake",
-                       "-p", "@PORT@",
+         "comment" : "in these tests tlsfuzzer splits ClientHello into the first 2 bytes and the remainder, which gnutls doesn't support, last 3 related to #481",
+         "arguments": ["-p", "@PORT@",
+                       "-e", "zero-len app data with large padding during handshake",
+                       "-e", "zero-len app data with large padding interleaved in handshake",
                        "-e", "zero-len app data with padding interleaved in handshake",
-                       "-e", "zero-len app data with large padding interleaved in handshake"]}
+                       "-e", "zero-length app data during handshake",
+                       "-e", "zero-length app data interleaved in handshake",
+                       "-e", "zero-length app data with padding during handshake"]},
+        {"name" : "test-tls13-finished.py",
+         "arguments": ["-p", "@PORT@", "-n", "5"],
+         "exp_pass" : false,
+         "comment" : "we do not switch the keys early enough for this test see #481"}
      ]
     }
 ]

diff --git a/tests/suite/tls-fuzzer/gnutls-nocert.json b/tests/suite/tls-fuzzer/gnutls-nocert.json
index e5b7a80b4ca1047a80f693a5121837dd67fbde08..6784511bf2c605657c45a571f5d81833b746e4a1 100644 (file)
--- a/tests/suite/tls-fuzzer/gnutls-nocert.json
+++ b/tests/suite/tls-fuzzer/gnutls-nocert.json
@@ -9,6 +9,7 @@
                  "--priority=@PRIORITY@",
                  "--disable-client-cert", "--port=@PORT@"],
      "tests" : [
+         {"name" : "test-fuzzed-plaintext.py"},
          {"name" : "test-large-hello.py",
           "arguments" : [
           "two ext, #80 61384 bytes",

diff --git a/tests/suite/tls-fuzzer/tlsfuzzer b/tests/suite/tls-fuzzer/tlsfuzzer
index 4609e91ad6ce4deff093fe51c3f702e5c110dde6..65af9ab3615a14c59f579085e13fe5a4557a356c 160000 (submodule)
--- a/tests/suite/tls-fuzzer/tlsfuzzer
+++ b/tests/suite/tls-fuzzer/tlsfuzzer
@@ -1 +1 @@
-Subproject commit 4609e91ad6ce4deff093fe51c3f702e5c110dde6
+Subproject commit 65af9ab3615a14c59f579085e13fe5a4557a356c