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

Merge branch 'bugfix/fix_pmksa_cache_expired_after_sntp_issue_v5.3' into 'release/v5.3'

Browse Source 
Bugfix/fix pmksa cache expired after sntp issue v5.3(Backport v5.3)

See merge request espressif/esp-idf!40701
This commit is contained in:
Jiang Jiang Jian
2025-07-19 09:06:03 +08:00
parent cb1f35027f dfe0c15f90
commit 30c47e8cef
5 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld
View File

@@ -109,6 +109,7 @@ ieee80211_output_do = 0x4000210c;
ieee80211_send_nulldata = 0x40002110; ieee80211_send_nulldata = 0x40002110;
//ieee80211_setup_robust_mgmtframe = 0x40002114; //ieee80211_setup_robust_mgmtframe = 0x40002114;
//ieee80211_mgmt_output = 0x40002118; //ieee80211_mgmt_output = 0x40002118;
ieee80211_encap_null_data = 0x4000211c;
//ieee80211_send_deauth_no_bss = 0x40002120; //ieee80211_send_deauth_no_bss = 0x40002120;
//ieee80211_tx_mgt_cb = 0x4000212c; //ieee80211_tx_mgt_cb = 0x4000212c;
//sta_rx_csa = 0x40002134; //sta_rx_csa = 0x40002134;

2
components/esp_rom/esp32c2/ld/esp32c2.rom.ld
View File

@@ -940,7 +940,7 @@ ieee80211_alloc_tx_buf = 0x40002108;
/* ieee80211_output_do = 0x4000210c; */ /* ieee80211_output_do = 0x4000210c; */
/* ieee80211_send_nulldata = 0x40002110; */ /* ieee80211_send_nulldata = 0x40002110; */
/* ieee80211_setup_robust_mgmtframe = 0x40002114; */ /* ieee80211_setup_robust_mgmtframe = 0x40002114; */
ieee80211_encap_null_data = 0x4000211c; /* ieee80211_encap_null_data = 0x4000211c; */
//ieee80211_send_deauth_no_bss = 0x40002120; //ieee80211_send_deauth_no_bss = 0x40002120;
ieee80211_alloc_deauth = 0x40002124; ieee80211_alloc_deauth = 0x40002124;
ieee80211_send_proberesp = 0x40002128; ieee80211_send_proberesp = 0x40002128;

2
components/wpa_supplicant/src/ap/pmksa_cache_auth.c
View File

@@ -19,7 +19,7 @@
#include "ap/ieee802_1x.h" #include "ap/ieee802_1x.h"
static const int pmksa_cache_max_entries = 10; static const int pmksa_cache_max_entries = 10;
static const int dot11RSNAConfigPMKLifetime = 8640000; static const int dot11RSNAConfigPMKLifetime = INT32_MAX;
struct rsn_pmksa_cache { struct rsn_pmksa_cache {

5
components/wpa_supplicant/src/rsn_supp/pmksa_cache.c
View File

@@ -18,7 +18,7 @@
#ifdef IEEE8021X_EAPOL #ifdef IEEE8021X_EAPOL
static const int pmksa_cache_max_entries = 10; static const int pmksa_cache_max_entries = 10;
static const int dot11RSNAConfigPMKLifetime = 8640000; // 100 days = 3600 x 24 x 100 Seconds static const int dot11RSNAConfigPMKLifetime = INT32_MAX;
static const int dot11RSNAConfigPMKReauthThreshold = 70; static const int dot11RSNAConfigPMKReauthThreshold = 70;
struct rsn_pmksa_cache { struct rsn_pmksa_cache {
@@ -133,8 +133,7 @@ pmksa_cache_add(struct rsn_pmksa_cache *pmksa, const u8 *pmk, size_t pmk_len,
os_get_reltime(&now); os_get_reltime(&now);
entry->expiration = now.sec + dot11RSNAConfigPMKLifetime; entry->expiration = now.sec + dot11RSNAConfigPMKLifetime;
entry->reauth_time = now.sec + dot11RSNAConfigPMKLifetime * entry->reauth_time = now.sec + dot11RSNAConfigPMKLifetime / 100 * dot11RSNAConfigPMKReauthThreshold;
dot11RSNAConfigPMKReauthThreshold / 100;
entry->akmp = akmp; entry->akmp = akmp;
os_memcpy(entry->aa, aa, ETH_ALEN); os_memcpy(entry->aa, aa, ETH_ALEN);
entry->network_ctx = network_ctx; entry->network_ctx = network_ctx;

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

@@ -375,8 +375,14 @@ static void wpa_sm_pmksa_free_cb(struct rsn_pmksa_cache_entry *entry,
} }
if (deauth) { if (deauth) {
/* For upstream supplicant, reconnection is handled internally, whereas in ESP-IDF, the user needs to initiate a new connection.
To mitigate this, simply flush the PMK without disconnecting. This will prevent the device from disconnecting,
while allowing it to derive a new PMK during the next connection attempt. */
#ifndef ESP_SUPPLICANT
os_memset(sm->pmk, 0, sizeof(sm->pmk)); os_memset(sm->pmk, 0, sizeof(sm->pmk));
wpa_sm_deauthenticate(sm, WLAN_REASON_UNSPECIFIED); wpa_sm_deauthenticate(sm, WLAN_REASON_UNSPECIFIED);
#endif
} }
} }