|
@@ -2366,6 +2366,14 @@ static char * wpa_supplicant_ie_txt(char *pos, char *end, const char *proto,
|
|
|
}
|
|
|
#endif /* CONFIG_SUITEB192 */
|
|
|
|
|
|
+ if (data.key_mgmt & WPA_KEY_MGMT_OSEN) {
|
|
|
+ ret = os_snprintf(pos, end - pos, "%sOSEN",
|
|
|
+ pos == start ? "" : "+");
|
|
|
+ if (os_snprintf_error(end - pos, ret))
|
|
|
+ return pos;
|
|
|
+ pos += ret;
|
|
|
+ }
|
|
|
+
|
|
|
pos = wpa_supplicant_cipher_txt(pos, end, data.pairwise_cipher);
|
|
|
|
|
|
if (data.capabilities & WPA_CAPABILITY_PREAUTH) {
|
|
@@ -2433,7 +2441,7 @@ static int wpa_supplicant_ctrl_iface_scan_result(
|
|
|
{
|
|
|
char *pos, *end;
|
|
|
int ret;
|
|
|
- const u8 *ie, *ie2, *p2p, *mesh;
|
|
|
+ const u8 *ie, *ie2, *osen_ie, *p2p, *mesh;
|
|
|
|
|
|
mesh = wpa_bss_get_ie(bss, WLAN_EID_MESH_ID);
|
|
|
p2p = wpa_bss_get_vendor_ie(bss, P2P_IE_VENDOR_TYPE);
|
|
@@ -2460,8 +2468,12 @@ static int wpa_supplicant_ctrl_iface_scan_result(
|
|
|
pos = wpa_supplicant_ie_txt(pos, end, mesh ? "RSN" : "WPA2",
|
|
|
ie2, 2 + ie2[1]);
|
|
|
}
|
|
|
+ osen_ie = wpa_bss_get_vendor_ie(bss, OSEN_IE_VENDOR_TYPE);
|
|
|
+ if (osen_ie)
|
|
|
+ pos = wpa_supplicant_ie_txt(pos, end, "OSEN",
|
|
|
+ osen_ie, 2 + osen_ie[1]);
|
|
|
pos = wpa_supplicant_wps_ie_txt(wpa_s, pos, end, bss);
|
|
|
- if (!ie && !ie2 && bss->caps & IEEE80211_CAP_PRIVACY) {
|
|
|
+ if (!ie && !ie2 && !osen_ie && (bss->caps & IEEE80211_CAP_PRIVACY)) {
|
|
|
ret = os_snprintf(pos, end - pos, "[WEP]");
|
|
|
if (os_snprintf_error(end - pos, ret))
|
|
|
return -1;
|
|
@@ -3937,7 +3949,7 @@ static int print_bss_info(struct wpa_supplicant *wpa_s, struct wpa_bss *bss,
|
|
|
size_t i;
|
|
|
int ret;
|
|
|
char *pos, *end;
|
|
|
- const u8 *ie, *ie2;
|
|
|
+ const u8 *ie, *ie2, *osen_ie;
|
|
|
|
|
|
pos = buf;
|
|
|
end = buf + buflen;
|
|
@@ -4054,8 +4066,13 @@ static int print_bss_info(struct wpa_supplicant *wpa_s, struct wpa_bss *bss,
|
|
|
if (ie2)
|
|
|
pos = wpa_supplicant_ie_txt(pos, end, "WPA2", ie2,
|
|
|
2 + ie2[1]);
|
|
|
+ osen_ie = wpa_bss_get_vendor_ie(bss, OSEN_IE_VENDOR_TYPE);
|
|
|
+ if (osen_ie)
|
|
|
+ pos = wpa_supplicant_ie_txt(pos, end, "OSEN",
|
|
|
+ osen_ie, 2 + osen_ie[1]);
|
|
|
pos = wpa_supplicant_wps_ie_txt(wpa_s, pos, end, bss);
|
|
|
- if (!ie && !ie2 && bss->caps & IEEE80211_CAP_PRIVACY) {
|
|
|
+ if (!ie && !ie2 && !osen_ie &&
|
|
|
+ (bss->caps & IEEE80211_CAP_PRIVACY)) {
|
|
|
ret = os_snprintf(pos, end - pos, "[WEP]");
|
|
|
if (os_snprintf_error(end - pos, ret))
|
|
|
return 0;
|