From a8d2ca9e23a6855fb6910de8491fc599e6f4bc48 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sat, 14 Mar 2020 18:20:31 +0200 Subject: [PATCH] wlantest: Do not report PMF failure without BSS supporting PMF Previously, missing CCMP protection on Robust Management frames was reported based on the STA having indicated MFPC=1. That is not accurate since the AP/BSS may have MFPC=0. Report this failure only if both the AP and STA have indicated MFPC=1, i.e., when PMF has been negotiated for the association. Signed-off-by: Jouni Malinen --- wlantest/rx_mgmt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wlantest/rx_mgmt.c b/wlantest/rx_mgmt.c index 78fd3c80a..ad388e122 100644 --- a/wlantest/rx_mgmt.c +++ b/wlantest/rx_mgmt.c @@ -1646,7 +1646,8 @@ static int check_mgmt_ccmp(struct wlantest *wt, const u8 *data, size_t len) if (sta == NULL) return 0; - if ((sta->rsn_capab & WPA_CAPABILITY_MFPC) && + if ((bss->rsn_capab & WPA_CAPABILITY_MFPC) && + (sta->rsn_capab & WPA_CAPABILITY_MFPC) && (sta->state == STATE3 || WLAN_FC_GET_STYPE(fc) == WLAN_FC_STYPE_ACTION)) { add_note(wt, MSG_INFO, "Robust individually-addressed "