summaryrefslogtreecommitdiff
path: root/tests/suite
diff options
context:
space:
mode:
Diffstat (limited to 'tests/suite')
-rw-r--r--tests/suite/tls-fuzzer/gnutls-nocert-tls13.json27
-rwxr-xr-xtests/suite/tls-fuzzer/tls-fuzzer-nocert-tls13.sh6
2 files changed, 20 insertions, 13 deletions
diff --git a/tests/suite/tls-fuzzer/gnutls-nocert-tls13.json b/tests/suite/tls-fuzzer/gnutls-nocert-tls13.json
index c060080139..8c73c904ce 100644
--- a/tests/suite/tls-fuzzer/gnutls-nocert-tls13.json
+++ b/tests/suite/tls-fuzzer/gnutls-nocert-tls13.json
@@ -7,18 +7,29 @@
"--debug=3",
"--priority=@PRIORITY@",
"--disable-client-cert", "--port=@PORT@"],
+ "server_hostname": "localhost",
+ "server_port": @PORT@,
"tests" : [
- {"name" : "test-tls13-conversation.py"},
- {"name" : "test-tls13-empty-alert.py"},
- {"name" : "test-tls13-legacy-version.py"},
- {"name" : "test-tls13-nociphers.py"},
- {"name" : "test-tls13-pkcs-signature.py"},
- {"name" : "test-tls13-record-padding.py"},
- {"name" : "test-tls13-signature-algorithms.py"},
- {"name" : "test-tls13-version-negotiation.py"},
+ {"name" : "test-tls13-conversation.py",
+ "arguments": ["-p", "@PORT@"]},
+ {"name" : "test-tls13-empty-alert.py",
+ "arguments": ["-p", "@PORT@"]},
+ {"name" : "test-tls13-legacy-version.py",
+ "arguments": ["-p", "@PORT@"]},
+ {"name" : "test-tls13-nociphers.py",
+ "arguments": ["-p", "@PORT@"]},
+ {"name" : "test-tls13-pkcs-signature.py",
+ "arguments": ["-p", "@PORT@"]},
+ {"name" : "test-tls13-record-padding.py",
+ "arguments": ["-p", "@PORT@"]},
+ {"name" : "test-tls13-signature-algorithms.py",
+ "arguments": ["-p", "@PORT@"]},
+ {"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@",
"-e", "zero-len app data with padding interleaved in handshake",
"-e", "zero-len app data with large padding interleaved in handshake"]}
]
diff --git a/tests/suite/tls-fuzzer/tls-fuzzer-nocert-tls13.sh b/tests/suite/tls-fuzzer/tls-fuzzer-nocert-tls13.sh
index d853a34665..53759db477 100755
--- a/tests/suite/tls-fuzzer/tls-fuzzer-nocert-tls13.sh
+++ b/tests/suite/tls-fuzzer/tls-fuzzer-nocert-tls13.sh
@@ -28,10 +28,7 @@ TMPFILE=tls-fuzzer.$$.tmp
. "${srcdir}/../scripts/common.sh"
# We hard-code the port because of limitations in tlsfuzzer
-#eval "${GETPORT}"
-PORT=4433
-
-$LOCKFILE
+eval "${GETPORT}"
pushd tls-fuzzer
@@ -64,5 +61,4 @@ rm -f ${TMPFILE}
popd
popd
-$UNLOCKFILE
exit $retval