jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

IEEE Std 802.11r-2008 has been released, so update references

Browse source
This commit is contained in:
Jouni Malinen 2008-08-15 11:25:24 +03:00 committed by Jouni Malinen
parent d48ae45b73
commit c1e033b0bb
6 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
hostapd/defconfig
View file

@ -115,10 +115,7 @@ CONFIG_PKCS12=y
# Build IPv6 support for RADIUS operations # Build IPv6 support for RADIUS operations
CONFIG_IPV6=y CONFIG_IPV6=y
# IEEE 802.11r/D4.1 (Fast BSS Transition) # IEEE Std 802.11r-2008 (Fast BSS Transition)
# This enables an experimental implementation of a draft version of
# IEEE 802.11r. This draft is still subject to change, so it should be noted
# that this version may not comply with the final standard.
#CONFIG_IEEE80211R=y #CONFIG_IEEE80211R=y
# Use the hostapd's IEEE 802.11 authentication (ACL), but without # Use the hostapd's IEEE 802.11 authentication (ACL), but without

3
hostapd/wpa.h
View file

@ -22,7 +22,8 @@
#pragma pack(push, 1) #pragma pack(push, 1)
#endif /* _MSC_VER */ #endif /* _MSC_VER */
/* IEEE 802.11r/D8.0, 11A.10.3 - Remote request/response frame definition */ /* IEEE Std 802.11r-2008, 11A.10.3 - Remote request/response frame definition
*/
struct ft_rrb_frame { struct ft_rrb_frame {
u8 frame_type; /* RSN_REMOTE_FRAME_TYPE_FT_RRB */ u8 frame_type; /* RSN_REMOTE_FRAME_TYPE_FT_RRB */
u8 packet_type; /* FT_PACKET_REQUEST/FT_PACKET_RESPONSE */ u8 packet_type; /* FT_PACKET_REQUEST/FT_PACKET_RESPONSE */

2
hostapd/wpa_ft.c
View file

@ -1274,7 +1274,7 @@ int wpa_ft_rrb_rx(struct wpa_authenticator *wpa_auth, const u8 *src_addr,
MAC2STR(frame->ap_address)); MAC2STR(frame->ap_address));
if (frame->frame_type != RSN_REMOTE_FRAME_TYPE_FT_RRB) { if (frame->frame_type != RSN_REMOTE_FRAME_TYPE_FT_RRB) {
/* Discard frame per IEEE 802.11r/D8.0, 10A.10.3 */ /* Discard frame per IEEE Std 802.11r-2008, 11A.10.3 */
wpa_printf(MSG_DEBUG, "FT: RRB discarded frame with " wpa_printf(MSG_DEBUG, "FT: RRB discarded frame with "
"unrecognized type %d", frame->frame_type); "unrecognized type %d", frame->frame_type);
return -1; return -1;

8
src/common/wpa_common.c
View file

@ -394,7 +394,7 @@ int wpa_parse_wpa_ie_rsn(const u8 *rsn_ie, size_t rsn_ie_len,
/** /**
* wpa_derive_pmk_r0 - Derive PMK-R0 and PMKR0Name * wpa_derive_pmk_r0 - Derive PMK-R0 and PMKR0Name
* *
* IEEE 802.11r/D9.0 - 8.5.1.5.3 * IEEE Std 802.11r-2008 - 8.5.1.5.3
*/ */
void wpa_derive_pmk_r0(const u8 *xxkey, size_t xxkey_len, void wpa_derive_pmk_r0(const u8 *xxkey, size_t xxkey_len,
const u8 *ssid, size_t ssid_len, const u8 *ssid, size_t ssid_len,
@ -449,7 +449,7 @@ void wpa_derive_pmk_r0(const u8 *xxkey, size_t xxkey_len,
/** /**
* wpa_derive_pmk_r1_name - Derive PMKR1Name * wpa_derive_pmk_r1_name - Derive PMKR1Name
* *
* IEEE 802.11r/D9.0 - 8.5.1.5.4 * IEEE Std 802.11r-2008 - 8.5.1.5.4
*/ */
void wpa_derive_pmk_r1_name(const u8 *pmk_r0_name, const u8 *r1kh_id, void wpa_derive_pmk_r1_name(const u8 *pmk_r0_name, const u8 *r1kh_id,
const u8 *s1kh_id, u8 *pmk_r1_name) const u8 *s1kh_id, u8 *pmk_r1_name)
@ -479,7 +479,7 @@ void wpa_derive_pmk_r1_name(const u8 *pmk_r0_name, const u8 *r1kh_id,
/** /**
* wpa_derive_pmk_r1 - Derive PMK-R1 and PMKR1Name from PMK-R0 * wpa_derive_pmk_r1 - Derive PMK-R1 and PMKR1Name from PMK-R0
* *
* IEEE 802.11r/D9.0 - 8.5.1.5.4 * IEEE Std 802.11r-2008 - 8.5.1.5.4
*/ */
void wpa_derive_pmk_r1(const u8 *pmk_r0, const u8 *pmk_r0_name, void wpa_derive_pmk_r1(const u8 *pmk_r0, const u8 *pmk_r0_name,
const u8 *r1kh_id, const u8 *s1kh_id, const u8 *r1kh_id, const u8 *s1kh_id,
@ -504,7 +504,7 @@ void wpa_derive_pmk_r1(const u8 *pmk_r0, const u8 *pmk_r0_name,
/** /**
* wpa_pmk_r1_to_ptk - Derive PTK and PTKName from PMK-R1 * wpa_pmk_r1_to_ptk - Derive PTK and PTKName from PMK-R1
* *
* IEEE 802.11r/D9.0 - 8.5.1.5.5 * IEEE Std 802.11r-2008 - 8.5.1.5.5
*/ */
void wpa_pmk_r1_to_ptk(const u8 *pmk_r1, const u8 *snonce, const u8 *anonce, void wpa_pmk_r1_to_ptk(const u8 *pmk_r1, const u8 *snonce, const u8 *anonce,
const u8 *sta_addr, const u8 *bssid, const u8 *sta_addr, const u8 *bssid,

2
src/rsn_supp/wpa_ft.c
View file

@ -243,7 +243,7 @@ static u8 * wpa_ft_gen_req_ies(struct wpa_sm *sm, size_t *len,
if (kck) { if (kck) {
/* /*
* IEEE 802.11r/D9.0, 11A.8.4 * IEEE Std 802.11r-2008, 11A.8.4
* MIC shall be calculated over: * MIC shall be calculated over:
* non-AP STA MAC address * non-AP STA MAC address
* Target AP MAC address * Target AP MAC address

5
wpa_supplicant/defconfig
View file

@ -353,10 +353,7 @@ CONFIG_PEERKEY=y
#WIRELESS_DEV=/usr/src/wireless-dev #WIRELESS_DEV=/usr/src/wireless-dev
#CFLAGS += -I$(WIRELESS_DEV)/net/mac80211 #CFLAGS += -I$(WIRELESS_DEV)/net/mac80211
# IEEE 802.11r/D4.1 (Fast BSS Transition) # IEEE Std 802.11r-2008 (Fast BSS Transition)
# This enables an experimental implementation of a draft version of
# IEEE 802.11r. This draft is still subject to change, so it should be noted
# that this version may not comply with the final standard.
#CONFIG_IEEE80211R=y #CONFIG_IEEE80211R=y
# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt) # Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt)