diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-02 21:06:40 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-02 21:06:40 +0100 |
| commit | f4a12fc67689a830e9da1c87fd11afe5bc09deb3 (patch) | |
| tree | 211ae0cd022a6c11b0026ecc7761a550c584583c /security/nss/tests/tlsfuzzer | |
| parent | f7d30133221896638f7bf4f66c504255c4b14f48 (diff) | |
| download | UXP-f4a12fc67689a830e9da1c87fd11afe5bc09deb3.tar UXP-f4a12fc67689a830e9da1c87fd11afe5bc09deb3.tar.gz UXP-f4a12fc67689a830e9da1c87fd11afe5bc09deb3.tar.lz UXP-f4a12fc67689a830e9da1c87fd11afe5bc09deb3.tar.xz UXP-f4a12fc67689a830e9da1c87fd11afe5bc09deb3.zip | |
Issue #1338 - Part 2: Update NSS to 3.48-RTM
Diffstat (limited to 'security/nss/tests/tlsfuzzer')
| -rw-r--r-- | security/nss/tests/tlsfuzzer/config.json.in | 24 | ||||
| -rw-r--r-- | security/nss/tests/tlsfuzzer/tlsfuzzer.sh | 6 |
2 files changed, 24 insertions, 6 deletions
diff --git a/security/nss/tests/tlsfuzzer/config.json.in b/security/nss/tests/tlsfuzzer/config.json.in index 051bae2be..51d198c76 100644 --- a/security/nss/tests/tlsfuzzer/config.json.in +++ b/security/nss/tests/tlsfuzzer/config.json.in @@ -71,9 +71,7 @@ "name" : "test-tls13-legacy-version.py", "arguments": [ "-p", "@PORT@" - ], - "comment": "https://bugzilla.mozilla.org/show_bug.cgi?id=1490006", - "exp_pass": false + ] }, { "name" : "test-tls13-nociphers.py", @@ -162,5 +160,25 @@ ] } ] + }, + { + "server_command": [ + "@SELFSERV@", "-w", "nss", "-d", "@SERVERDIR@", + "-V", "tls1.0:", "-H", "1", + "-n", "rsa", + "-c", ":C028", + "-p", "@PORT@" + ], + "server_hostname": "@HOSTADDR@", + "server_port": @PORT@, + "tests" : [ + { + "name" : "test-atypical-padding.py", + "arguments": [ + "-p", "@PORT@", + "2^14 bytes of AppData with 256 bytes of padding (SHA384)" + ] + } + ] } ] diff --git a/security/nss/tests/tlsfuzzer/tlsfuzzer.sh b/security/nss/tests/tlsfuzzer/tlsfuzzer.sh index ecc146c24..73dc6090b 100644 --- a/security/nss/tests/tlsfuzzer/tlsfuzzer.sh +++ b/security/nss/tests/tlsfuzzer/tlsfuzzer.sh @@ -44,11 +44,11 @@ tlsfuzzer_init() if [ ! -d "$TLSFUZZER" ]; then # Can't use git-copy.sh here, as tlsfuzzer doesn't have any tags git clone -q https://github.com/tomato42/tlsfuzzer/ "$TLSFUZZER" - git -C "$TLSFUZZER" checkout a40ce4085052a4da9a05f9149b835a76c194a0c6 + git -C "$TLSFUZZER" checkout 80d7932ead1d8dae6e555cfd2b1c4c5beb2847df # We could use tlslite-ng from pip, but the pip command installed # on TC is too old to support --pre - ${QADIR}/../fuzz/config/git-copy.sh https://github.com/tomato42/tlslite-ng/ v0.8.0-alpha18 tlslite-ng + ${QADIR}/../fuzz/config/git-copy.sh https://github.com/tomato42/tlslite-ng/ v0.8.0-alpha27 tlslite-ng pushd "$TLSFUZZER" ln -s ../tlslite-ng/tlslite tlslite @@ -99,7 +99,7 @@ tlsfuzzer_cleanup() tlsfuzzer_run_tests() { pushd "${HOSTDIR}/tlsfuzzer/${TLSFUZZER}" - PYTHONPATH=. python tests/scripts_retention.py config.json "${BINDIR}/selfserv" + PYTHONPATH=. python tests/scripts_retention.py config.json "${BINDIR}/selfserv" 512 html_msg $? 0 "tlsfuzzer" "Run successfully" popd } |