summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2018-03-08 16:21:20 +0100
committerNikos Mavrogiannopoulos <nmav@redhat.com>2018-03-09 17:03:14 +0100
commitf14942024a6032e884fc8be4ff641149bc145ffc (patch)
tree762e26344d99a905ca3f5ffd8766de1b90e68735
parent824b19e351aa0d8d334e1a34a8c86372f8201429 (diff)
downloadgnutls-tmp-nmav-draft-ietf-tls-tls13-22.tar.gz
tlsfuzzer: updated to the latest versiontmp-nmav-draft-ietf-tls-tls13-22
Also enabled the RSA-PSS tests. Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
-rw-r--r--tests/suite/tls-fuzzer/gnutls-cert.json5
-rw-r--r--tests/suite/tls-fuzzer/gnutls-nocert.json11
m---------tests/suite/tls-fuzzer/tlsfuzzer0
m---------tests/suite/tls-fuzzer/tlslite-ng0
4 files changed, 7 insertions, 9 deletions
diff --git a/tests/suite/tls-fuzzer/gnutls-cert.json b/tests/suite/tls-fuzzer/gnutls-cert.json
index 69b7812f72..781ac2db54 100644
--- a/tests/suite/tls-fuzzer/gnutls-cert.json
+++ b/tests/suite/tls-fuzzer/gnutls-cert.json
@@ -30,11 +30,10 @@
"-e", "check sigalgs in cert request"]
},
{"name" : "test-rsa-pss-sigs-on-certificate-verify.py",
- "comment" : "tlsfuzzer doesn't yet support draft-22 RSA-PSS",
"arguments" : ["-k", "tests/clientX509Key.pem",
"-c", "tests/clientX509Cert.pem",
- "-e", "check CertificateRequest sigalgs"],
- "exp_pass" : false
+ "-e", "check CertificateRequest sigalgs",
+ "-n", "100"]
},
{"name": "test-certificate-malformed.py",
"comment" : "tlsfuzzer doesn't like the alerts we send",
diff --git a/tests/suite/tls-fuzzer/gnutls-nocert.json b/tests/suite/tls-fuzzer/gnutls-nocert.json
index 3c156d316d..e5b7a80b4c 100644
--- a/tests/suite/tls-fuzzer/gnutls-nocert.json
+++ b/tests/suite/tls-fuzzer/gnutls-nocert.json
@@ -5,6 +5,7 @@
"--x509keyfile", "../../../certs/ecc256.pem",
"--x509certfile", "../../../certs/cert-ecc256.pem",
"--debug=3",
+ "--noticket",
"--priority=@PRIORITY@",
"--disable-client-cert", "--port=@PORT@"],
"tests" : [
@@ -60,7 +61,9 @@
{"name" : "test-chacha20.py"},
{"name" : "test-aes-gcm-nonces.py" },
{"name" : "test-atypical-padding.py" },
- {"name" : "test-bleichenbacher-workaround.py" },
+ {"name" : "test-bleichenbacher-workaround.py",
+ "arguments" : ["-n", "20"]
+ },
{"name" : "test-clienthello-md5.py"},
{"name" : "test-client-compatibility.py"},
{"name" : "test-conversation.py"},
@@ -133,11 +136,7 @@
"-e", "small, maximum fragmentation: 1 fragment - 20B extension",
"-e", "medium, maximum fragmentation: 1 fragment - 1024B extension"]},
{"name" : "test-sessionID-resumption.py"},
- {"name" : "test-sig-algs.py",
- "comment" : "tlsfuzzer doesn't yet support draft-22 RSA-PSS",
- "arguments" : ["-e", "RSA-PSS only - fails in verify if server selects PSS",
- "-e", "with RSA-PSS - fails in verify if server selects PSS"],
- "exp_pass" : false
+ {"name" : "test-sig-algs.py"
},
{"name" : "test-signature-algorithms.py",
"comment" : "gnutls doesn't tolerate that much",
diff --git a/tests/suite/tls-fuzzer/tlsfuzzer b/tests/suite/tls-fuzzer/tlsfuzzer
-Subproject d10aac68845a80e6bef97b9061aa53119baabcc
+Subproject ff3ab5e356e413bba5845deecdfe105dd207a9a
diff --git a/tests/suite/tls-fuzzer/tlslite-ng b/tests/suite/tls-fuzzer/tlslite-ng
-Subproject 79eee6139661bcd2f0c15d0bd7b10308f699e0b
+Subproject 57d97d290043c6e1ef730e89b57c11937898667