From e0d22c842a34fcf75412f5321c17408f032f6310 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Fri, 27 Sep 2019 01:49:36 +0300 Subject: [PATCH] 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 --- src/rsn_supp/wpa.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c index 637263489..9707ae7ab 100644 --- 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); -- 2.47.2