espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 10:47:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(wpa_supplicant): Detect PBC overlap even when UUID is null

Browse Source
This commit is contained in:
akshat
2025-04-02 15:10:00 +05:30
committed by BOT
parent c99c80c1d0
commit 91da4ea792
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/wpa_supplicant/esp_supplicant/src/esp_wps.c
View File

@ -349,7 +349,7 @@ is_wps_pbc_overlap(struct wps_sm *sm, const u8 *sel_uuid)
{ {
if (!sel_uuid) { if (!sel_uuid) {
wpa_printf(MSG_DEBUG, "WPS: null uuid field"); wpa_printf(MSG_DEBUG, "WPS: null uuid field");
return false; return true;
} }
if (os_memcmp(sel_uuid, sm->uuid_r, WPS_UUID_LEN) != 0) { if (os_memcmp(sel_uuid, sm->uuid_r, WPS_UUID_LEN) != 0) {
@ -370,7 +370,7 @@ wps_parse_scan_result(struct wps_scan_ie *scan)
struct wps_sm *sm = gWpsSm; struct wps_sm *sm = gWpsSm;
wifi_mode_t op_mode = 0; wifi_mode_t op_mode = 0;
if(sm->wps_pbc_overlap) { if (sm->wps_pbc_overlap) {
return false; return false;
} }
@ -445,11 +445,13 @@ wps_parse_scan_result(struct wps_scan_ie *scan)
os_memcpy(sm->bssid, scan->bssid, ETH_ALEN); os_memcpy(sm->bssid, scan->bssid, ETH_ALEN);
scan_uuid = wps_get_uuid_e(buf); scan_uuid = wps_get_uuid_e(buf);
if (sm->discover_ssid_cnt > 1 && wps_get_type() == WPS_TYPE_PBC && is_wps_pbc_overlap(sm, scan_uuid) == true) {
wpa_printf(MSG_INFO, "pbc_overlap flag is true");
sm->wps_pbc_overlap = true;
wpabuf_free(buf);
return false;
}
if (scan_uuid) { if (scan_uuid) {
if (sm->discover_ssid_cnt > 1 && wps_get_type() == WPS_TYPE_PBC && is_wps_pbc_overlap(sm, scan_uuid) == true) {
wpa_printf(MSG_INFO, "pbc_overlap flag is true");
sm->wps_pbc_overlap = true;
}
os_memcpy(sm->uuid_r, scan_uuid, WPS_UUID_LEN); os_memcpy(sm->uuid_r, scan_uuid, WPS_UUID_LEN);
} }