aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2019-02-05 14:13:29 +0100
committerPeter Wu <peter@lekensteyn.nl>2019-02-05 22:40:01 +0000
commit78827c8752f198e55b9a0300aee5b3868e6f28f7 (patch)
tree342557cd978c23e4cadf2e92a03d2cbb035e5b38 /test
parent62a8d40b5fdde124a0f5b88a3dce34468db0cf29 (diff)
Accept protocol aliases in Decode As (-d tcp.port==4433,ssl)
Change-Id: Idb2e4f9964cf0b5c1237a0d4b5e0954adfd5e6b6 Reviewed-on: https://code.wireshark.org/review/31895 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'test')
-rw-r--r--test/suite_decryption.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/suite_decryption.py b/test/suite_decryption.py
index 50692ea5ba..113096584a 100644
--- a/test/suite_decryption.py
+++ b/test/suite_decryption.py
@@ -208,9 +208,11 @@ class case_decrypt_tls(subprocesstest.SubprocessTestCase):
if not features.have_gnutls:
self.skipTest('Requires GnuTLS.')
key_file = os.path.join(dirs.key_dir, 'rsasnakeoil2.key')
+ # Test protocol alias while at it (ssl -> tls)
self.assertRun((cmd_tshark,
'-r', capture_file('tls-renegotiation.pcap'),
'-o', 'tls.keys_list:0.0.0.0,4433,http,{}'.format(key_file),
+ '-d', 'tcp.port==4433,ssl',
'-Tfields',
'-e', 'http.content_length',
'-Y', 'http',