diff options
author | Peter Wu <peter@lekensteyn.nl> | 2018-12-09 17:28:48 +0100 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2018-12-13 05:28:02 +0000 |
commit | 48033906868075f43e511e4f906684c474454290 (patch) | |
tree | e1fc50ec9dd15cc352b37c192f221f6dcc55ddd1 /test | |
parent | 43dfd45faa8af0b239a671b25ab6a398fa32f5c6 (diff) |
Add new "rsa_keys" UAT for storage of RSA private keys
This should eventually replace the "ssl_keys" UAT which additionally
contains a useless address, port and protocol field. This prepares for
HSM support through PKCS #11.
Change-Id: I59409c98aeedf260d19266d18e14ef7d9b40b582
Reviewed-on: https://code.wireshark.org/review/30977
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'test')
-rw-r--r-- | test/suite_decryption.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/test/suite_decryption.py b/test/suite_decryption.py index 8b95903d64..aad2b2dde0 100644 --- a/test/suite_decryption.py +++ b/test/suite_decryption.py @@ -146,6 +146,20 @@ class case_decrypt_tls(subprocesstest.SubprocessTestCase): )) self.assertTrue(self.grepOutput('/')) + def test_tls_rsa_privkeys_uat(self, cmd_tshark, dirs, capture_file, features): + '''Check TLS decryption works using the rsa_keys UAT.''' + if not features.have_gnutls: + self.skipTest('Requires GnuTLS.') + key_file = os.path.join(dirs.key_dir, 'rsa-p-lt-q.key') + proc = self.assertRun((cmd_tshark, + '-r', capture_file('rsa-p-lt-q.pcap'), + '-o', 'uat:rsa_keys:"{}",""'.format(key_file.replace('\\', '\\x5c')), + '-Tfields', + '-e', 'http.request.uri', + '-Y', 'http', + )) + self.assertIn('/', proc.stdout_str) + def test_tls_rsa_with_password(self, cmd_tshark, capture_file, features): '''TLS using the server's private key with password''' if not features.have_gnutls: |