diff options
| author | Gerald Combs <gerald@wireshark.org> | 2020-02-18 10:05:09 -0800 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2020-02-18 23:33:29 +0000 |
| commit | b3efeb25731e123c415ca788b9853e9b3c1811b8 (patch) | |
| tree | 4318d86a6f39fb474f168e234e771d07d7387493 /test | |
| parent | 645f05bafa05d1894eb0601dc014e3959cebd61d (diff) | |
Test: Bump the WireGuard Gcrypt version requirement.
WireGuard decryption requires Gcrypt 1.8 or later.
Change-Id: I4a9e910df61a2d8f375e3f90b22511fe59be922c
Reviewed-on: https://code.wireshark.org/review/36128
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'test')
| -rw-r--r-- | test/fixtures_ws.py | 1 | ||||
| -rw-r--r-- | test/suite_decryption.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/test/fixtures_ws.py b/test/fixtures_ws.py index e4cff119c1..8305b2db18 100644 --- a/test/fixtures_ws.py +++ b/test/fixtures_ws.py @@ -177,6 +177,7 @@ def features(cmd_tshark, make_env): have_kerberos='with MIT Kerberos' in tshark_v or 'with Heimdal Kerberos' in tshark_v, have_libgcrypt16=gcry_m and float(gcry_m.group(1)) >= 1.6, have_libgcrypt17=gcry_m and float(gcry_m.group(1)) >= 1.7, + have_libgcrypt18=gcry_m and float(gcry_m.group(1)) >= 1.8, have_gnutls='with GnuTLS' in tshark_v, have_pkcs11='and PKCS #11 support' in tshark_v, have_brotli='with brotli' in tshark_v, diff --git a/test/suite_decryption.py b/test/suite_decryption.py index 1d25aa035a..85a5dc7349 100644 --- a/test/suite_decryption.py +++ b/test/suite_decryption.py @@ -632,8 +632,8 @@ class case_decrypt_kerberos(subprocesstest.SubprocessTestCase): @fixtures.fixture(scope='session') def run_wireguard_test(cmd_tshark, capture_file, features): - if not features.have_libgcrypt17: - fixtures.skip('Requires Gcrypt 1.7 or later') + if not features.have_libgcrypt18: + fixtures.skip('Requires Gcrypt 1.8 or later') def runOne(self, args, keylog=None, pcap_file='wireguard-ping-tcp.pcap'): if keylog: keylog_file = self.filename_from_id('wireguard.keys') |