espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 20:24:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

esp_wifi: backported some wifi fixes (19472381)

Browse Source 
1. G1 rx drop from key install code refactoring
2. Remove group cipher check for PMF connection
This commit is contained in:
Kapil Gupta
2022-08-04 12:15:41 +05:30
parent ca1628b310
commit bdc671aee3
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_wifi/lib

Submodule components/esp_wifi/lib updated: 2c41e8021e...e4d5af0c67

10
components/wpa_supplicant/src/rsn_supp/wpa.c
View File

@@ -654,7 +654,7 @@ failed:
} }
int wpa_supplicant_install_ptk(struct wpa_sm *sm) int wpa_supplicant_install_ptk(struct wpa_sm *sm, int set_tx)
{ {
int keylen; int keylen;
enum wpa_alg alg; enum wpa_alg alg;
@@ -689,7 +689,7 @@ int wpa_supplicant_install_ptk(struct wpa_sm *sm)
//now only use keyentry 0 for pairwise key //now only use keyentry 0 for pairwise key
sm->key_entry_valid = 5; sm->key_entry_valid = 5;
if (wpa_sm_set_key(&(sm->install_ptk), alg, sm->bssid, 0, 1, (sm->install_ptk).seq, WPA_KEY_RSC_LEN, if (wpa_sm_set_key(&(sm->install_ptk), alg, sm->bssid, 0, set_tx, (sm->install_ptk).seq, WPA_KEY_RSC_LEN,
(u8 *) sm->ptk.tk1, keylen,sm->key_entry_valid) < 0) { (u8 *) sm->ptk.tk1, keylen,sm->key_entry_valid) < 0) {
#ifdef DEBUG_PRINT #ifdef DEBUG_PRINT
wpa_printf(MSG_DEBUG, "WPA: Failed to set PTK to the " wpa_printf(MSG_DEBUG, "WPA: Failed to set PTK to the "
@@ -1271,6 +1271,10 @@ int ieee80211w_set_keys(struct wpa_sm *sm,
goto failed; goto failed;
} }
if (sm->key_install && sm->key_info & WPA_KEY_INFO_INSTALL) {
wpa_supplicant_install_ptk(sm, 0);
}
/*after txover, callback will continue run remain task*/ /*after txover, callback will continue run remain task*/
if (wpa_supplicant_send_4_of_4(sm, sm->bssid, key, ver, key_info, if (wpa_supplicant_send_4_of_4(sm, sm->bssid, key, ver, key_info,
NULL, 0, &sm->ptk)) { NULL, 0, &sm->ptk)) {
@@ -1289,7 +1293,7 @@ failed:
u16 key_info=sm->key_info; u16 key_info=sm->key_info;
if (sm->key_install && key_info & WPA_KEY_INFO_INSTALL) { if (sm->key_install && key_info & WPA_KEY_INFO_INSTALL) {
if (wpa_supplicant_install_ptk(sm)) if (wpa_supplicant_install_ptk(sm, 2))
goto failed; goto failed;
} }
else if (sm->key_install == false) { else if (sm->key_install == false) {