diff options
| author | deagol <alexander.wetzel@web.de> | 2015-05-01 22:56:50 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-05-08 04:27:49 +0000 |
| commit | 1439eb677820fff055df86e43341fde1d94a64d1 (patch) | |
| tree | 31b136ae73871a6182c5c634100b9eea07185a16 /caputils/airpcap_loader.h | |
| parent | b644698bef613c4bb1eda5d2f7481620583fc185 (diff) | |
| download | wireshark-1439eb677820fff055df86e43341fde1d94a64d1.tar.gz | |
IEEE 802.11: 802.1X (WPA-EAP) rekeying support
This patch extends the existing decryption support for WPA to also
handle rekeys by checking each decrypted packet for a 4-way-handshake.
Rekeys can be used for WPA-PSK, but are more common with WPA-Enterprise
(WPA-EAP).
For decrypting WPA-EAP secured packets the user must provide all used PMK's
of the connection (aka PSK's) as WPA-PSK 32 byte hex values to wireshark
via the existing interface.
(The capture must have all 4-way-handshakes included also, starting with
the first unencrypted one.)
Every decrypted unicast packet will habe the used PMK and TK shown in the
CCMP/TKIP section below the key index in the GUI. Group packets will display the
GTK instead.
Additionally this fixes a small issue with group rekey handling, so every packet
can be selected in the GUI in random order, removing the need to manually find
the correct group keying packets prior to that.
It was tested primary with WPA-CCMP, but TKIP is also working.
One section in the code touch bluetooth 802.1X support. It should do
exactly the same, but will now also examine all decypted packets for rekeys.
Ping-Bug: 11172
Change-Id: I19d055581fce6268df888da63485a48326046748
Reviewed-on: https://code.wireshark.org/review/8268
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'caputils/airpcap_loader.h')
| -rw-r--r-- | caputils/airpcap_loader.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/caputils/airpcap_loader.h b/caputils/airpcap_loader.h index 929604f082..ef8248f3a5 100644 --- a/caputils/airpcap_loader.h +++ b/caputils/airpcap_loader.h @@ -26,7 +26,7 @@ #ifndef __AIRPCAP_LOADER_H__ #define __AIRPCAP_LOADER_H__ -#include <epan/crypt/airpdcap_user.h> +#include <epan/crypt/airpdcap_system.h> #ifdef __cplusplus extern "C" { |