From feba5848bef4be9edbd91e30da0459d61021fbba Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Fri, 12 Jan 2018 01:12:00 +0200 Subject: [PATCH] Replace RSNE group key management mismatch status/reason codes Use "cipher out of policy" value instead of invalid group cipher (which is for the group data frame cipher) and management frame policy violation (which is used for MFPC/MFPR mismatch). Signed-off-by: Jouni Malinen --- src/ap/drv_callbacks.c | 4 ++-- src/ap/ieee802_11.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c index 4858cd5dc..f81f640b0 100644 --- a/src/ap/drv_callbacks.c +++ b/src/ap/drv_callbacks.c @@ -319,8 +319,8 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr, reason = WLAN_REASON_INVALID_IE; status = WLAN_STATUS_INVALID_IE; } else if (res == WPA_INVALID_MGMT_GROUP_CIPHER) { - reason = WLAN_REASON_GROUP_CIPHER_NOT_VALID; - status = WLAN_STATUS_GROUP_CIPHER_NOT_VALID; + reason = WLAN_REASON_CIPHER_SUITE_REJECTED; + status = WLAN_STATUS_CIPHER_REJECTED_PER_POLICY; } #endif /* CONFIG_IEEE80211W */ else { diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c index 27520fee5..89fe27962 100644 --- a/src/ap/ieee802_11.c +++ b/src/ap/ieee802_11.c @@ -1072,7 +1072,7 @@ static u16 wpa_res_to_status_code(int res) if (res == WPA_MGMT_FRAME_PROTECTION_VIOLATION) return WLAN_STATUS_ROBUST_MGMT_FRAME_POLICY_VIOLATION; if (res == WPA_INVALID_MGMT_GROUP_CIPHER) - return WLAN_STATUS_ROBUST_MGMT_FRAME_POLICY_VIOLATION; + return WLAN_STATUS_CIPHER_REJECTED_PER_POLICY; #endif /* CONFIG_IEEE80211W */ if (res == WPA_INVALID_MDIE) return WLAN_STATUS_INVALID_MDIE;