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 <jouni@codeaurora.org>
This commit is contained in:
Jouni Malinen 2018-01-12 01:12:00 +02:00
parent 9cc8303d32
commit feba5848be
2 changed files with 3 additions and 3 deletions

View file

@ -319,8 +319,8 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
reason = WLAN_REASON_INVALID_IE; reason = WLAN_REASON_INVALID_IE;
status = WLAN_STATUS_INVALID_IE; status = WLAN_STATUS_INVALID_IE;
} else if (res == WPA_INVALID_MGMT_GROUP_CIPHER) { } else if (res == WPA_INVALID_MGMT_GROUP_CIPHER) {
reason = WLAN_REASON_GROUP_CIPHER_NOT_VALID; reason = WLAN_REASON_CIPHER_SUITE_REJECTED;
status = WLAN_STATUS_GROUP_CIPHER_NOT_VALID; status = WLAN_STATUS_CIPHER_REJECTED_PER_POLICY;
} }
#endif /* CONFIG_IEEE80211W */ #endif /* CONFIG_IEEE80211W */
else { else {

View file

@ -1072,7 +1072,7 @@ static u16 wpa_res_to_status_code(int res)
if (res == WPA_MGMT_FRAME_PROTECTION_VIOLATION) if (res == WPA_MGMT_FRAME_PROTECTION_VIOLATION)
return WLAN_STATUS_ROBUST_MGMT_FRAME_POLICY_VIOLATION; return WLAN_STATUS_ROBUST_MGMT_FRAME_POLICY_VIOLATION;
if (res == WPA_INVALID_MGMT_GROUP_CIPHER) 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 */ #endif /* CONFIG_IEEE80211W */
if (res == WPA_INVALID_MDIE) if (res == WPA_INVALID_MDIE)
return WLAN_STATUS_INVALID_MDIE; return WLAN_STATUS_INVALID_MDIE;