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>

diff --git a/test/config/ssl_keys.tmpl b/test/config/ssl_keys.tmpl
index 8daa5cb7343b0648c5fcbbf7c5cba61dea82e62c..bf2540f1fc4ca1812b5097ffa87bbcfb9edc9bfb 100644 (file)
--- 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 ac5634d5db7efacb7f16d483113bfe4916e7ed3b..c9d3c75e0ee71313fec483966d67b35931179d72 100755 (executable)
--- 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=$?