FILS+FT: Fix MFPR flag in RSNE during FILS exchange for FT

Commit e820cf952f ("MFP: Add MFPR flag into station RSN IE if 802.11w
is mandatory") added indication of MFPR flag in non-FT cases and was
further extended to cover FT protocol in commit ded56f2faf ("FT: Fix
MFPR flag in RSNE during FT protocol"). Similar fix is needed for
FILS+FT as well.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
Jouni Malinen 2019-09-27 01:49:36 +03:00 committed by Jouni Malinen
parent be907f7220
commit e0d22c842a

View file

@ -3996,8 +3996,10 @@ static int fils_ft_build_assoc_req_rsne(struct wpa_sm *sm, struct wpabuf *buf)
/* RSN Capabilities */ /* RSN Capabilities */
capab = 0; capab = 0;
if (sm->mgmt_group_cipher == WPA_CIPHER_AES_128_CMAC) if (sm->mfp)
capab |= WPA_CAPABILITY_MFPC; capab |= WPA_CAPABILITY_MFPC;
if (sm->mfp == 2)
capab |= WPA_CAPABILITY_MFPR;
if (sm->ocv) if (sm->ocv)
capab |= WPA_CAPABILITY_OCVC; capab |= WPA_CAPABILITY_OCVC;
wpabuf_put_le16(buf, capab); wpabuf_put_le16(buf, capab);