blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-10 01:29:21 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/wps_wpa3_passphrase_v5.0' into 'release/v5.0'

Browse Source 
WiFi: get passphrase in WPS if AP support SAE (v5.0)

See merge request espressif/esp-idf!25886
This commit is contained in:
Jiang Jiang Jian 2023-09-21 10:54:06 +08:00
commit c4d7be43ed
1 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2019-2023 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@ -345,6 +345,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
wps_parse_scan_result(struct wps_scan_ie *scan)
{
@ -414,10 +431,17 @@ wps_parse_scan_result(struct wps_scan_ie *scan)
os_memcpy(sm->ssid[0], (char *)&scan->ssid[2], (int)scan->ssid[1]);
sm->ssid_len[0] = scan->ssid[1];
if (scan->bssid && memcmp(sm->bssid, scan->bssid, ETH_ALEN) != 0) {
wpa_printf(MSG_INFO, "sm BSSid: "MACSTR " scan BSSID " MACSTR "\n",
wpa_printf(MSG_INFO, "sm BSSid: "MACSTR " scan BSSID " MACSTR,
MAC2STR(sm->bssid), MAC2STR(scan->bssid));
sm->discover_ssid_cnt++;
os_memcpy(sm->bssid, scan->bssid, ETH_ALEN);
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->ssid);
sm->channel = scan->chan;
@ -564,7 +588,7 @@ int wps_process_wps_mX_req(u8 *ubuf, int len, enum wps_process_res *res)
int frag_len;
u16 be_tot_len = 0;
if (!sm) {
if (!sm || !res) {
return ESP_FAIL;
}
@ -611,9 +635,7 @@ int wps_process_wps_mX_req(u8 *ubuf, int len, enum wps_process_res *res)
return ESP_FAIL;
}
if (flag & WPS_MSG_FLAG_MORE) {
if (res) {
*res = WPS_FRAGMENT;
}
*res = WPS_FRAGMENT;
return ESP_OK;
}
} else { //not frag msg
@ -631,13 +653,9 @@ int wps_process_wps_mX_req(u8 *ubuf, int len, enum wps_process_res *res)
eloop_cancel_timeout(wifi_station_wps_msg_timeout, NULL, NULL);
if (res) {
*res = wps_enrollee_process_msg(sm->wps, expd->opcode, wps_buf);
} else {
wps_enrollee_process_msg(sm->wps, expd->opcode, wps_buf);
}
*res = wps_enrollee_process_msg(sm->wps, expd->opcode, wps_buf);
if (res && *res == WPS_FAILURE) {
if (*res == WPS_FAILURE) {
sm->state = WPA_FAIL;
}
@ -680,7 +698,6 @@ int wps_send_wps_mX_rsp(u8 id)
wpabuf_put_u8(eap_buf, 0x00); /* flags */
wpabuf_put_data(eap_buf, wpabuf_head_u8(wps_buf), wpabuf_len(wps_buf));
wpabuf_free(wps_buf);
buf = wps_sm_alloc_eapol(sm, IEEE802_1X_TYPE_EAP_PACKET, wpabuf_head_u8(eap_buf), wpabuf_len(eap_buf), (size_t *)&len, NULL);
@ -1037,22 +1054,17 @@ int wps_sm_rx_eapol_internal(u8 *src_addr, u8 *buf, u32 len)
break;
case EAP_TYPE_EXPANDED:
wpa_printf(MSG_DEBUG, "=========expanded plen[%" PRId32 "], %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;
tmp = (u8 *)(ehdr + 1) + 1;
ret = wps_process_wps_mX_req(tmp, plen - sizeof(*ehdr) - 1, &res);
if (ret == 0 && res != WPS_FAILURE && res != WPS_FRAGMENT) {
if (ret == ESP_OK && res != WPS_FAILURE && res != WPS_FRAGMENT) {
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);
wps_start_msg_timer();
}
} else if (ret == 0 && res == WPS_FRAGMENT) {
} else if (ret == ESP_OK && res == WPS_FRAGMENT) {
wpa_printf(MSG_DEBUG, "wps frag, continue...");
ret = ESP_OK;
} else {