Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 03:00:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(esp_wifi): Harden dpp Auth confirm and drop mismatched auth confirms

Browse Source
This commit is contained in:
Shreyas Sheth
2026-09-21 13:45:49 +05:30
parent 3c97a46d99
commit e5eaadfe90
3 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_wifi/lib
+1 -1
Submodule components/esp_wifi/lib updated: 5ead154e5d...9f5fd97aef
components/wpa_supplicant/esp_supplicant/src/esp_dpp.c
+13 -2
View File
@@ -222,6 +222,7 @@ static void gas_query_req_tx(struct dpp_authentication *auth)
esp_dpp_send_action_frame(auth->peer_mac_addr, wpabuf_head(buf), wpabuf_len(buf),
auth->curr_chan, OFFCHAN_TX_WAIT_TIME,
WIFI_OFFCHAN_TX_REQ);
wpabuf_free(buf);
}
static int esp_dpp_handle_config_obj(struct dpp_authentication *auth,
@@ -291,8 +292,12 @@ static void esp_dpp_rx_auth_conf(struct action_rx_param *rx_param, uint8_t *dpp_
if (os_memcmp(rx_param->sa, auth->peer_mac_addr, ETH_ALEN) != 0) {
wpa_printf(MSG_DEBUG, "DPP: MAC address mismatch (expected "
MACSTR ") - drop", MAC2STR(auth->peer_mac_addr));
rc = ESP_ERR_DPP_FAILURE;
goto fail;
return;
}
if (auth->auth_success || !auth->waiting_auth_conf) {
wpa_printf(MSG_DEBUG, "DPP: Not waiting for Auth Confirm - drop");
return;
}
eloop_cancel_timeout(esp_dpp_auth_conf_wait_timeout, NULL, NULL);
@@ -333,6 +338,11 @@ static esp_err_t esp_dpp_rx_peer_disc_resp(struct action_rx_param *rx_param)
return ESP_ERR_INVALID_ARG;
}
if (!auth) {
wpa_printf(MSG_DEBUG, "DPP: No DPP Authentication in progress - drop");
return ESP_OK;
}
if (rx_param->vendor_data_len < 2) {
wpa_printf(MSG_INFO, "DPP: Too short vendor specific data");
return ESP_FAIL;
@@ -1036,6 +1046,7 @@ esp_err_t esp_dpp_start_net_intro_protocol(uint8_t *bssid)
wpabuf_free(buf);
return ESP_FAIL;
}
wpabuf_free(buf);
} else {
return ESP_ERR_NO_MEM;
}
components/wpa_supplicant/src/common/dpp.c
+6
View File
@@ -2698,6 +2698,12 @@ int dpp_auth_conf_rx(struct dpp_authentication *auth, const u8 *hdr,
return -1;
}
if (!auth->waiting_auth_conf) {
wpa_printf(MSG_DEBUG,
"DPP: Not waiting for Auth Confirm - drop");
return -1;
}
auth->waiting_auth_conf = 0;
wrapped_data = dpp_get_attr(attr_start, attr_len, DPP_ATTR_WRAPPED_DATA,