alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix(wifi): Get passphrase in WPS if AP support SAE

Browse Source 
Also add changes to send NACK if WPS message received twice.
This commit is contained in:
Kapil Gupta 2023-09-08 15:30:49 +05:30 committed by BOT
parent 6c9e406d67
commit 61e344a057
1 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -544,6 +544,23 @@ wps_build_ic_appie_wps_ar(void)
} }
} }
static bool ap_supports_sae(struct wps_scan_ie *scan)
{
struct wpa_ie_data rsn_info;
if (!scan->rsn) {
return false;
}
wpa_parse_wpa_ie_rsn(scan->rsn, scan->rsn[1] + 2, &rsn_info);
if (rsn_info.key_mgmt & WPA_KEY_MGMT_SAE) {
return true;
}
return false;
}
static bool static bool
wps_parse_scan_result(struct wps_scan_ie *scan) wps_parse_scan_result(struct wps_scan_ie *scan)
{ {
@ -620,11 +637,18 @@ wps_parse_scan_result(struct wps_scan_ie *scan)
os_memset(sm->config.ssid, 0, sizeof(sm->config.ssid)); os_memset(sm->config.ssid, 0, sizeof(sm->config.ssid));
os_memcpy(sm->config.ssid, (char *)&scan->ssid[2], (int)scan->ssid[1]); os_memcpy(sm->config.ssid, (char *)&scan->ssid[2], (int)scan->ssid[1]);
if (scan->bssid && memcmp(sm->config.bssid, scan->bssid, ETH_ALEN) != 0) { if (scan->bssid && memcmp(sm->config.bssid, scan->bssid, ETH_ALEN) != 0) {
printf("sm BSSid: "MACSTR " scan BSSID " MACSTR "\n", MAC2STR(sm->config.bssid), MAC2STR(scan->bssid)); printf("sm BSSid: "MACSTR " scan BSSID " MACSTR, MAC2STR(sm->config.bssid), MAC2STR(scan->bssid));
sm->discover_ssid_cnt++; sm->discover_ssid_cnt++;
os_memcpy(sm->bssid, scan->bssid, ETH_ALEN); os_memcpy(sm->bssid, scan->bssid, ETH_ALEN);
os_memcpy(sm->config.bssid, scan->bssid, ETH_ALEN); os_memcpy(sm->config.bssid, scan->bssid, ETH_ALEN);
sm->config.bssid_set = 1; sm->config.bssid_set = 1;
if (ap_supports_sae(scan)) {
wpa_printf(MSG_INFO, "AP supports SAE, get password in passphrase");
sm->dev->config_methods |= WPS_CONFIG_DISPLAY | WPS_CONFIG_VIRT_DISPLAY;
sm->wps->wps->config_methods |= WPS_CONFIG_DISPLAY | WPS_CONFIG_VIRT_DISPLAY;
/* Reset assoc req, probe reset not needed */
wps_build_ic_appie_wps_ar();
}
} }
wpa_printf(MSG_DEBUG, "wps discover [%s]", (char *)sm->config.ssid); wpa_printf(MSG_DEBUG, "wps discover [%s]", (char *)sm->config.ssid);
sm->channel = scan->chan; sm->channel = scan->chan;
@ -789,7 +813,7 @@ int wps_process_wps_mX_req(u8 *ubuf, int len, enum wps_process_res *res)
int frag_len; int frag_len;
u16 be_tot_len = 0; u16 be_tot_len = 0;
if (!sm) { if (!sm || *res) {
return ESP_FAIL; return ESP_FAIL;
} }
@ -836,9 +860,7 @@ int wps_process_wps_mX_req(u8 *ubuf, int len, enum wps_process_res *res)
return ESP_FAIL; return ESP_FAIL;
} }
if (flag & WPS_MSG_FLAG_MORE) { if (flag & WPS_MSG_FLAG_MORE) {
if (res) {
*res = WPS_FRAGMENT; *res = WPS_FRAGMENT;
}
return ESP_OK; return ESP_OK;
} }
} else { //not frag msg } else { //not frag msg
@ -856,13 +878,9 @@ int wps_process_wps_mX_req(u8 *ubuf, int len, enum wps_process_res *res)
ets_timer_disarm(&sm->wps_msg_timeout_timer); ets_timer_disarm(&sm->wps_msg_timeout_timer);
if (res) {
*res = wps_enrollee_process_msg(sm->wps, expd->opcode, wps_buf); *res = wps_enrollee_process_msg(sm->wps, expd->opcode, wps_buf);
} else {
wps_enrollee_process_msg(sm->wps, expd->opcode, wps_buf);
}
if (res && *res == WPS_FAILURE) { if (*res == WPS_FAILURE) {
sm->state = WPA_FAIL; sm->state = WPA_FAIL;
} }
@ -1267,27 +1285,21 @@ int wps_sm_rx_eapol_internal(u8 *src_addr, u8 *buf, u32 len)
break; break;
case EAP_TYPE_EXPANDED: case EAP_TYPE_EXPANDED:
wpa_printf(MSG_DEBUG, "=========expanded plen[%d], %d===========", plen, sizeof(*ehdr)); wpa_printf(MSG_DEBUG, "=========expanded plen[%d], %d===========", plen, sizeof(*ehdr));
if (ehdr->identifier == sm->current_identifier) {
ret = 0;
wpa_printf(MSG_DEBUG, "wps: ignore overlap identifier");
goto out;
}
sm->current_identifier = ehdr->identifier; sm->current_identifier = ehdr->identifier;
tmp = (u8 *)(ehdr + 1) + 1; tmp = (u8 *)(ehdr + 1) + 1;
ret = wps_process_wps_mX_req(tmp, plen - sizeof(*ehdr) - 1, &res); ret = wps_process_wps_mX_req(tmp, plen - sizeof(*ehdr) - 1, &res);
if (ret == 0 && res != WPS_FAILURE && res != WPS_IGNORE && res != WPS_FRAGMENT) { if (res == WPS_IGNORE || res == WPS_FRAGMENT) {
wpa_printf(MSG_DEBUG, "IGNORE overlap/wps frag %d", res);
ret = ESP_OK;
break;
}
if (ret == ESP_OK && res != WPS_FAILURE) {
ret = wps_send_wps_mX_rsp(ehdr->identifier); ret = wps_send_wps_mX_rsp(ehdr->identifier);
if (ret == 0) { if (ret == ESP_OK) {
wpa_printf(MSG_DEBUG, "sm->wps->state = %d", sm->wps->state); wpa_printf(MSG_DEBUG, "sm->wps->state = %d", sm->wps->state);
wps_start_msg_timer(); wps_start_msg_timer();
} }
} else if (ret == 0 && res == WPS_FRAGMENT) {
wpa_printf(MSG_DEBUG, "wps frag, continue...");
ret = ESP_OK;
} else if (res == WPS_IGNORE) {
wpa_printf(MSG_DEBUG, "IGNORE overlap Mx");
ret = ESP_OK; /* IGNORE the overlap */
} else { } else {
ret = ESP_FAIL; ret = ESP_FAIL;
} }