summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2017-07-18 11:16:09 +0200
committerNikos Mavrogiannopoulos <nmav@redhat.com>2017-07-18 11:24:29 +0200
commit1297ca4a4a068926cbc9aa210f4d08ee93f0db1a (patch)
tree5b324677dd9ef36a593744684165e7781b775706
parent0b1de2528181284fe89dbe7120a234d491e666cc (diff)
downloadgnutls-1297ca4a4a068926cbc9aa210f4d08ee93f0db1a.tar.gz
tlsfuzzer: enabled test-extended-master-secret-extension.py
That allows testing the extended master secret behavior. Resolves: #231 Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
-rw-r--r--tests/suite/tls-fuzzer/gnutls-nocert.json7
m---------tests/suite/tls-fuzzer/tlsfuzzer0
m---------tests/suite/tls-fuzzer/tlslite-ng0
3 files changed, 3 insertions, 4 deletions
diff --git a/tests/suite/tls-fuzzer/gnutls-nocert.json b/tests/suite/tls-fuzzer/gnutls-nocert.json
index 0f4461334a..097ad15633 100644
--- a/tests/suite/tls-fuzzer/gnutls-nocert.json
+++ b/tests/suite/tls-fuzzer/gnutls-nocert.json
@@ -31,11 +31,10 @@
"arguments" : ["--ssl3"] },
{"name" : "test-extensions.py"},
{"name" : "test-extended-master-secret-extension.py",
- "comment" : "gnutls does not allow switching from EMS to no EMS",
+ "comment" : "gnutls does not allow switching from EMS to no EMS, and w/ECDHE test is incomplete",
"arguments" : ["-e", "renegotiate without EMS in session with EMS",
- "-e", "EMS with session resume without extension"],
- "comment" : "FIXME: This script doesn't accept -e",
- "exp_pass" : false},
+ "-e", "EMS with session resume without extension",
+ "-e", "extended master secret w/ECDHE"]},
{"name" : "test-fallback-scsv.py"},
{"name" : "test-fuzzed-ciphertext.py"},
{"name" : "test-fuzzed-finished.py"},
diff --git a/tests/suite/tls-fuzzer/tlsfuzzer b/tests/suite/tls-fuzzer/tlsfuzzer
-Subproject 744a2c8dc3b0c8ce36c4956d2713a3757b83213
+Subproject fdfa2525c0b33383037004d8130093801fbaaf4
diff --git a/tests/suite/tls-fuzzer/tlslite-ng b/tests/suite/tls-fuzzer/tlslite-ng
-Subproject 26a323a8beb51a8696f578769295db98121570b
+Subproject f450a90b6a29ef9d3e0742240220c3995a4497e