diff options
author | Jouni Malinen <j@w1.fi> | 2009-01-08 06:32:01 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-01-29 16:00:02 -0500 |
commit | 765cb46a3fc856245ea68a7c961ac87c77e4ae2d (patch) | |
tree | 210cb9cd260430221ddb3be9620ee8ae90ecee34 /include/linux | |
parent | fb7333367632c67d8b6b06fb8d906cdabb11b02a (diff) |
mac80211: 802.11w - Add BIP (AES-128-CMAC)
Implement Broadcast/Multicast Integrity Protocol for management frame
protection. This patch adds the needed definitions for the new
information element (MMIE) and implementation for the new "encryption"
type (though, BIP is actually not encrypting data, it provides only
integrity protection). These routines will be used by a follow-on patch
that enables BIP for multicast/broadcast robust management frames.
Signed-off-by: Jouni Malinen <j@w1.fi>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/ieee80211.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index d5165895f316..cceb9e86c744 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h | |||
@@ -655,6 +655,15 @@ struct ieee80211_mgmt { | |||
655 | #define IEEE80211_MIN_ACTION_SIZE offsetof(struct ieee80211_mgmt, u.action.u) | 655 | #define IEEE80211_MIN_ACTION_SIZE offsetof(struct ieee80211_mgmt, u.action.u) |
656 | 656 | ||
657 | 657 | ||
658 | /* Management MIC information element (IEEE 802.11w) */ | ||
659 | struct ieee80211_mmie { | ||
660 | u8 element_id; | ||
661 | u8 length; | ||
662 | __le16 key_id; | ||
663 | u8 sequence_number[6]; | ||
664 | u8 mic[8]; | ||
665 | } __attribute__ ((packed)); | ||
666 | |||
658 | /* Control frames */ | 667 | /* Control frames */ |
659 | struct ieee80211_rts { | 668 | struct ieee80211_rts { |
660 | __le16 frame_control; | 669 | __le16 frame_control; |
@@ -1018,6 +1027,7 @@ enum ieee80211_eid { | |||
1018 | WLAN_EID_HT_INFORMATION = 61, | 1027 | WLAN_EID_HT_INFORMATION = 61, |
1019 | /* 802.11i */ | 1028 | /* 802.11i */ |
1020 | WLAN_EID_RSN = 48, | 1029 | WLAN_EID_RSN = 48, |
1030 | WLAN_EID_MMIE = 76 /* 802.11w */, | ||
1021 | WLAN_EID_WPA = 221, | 1031 | WLAN_EID_WPA = 221, |
1022 | WLAN_EID_GENERIC = 221, | 1032 | WLAN_EID_GENERIC = 221, |
1023 | WLAN_EID_VENDOR_SPECIFIC = 221, | 1033 | WLAN_EID_VENDOR_SPECIFIC = 221, |