]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
wlantest: Check WPA/RSN IE match between AssocReq and Beacon
authorJouni Malinen <jouni.malinen@atheros.com>
Mon, 17 Jan 2011 17:52:35 +0000 (19:52 +0200)
committerJouni Malinen <j@w1.fi>
Mon, 17 Jan 2011 17:52:35 +0000 (19:52 +0200)
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.

wlantest/sta.c

index 6e012b8cb7f7ad5fec595257ea507ca59aee0456..4b5d16deea24708afa080c8f75be37c2c4a627e3 100644 (file)
@@ -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,