diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-04-16 23:38:22 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-04-17 06:39:01 +0000 |
| commit | 256a7be13e435920220cae5bdd7a14b0dbe69a11 (patch) | |
| tree | 4feb963b6ccaa282c2b191d7b3b90a06ea9efe21 /test | |
| parent | 6e4f4726ac91546a5f651e4feaa02be0c978ac35 (diff) | |
The dissector for HTTP-over-SSL is now called "http-over-ssl", not just "http".
The "http" dissector is what's used for protocols other than TCP, SCTP,
and SSL/TLS.
Change-Id: Ib5138d3a082f1017b7ef190e5128a21eb9a49e92
Reviewed-on: https://code.wireshark.org/review/14947
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'test')
| -rw-r--r-- | test/config/ssl_keys.tmpl | 4 | ||||
| -rwxr-xr-x | test/suite-decryption.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/config/ssl_keys.tmpl b/test/config/ssl_keys.tmpl index 8daa5cb734..bf2540f1fc 100644 --- a/test/config/ssl_keys.tmpl +++ b/test/config/ssl_keys.tmpl @@ -1,2 +1,2 @@ -"127.0.0.1","443","http","TEST_KEYS_DIRrsasnakeoil2.key","" -"127.0.0.1","9131","http","TEST_KEYS_DIRkey.p12","WebAS" +"127.0.0.1","443","http-over-ssl","TEST_KEYS_DIRrsasnakeoil2.key","" +"127.0.0.1","9131","http-over-ssl","TEST_KEYS_DIRkey.p12","WebAS" diff --git a/test/suite-decryption.sh b/test/suite-decryption.sh index ac5634d5db..c9d3c75e0e 100755 --- a/test/suite-decryption.sh +++ b/test/suite-decryption.sh @@ -184,7 +184,7 @@ decryption_step_ssl_rsa_pq() { TEST_KEYS_FILE="`cygpath -w $TEST_KEYS_FILE`" fi $TESTS_DIR/run_and_catch_crashes env $TS_DC_ENV $TSHARK $TS_DC_ARGS -Tfields -e http.request.uri \ - -o ssl.keys_list:"0.0.0.0,443,http,$TEST_KEYS_FILE" \ + -o ssl.keys_list:"0.0.0.0,443,http-over-ssl,$TEST_KEYS_FILE" \ -r "$CAPTURE_DIR/rsa-p-lt-q.pcap" -Y http \ | grep / > /dev/null 2>&1 RETURNVALUE=$? |