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

Commit e820cf952f29 ("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 ded56f2fafb0 ("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>

diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
index 6372634892945738b8579608ac0d39d0bac1c24c..9707ae7ab6f307ad390dd7801f840ab637df6e05 100644 (file)
--- a/src/rsn_supp/wpa.c
+++ b/src/rsn_supp/wpa.c
@@ -3996,8 +3996,10 @@ static int fils_ft_build_assoc_req_rsne(struct wpa_sm *sm, struct wpabuf *buf)
 
        /* RSN Capabilities */
        capab = 0;
-       if (sm->mgmt_group_cipher == WPA_CIPHER_AES_128_CMAC)
+       if (sm->mfp)
                capab |= WPA_CAPABILITY_MFPC;
+       if (sm->mfp == 2)
+               capab |= WPA_CAPABILITY_MFPR;
        if (sm->ocv)
                capab |= WPA_CAPABILITY_OCVC;
        wpabuf_put_le16(buf, capab);