aboutsummaryrefslogtreecommitdiffstats
path: root/src/rsn_supp
diff options
context:
space:
mode:
authorBen Greear <greearb@candelatech.com>2015-03-17 20:52:29 (GMT)
committerJouni Malinen <j@w1.fi>2015-03-25 14:04:03 (GMT)
commit0f8385e6fabf74ac5c91c3f9a58108e6e89c10a8 (patch)
treeff3e5594490cb46137088bd48188786b725b1235 /src/rsn_supp
parente7b4cd0c554609f6a096719e756f16cb0a8a1dc4 (diff)
downloadhostap-0f8385e6fabf74ac5c91c3f9a58108e6e89c10a8.zip
hostap-0f8385e6fabf74ac5c91c3f9a58108e6e89c10a8.tar.gz
hostap-0f8385e6fabf74ac5c91c3f9a58108e6e89c10a8.tar.bz2
Show OSEN key management properly in scan results
Old code defaulted to WEP for an AP advertising OSEN. Show as OSEN instead. Re-use most of the RSN parsing logic since all but the header is the same. Example output: [root@ath9k-f lanforge]# ./local/bin/wpa_cli -i sta0 scan_results bssid / frequency / signal level / flags / ssid 00:0e:8e:6f:40:49 2462 -23 [OSEN-OSEN-CCMP][ESS] ben-138 Signed-off-by: Ben Greear <greearb@candelatech.com>
Diffstat (limited to 'src/rsn_supp')
-rw-r--r--src/rsn_supp/wpa_ie.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/rsn_supp/wpa_ie.c b/src/rsn_supp/wpa_ie.c
index cb334df..0d96216 100644
--- a/src/rsn_supp/wpa_ie.c
+++ b/src/rsn_supp/wpa_ie.c
@@ -30,6 +30,9 @@ int wpa_parse_wpa_ie(const u8 *wpa_ie, size_t wpa_ie_len,
{
if (wpa_ie_len >= 1 && wpa_ie[0] == WLAN_EID_RSN)
return wpa_parse_wpa_ie_rsn(wpa_ie, wpa_ie_len, data);
+ if (wpa_ie_len >= 6 && wpa_ie[0] == WLAN_EID_VENDOR_SPECIFIC &&
+ wpa_ie[1] >= 4 && WPA_GET_BE32(&wpa_ie[2]) == OSEN_IE_VENDOR_TYPE)
+ return wpa_parse_wpa_ie_rsn(wpa_ie, wpa_ie_len, data);
else
return wpa_parse_wpa_ie_wpa(wpa_ie, wpa_ie_len, data);
}