aboutsummaryrefslogtreecommitdiffstats
path: root/airpcap.h
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2006-12-05 19:24:25 +0000
committerGerald Combs <gerald@wireshark.org>2006-12-05 19:24:25 +0000
commita980d047830755406fc27150978511b407d65829 (patch)
tree523e028d65e71d3531c9e0fdb1da17350e90f91c /airpcap.h
parent39c29557c743671b4b09308cdd5a6dc7ba791499 (diff)
From Davide Schiera and Giorgio Tino: Add initial WPA/WPA2 decryption
support. WEP key preferences have been overloaded to allow WPA keys. The decryption code currently uses Windows-specific data types, but can be converted to use glib equivalents. Add a few text and whitespace fixups. svn path=/trunk/; revision=20049
Diffstat (limited to 'airpcap.h')
-rw-r--r--airpcap.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/airpcap.h b/airpcap.h
index d6df6ca1b0..1a7aeb28d4 100644
--- a/airpcap.h
+++ b/airpcap.h
@@ -88,6 +88,7 @@ typedef struct _AirpcapDeviceDescription
#define WEP_KEY_MAX_SIZE 32 /* Maximum size of a WEP key, in bytes. This is the size of an entry in the */
/* AirpcapWepKeysCollection structure */
+
#ifndef __MINGW32__
#pragma pack(push)
#pragma pack(1)
@@ -95,8 +96,8 @@ typedef struct _AirpcapDeviceDescription
#define AIRPCAP_KEYTYPE_WEP 0 /* Key type: WEP. The key can have an arbitrary length smaller than 32 bytes. */
-#define AIRPCAP_KEYTYPE_TKIP 1 /* Key type: TKIP (WPA). NOT SUPPORTED YET. */
-#define AIRPCAP_KEYTYPE_CCMP 2 /* Key type: CCMP (WPA2). NOT SUPPORTED YET. */
+#define AIRPCAP_KEYTYPE_TKIP 1 /* Key type: TKIP (WPA_PWD). NOT SUPPORTED YET. */
+#define AIRPCAP_KEYTYPE_CCMP 2 /* Key type: CCMP (WPA_BIN). NOT SUPPORTED YET. */
/*!
\brief WEP key container