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(nan): source group_mgmt_prot from start config, not blob read-back

Browse Source 
esp_nan_action_start() read group_mgmt_prot back from the blob via
esp_wifi_get_config() and defaulted to true when the read failed, which
force-enabled device-global IGTK/BIGTK (BIP beacons, forced GTKSA) on a
path where the user's intent is unknown. group_mgmt_prot is a pure
pass-through user flag, so capture it directly into s_nan_ctx from the
config in esp_wifi_nan_sync_start() (next to use_nvs_for_caching) and drop
the read-back and its ambiguous default. Behaviour now follows the user's
config exactly (default false via WIFI_NAN_SYNC_CONFIG_DEFAULT).
This commit is contained in:
Sarvesh Bodakhe
2026-07-01 18:12:24 +05:30
parent a870826c5a
commit d0e2943621
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_wifi/wifi_apps/nan_app/src/nan_app.c
+4 -11
View File
@@ -1845,17 +1845,9 @@ void esp_nan_action_start(esp_netif_t *nan_netif)
esp_nan_internal_register_callbacks(&nan_cb); esp_nan_internal_register_callbacks(&nan_cb);
#ifdef CONFIG_ESP_WIFI_NAN_SECURITY #ifdef CONFIG_ESP_WIFI_NAN_SECURITY
/* Device-global group-management protection (IGTKSA/BIGTKSA), one per NMI, /* s_nan_ctx.group_mgmt_prot (device-global IGTKSA/BIGTKSA, one per NMI) was
* sourced from the NAN start config (wifi_nan_sync_config_t.group_mgmt_prot). * captured from the user's start config in esp_wifi_nan_sync_start().
* The blob stores it at nan_start; we read it back here. Default on if the * Install the device-global IGTK/BIGTK for TX now (when enabled) so Beacons
* config can't be read, preserving protected-by-default behavior. */
{
wifi_config_t nan_cfg = {0};
s_nan_ctx.group_mgmt_prot =
(esp_wifi_get_config(WIFI_IF_NAN, &nan_cfg) == ESP_OK)
? nan_cfg.nan.group_mgmt_prot : true;
}
/* Install the device-global IGTK/BIGTK for TX now (when enabled) so Beacons
* (BIGTK) and group-addressed SDFs (IGTK) are BIP-protected from the first * (BIGTK) and group-addressed SDFs (IGTK) are BIP-protected from the first
* frame, like iOS. The blob gates beacon BIP-TX on an active BIGTK index * frame, like iOS. The blob gates beacon BIP-TX on an active BIGTK index
* only (no NDP state), so installing here is sufficient. */ * only (no NDP state), so installing here is sufficient. */
@@ -1939,6 +1931,7 @@ esp_err_t esp_wifi_nan_sync_start(const wifi_nan_sync_config_t *nan_cfg)
s_nan_ctx.num_peer_creds = 0; s_nan_ctx.num_peer_creds = 0;
memset(s_nan_ctx.peer_creds, 0, sizeof(s_nan_ctx.peer_creds)); memset(s_nan_ctx.peer_creds, 0, sizeof(s_nan_ctx.peer_creds));
s_nan_ctx.use_nvs_for_caching = nan_cfg->use_nvs_for_caching; s_nan_ctx.use_nvs_for_caching = nan_cfg->use_nvs_for_caching;
s_nan_ctx.group_mgmt_prot = nan_cfg->group_mgmt_prot;
s_nan_ctx.nik_lifetime = 0; s_nan_ctx.nik_lifetime = 0;
if (nan_cfg->reset_current_nvs_creds) { if (nan_cfg->reset_current_nvs_creds) {