aboutsummaryrefslogtreecommitdiffstats
path: root/src/common/wpa_common.h
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2008-08-30 11:59:39 (GMT)
committerJouni Malinen <j@w1.fi>2008-08-30 11:59:39 (GMT)
commit0b60b0aaadaeec905d8e07a56b88cdfa83cad300 (patch)
tree142434f6e58e51ecbf176d941e0cc959d4a6a37e /src/common/wpa_common.h
parentb3f240bc0e3fbab466cd819f024451189af4fe9c (diff)
downloadhostap-0b60b0aaadaeec905d8e07a56b88cdfa83cad300.zip
hostap-0b60b0aaadaeec905d8e07a56b88cdfa83cad300.tar.gz
hostap-0b60b0aaadaeec905d8e07a56b88cdfa83cad300.tar.bz2
Updated MFP defines based on IEEE 802.11w/D6.0 and use new MFPC/MFPR
This adds most of the new frame format and identifier definitions from IEEE 802.11w/D6.0. In addition, the RSN IE capability field values for MFP is replaced with the new two-bit version with MFPC (capable) and MFPR (required) processing.
Diffstat (limited to 'src/common/wpa_common.h')
-rw-r--r--src/common/wpa_common.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h
index 9b9e39e..fa5a154 100644
--- a/src/common/wpa_common.h
+++ b/src/common/wpa_common.h
@@ -54,6 +54,9 @@
#define RSN_AUTH_KEY_MGMT_FT_802_1X RSN_SELECTOR(0x00, 0x0f, 0xac, 3)
#define RSN_AUTH_KEY_MGMT_FT_PSK RSN_SELECTOR(0x00, 0x0f, 0xac, 4)
#endif /* CONFIG_IEEE80211R */
+#define RSN_AUTH_KEY_MGMT_802_1X_SHA256 RSN_SELECTOR(0x00, 0x0f, 0xac, 5)
+#define RSN_AUTH_KEY_MGMT_PSK_SHA256 RSN_SELECTOR(0x00, 0x0f, 0xac, 6)
+
#define RSN_CIPHER_SUITE_NONE RSN_SELECTOR(0x00, 0x0f, 0xac, 0)
#define RSN_CIPHER_SUITE_WEP40 RSN_SELECTOR(0x00, 0x0f, 0xac, 1)
#define RSN_CIPHER_SUITE_TKIP RSN_SELECTOR(0x00, 0x0f, 0xac, 2)
@@ -107,7 +110,11 @@
/* IEEE 802.11, 7.3.2.25.3 RSN Capabilities */
#define WPA_CAPABILITY_PREAUTH BIT(0)
-#define WPA_CAPABILITY_MGMT_FRAME_PROTECTION BIT(7)
+#define WPA_CAPABILITY_NO_PAIRWISE BIT(1)
+/* B2-B3: PTKSA Replay Counter */
+/* B4-B5: GTKSA Replay Counter */
+#define WPA_CAPABILITY_MFPR BIT(6)
+#define WPA_CAPABILITY_MFPC BIT(7)
#define WPA_CAPABILITY_PEERKEY_ENABLED BIT(9)
@@ -273,6 +280,7 @@ struct rsn_ftie {
#define FTIE_SUBELEM_R1KH_ID 1
#define FTIE_SUBELEM_GTK 2
#define FTIE_SUBELEM_R0KH_ID 3
+#define FTIE_SUBELEM_IGTK 4
#endif /* CONFIG_IEEE80211R */