diff options
| author | Mikael Kanstrup <mikael.kanstrup@sony.com> | 2019-03-22 17:10:35 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2019-03-26 08:56:03 +0000 |
| commit | 94461234f90907c410ee52e13eb90b0f6d91f2e5 (patch) | |
| tree | c5459e1be94c27059ab7392de614479280d641bf /test | |
| parent | 8cdc95842687feee32856afba8e7087396082158 (diff) | |
ieee80211: Support decrypting OWE captures
Add support for decryping OWE (Opportunistic Wireless Encryption)
captures.
Ping-Bug: 15621
Change-Id: I223fd0cd96260408bce2b5d7661f216c351da8a8
Reviewed-on: https://code.wireshark.org/review/32524
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/captures/owe.pcapng.gz | bin | 0 -> 5634 bytes | |||
| -rw-r--r-- | test/config/80211_keys.tmpl | 1 | ||||
| -rw-r--r-- | test/suite_decryption.py | 11 |
3 files changed, 12 insertions, 0 deletions
diff --git a/test/captures/owe.pcapng.gz b/test/captures/owe.pcapng.gz Binary files differnew file mode 100644 index 0000000000..930d6bc503 --- /dev/null +++ b/test/captures/owe.pcapng.gz diff --git a/test/config/80211_keys.tmpl b/test/config/80211_keys.tmpl index a9f3c81632..7cb9811f18 100644 --- a/test/config/80211_keys.tmpl +++ b/test/config/80211_keys.tmpl @@ -6,3 +6,4 @@ "wpa-psk","79258f6ceeecedd3482b92deaabdb675f09bcb4003ef5074f5ddb10a94ebe00a" "wpa-psk","23a9ee58c7810546ae3e7509fda9f97435778d689e53a54891c56d02f18ca162" "wpa-psk","ecbfe709d6151eaba6a4fd9cba94fbb570c1fc4c15506fad3185b4a0a0cfda9a" +"wpa-psk","a4b0b2efa7f77d1006eccf1a814b62125c15fac5c137d9cdff8c75c43194268f" diff --git a/test/suite_decryption.py b/test/suite_decryption.py index 808c5c6aeb..754c9bffc6 100644 --- a/test/suite_decryption.py +++ b/test/suite_decryption.py @@ -90,6 +90,17 @@ class case_decrypt_80211(subprocesstest.SubprocessTestCase): self.assertTrue(self.grepOutput('Who has 192.168.5.18')) self.assertTrue(self.grepOutput('DHCP ACK')) + def test_80211_owe(self, cmd_tshark, capture_file): + '''IEEE 802.11 decode OWE''' + # Included in git sources test/captures/owe.pcapng.gz + self.assertRun((cmd_tshark, + '-o', 'wlan.enable_decryption: TRUE', + '-r', capture_file('owe.pcapng.gz'), + '-Y', 'wlan.analysis.tk == 10f3deccc00d5c8f629fba7a0fff34aa || wlan.analysis.gtk == 016b04ae9e6050bcc1f940dda9ffff2b', + )) + self.assertTrue(self.grepOutput('Who has 192.168.5.2')) + self.assertTrue(self.grepOutput('DHCP ACK')) + @fixtures.mark_usefixtures('test_env') @fixtures.uses_fixtures class case_decrypt_dtls(subprocesstest.SubprocessTestCase): |