From: Jouni Malinen <jouni.malinen@atheros.com>
Date: Mon, 17 Jan 2011 17:52:35 +0000 (+0200)
Subject: wlantest: Check WPA/RSN IE match between AssocReq and Beacon
X-Git-Tag: hostap-1-bp~631
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2caf69247bf45ffc67054561d3cfbb1816c86e12;p=thirdparty%2Fhostap.git

wlantest: Check WPA/RSN IE match between AssocReq and Beacon

Note unexpected WPA/RSN IE in AssocReq and ignore them if the last
Beacon/ProbeResp from the AP is not advertising support for
WPA/RSN.
---

diff --git a/wlantest/sta.c b/wlantest/sta.c
index 6e012b8cb..4b5d16dee 100644
--- a/wlantest/sta.c
+++ b/wlantest/sta.c
@@ -72,6 +72,22 @@ void sta_update_assoc(struct wlantest_sta *sta, struct ieee802_11_elems *elems)
 	struct wpa_ie_data data;
 	struct wlantest_bss *bss = sta->bss;
 
+	if (elems->wpa_ie && !bss->wpaie[0]) {
+		wpa_printf(MSG_INFO, "WPA IE included in Association Request "
+			   "frame from " MACSTR " even though BSS does not "
+			   "use WPA - ignore IE",
+			   MAC2STR(sta->addr));
+		elems->wpa_ie = NULL;
+	}
+
+	if (elems->rsn_ie && !bss->rsnie[0]) {
+		wpa_printf(MSG_INFO, "RSN IE included in Association Request "
+			   "frame from " MACSTR " even though BSS does not "
+			   "use RSN - ignore IE",
+			   MAC2STR(sta->addr));
+		elems->rsn_ie = NULL;
+	}
+
 	if (elems->wpa_ie && elems->rsn_ie) {
 		wpa_printf(MSG_INFO, "Both WPA IE and RSN IE included in "
 			   "Association Request frame from " MACSTR,