From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Mon, 2 Jul 2018 09:47:34 +0000 (+0200)
Subject: tlsfuzzer: updated to include RSA and RSA-PSS related tests
X-Git-Tag: gnutls_3_6_3~39^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78d45b1b79dded81e09fdb24b84fae1e353771cd;p=thirdparty%2Fgnutls.git

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 8c73c904ce..89c8853c68 100644
--- 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 e5b7a80b4c..6784511bf2 100644
--- 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 4609e91ad6..65af9ab361 160000
--- a/tests/suite/tls-fuzzer/tlsfuzzer
+++ b/tests/suite/tls-fuzzer/tlsfuzzer
@@ -1 +1 @@
-Subproject commit 4609e91ad6ce4deff093fe51c3f702e5c110dde6
+Subproject commit 65af9ab3615a14c59f579085e13fe5a4557a356c