From 7c7497a77e30f8098bcaffd0a9c96be24855c0e8 Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Sun, 4 Sep 2016 13:40:20 +0200 Subject: ssl,http: rename http-over-ssl to http-over-tls This name is displayed in the SSL prototcol tree (Application Data Protocol: http-over-tls), rename to avoid possible user confusion. Modify the SSL dissector such that both "http" and "http-over-tls" invoke the same dissector function. Change-Id: I2d52890a8ec8fa88b6390b133a11df607a5ec3dc Reviewed-on: https://code.wireshark.org/review/17481 Petri-Dish: Peter Wu Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu --- test/config/ssl_keys.tmpl | 4 ++-- test/suite-decryption.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/config/ssl_keys.tmpl b/test/config/ssl_keys.tmpl index bf2540f1fc..8daa5cb734 100644 --- a/test/config/ssl_keys.tmpl +++ b/test/config/ssl_keys.tmpl @@ -1,2 +1,2 @@ -"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" +"127.0.0.1","443","http","TEST_KEYS_DIRrsasnakeoil2.key","" +"127.0.0.1","9131","http","TEST_KEYS_DIRkey.p12","WebAS" diff --git a/test/suite-decryption.sh b/test/suite-decryption.sh index 975fdab8d3..0d5ba25043 100755 --- a/test/suite-decryption.sh +++ b/test/suite-decryption.sh @@ -201,7 +201,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-over-ssl,$TEST_KEYS_FILE" \ + -o ssl.keys_list:"0.0.0.0,443,http,$TEST_KEYS_FILE" \ -r "$CAPTURE_DIR/rsa-p-lt-q.pcap" -Y http \ | grep / > /dev/null 2>&1 RETURNVALUE=$? -- cgit v1.2.1