espressif/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-04-27 19:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/validate_ptk_generation' into 'master'

Browse Source 
fix(esp_wifi): fail if ptk derivation fails

See merge request espressif/esp-idf!47643
This commit is contained in:
Kapil Gupta
2026-04-16 18:47:52 +05:30
parent 2e6e41f615 9dd1c015db
commit ca94acf4de
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/wpa_supplicant/src/rsn_supp/wpa.c
+14 -5
View File
@@ -715,9 +715,9 @@ void wpa_supplicant_process_1_of_4(struct wpa_sm *sm,
#ifdef CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT
if (is_wpa2_enterprise_connection()) {
wpa2_ent_eap_state_t state = eap_client_get_eap_state();
if (state == WPA2_ENT_EAP_STATE_IN_PROGRESS) {
wpa_printf(MSG_INFO, "EAP Success has not been processed yet."
" Drop EAPOL message.");
if (state != WPA2_ENT_EAP_STATE_SUCCESS) {
wpa_printf(MSG_INFO, "EAP not completed (state=%d)."
" Drop EAPOL message.", state);
return;
}
}
@@ -773,7 +773,15 @@ void wpa_supplicant_process_1_of_4(struct wpa_sm *sm,
/* Calculate PTK which will be stored as a temporary PTK until it has
* been verified when processing message 3/4. */
ptk = &sm->tptk;
wpa_derive_ptk(sm, src_addr, key, ptk);
os_memset(ptk, 0, sizeof(*ptk));
if (wpa_derive_ptk(sm, src_addr, key, ptk) < 0) {
wpa_printf(MSG_WARNING,
"WPA: Failed to derive PTK - drop message 1/4");
sm->tptk_set = 0;
sm->ptk_set = 0;
sm->key_install = false;
goto failed;
}
/* Supplicant: swap tx/rx Mic keys */
sm->tptk_set = 1;
sm->ptk_set = 0;
@@ -2393,7 +2401,7 @@ void wpa_sm_set_pmk_from_pmksa(struct wpa_sm *sm)
sm->pmk_len = sm->cur_pmksa->pmk_len;
os_memcpy(sm->pmk, sm->cur_pmksa->pmk, sm->pmk_len);
} else {
sm->pmk_len = PMK_LEN_MAX;
sm->pmk_len = 0;
os_memset(sm->pmk, 0, PMK_LEN_MAX);
}
}
@@ -3258,6 +3266,7 @@ void wpa_sm_drop_sa(struct wpa_sm *sm)
sm->ptk_set = 0;
sm->tptk_set = 0;
sm->pmk_len = 0;
os_memset(sm->pmk, 0, sizeof(sm->pmk));
os_memset(&sm->ptk, 0, sizeof(sm->ptk));
os_memset(&sm->tptk, 0, sizeof(sm->tptk));
os_memset(&sm->gtk, 0, sizeof(sm->gtk));