Merge branch 'feature/disable_pmk_caching_v5.2' into 'release/v5.2'

feat(esp_wifi): Provide API to disable PMK caching (v5.2)

See merge request espressif/esp-idf!30289

components/wpa_supplicant/esp_supplicant/include/esp_wpa.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2019-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -57,6 +57,22 @@ esp_err_t esp_supplicant_init(void);
   */
 esp_err_t esp_supplicant_deinit(void);
 
+/**
+ * @brief Disable or enable the caching of Pairwise Master Keys (PMK) in the supplicant.
+ *
+ * This function allows disabling or enabling the caching of Pairwise Master Keys (PMK).
+ * PMK caching is used in Wi-Fi Protected Access (WPA/WPA2/WPA3) networks to speed up the reconnection process
+ * by storing the PMK generated during the initial connection. Disabling PMK caching may result in slightly
+ * longer reconnection times. PMK caching is enabled by default, this configuration has been provided
+ * in case the AP is known not to support PMK caching or has a buggy implementation for PMK caching.
+ *
+ * @param disable Boolean indicating whether to disable (true) or enable (false) PMK caching.
+ * @return
+ *     - ESP_OK: Success
+ *     - An error code if disabling or enabling PMK caching fails.
+ */
+esp_err_t esp_supplicant_disable_pmk_caching(bool disable);
+
 /**
   * @}
   */

components/wpa_supplicant/esp_supplicant/src/esp_eap_client.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2019-2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2019-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */

components/wpa_supplicant/esp_supplicant/src/esp_wpa_main.c

@@ -40,6 +40,7 @@
 #include "wps/wps_defs.h"
 #include "wps/wps.h"
 
+bool g_wpa_pmk_caching_disabled = 0;
 const wifi_osi_funcs_t *wifi_funcs;
 struct wpa_funcs *wpa_cb;
 
@@ -262,6 +263,9 @@ static void wpa_sta_disconnected_cb(uint8_t reason_code)
             wpa_sm_notify_disassoc(&gWpaSm);
             break;
         default:
+            if (g_wpa_pmk_caching_disabled) {
+                wpa_sta_clear_curr_pmksa();
+            }
             break;
     }
 #ifdef CONFIG_OWE_STA
@@ -460,3 +464,9 @@ int esp_supplicant_deinit(void)
     wpa_cb = NULL;
     return esp_wifi_unregister_wpa_cb_internal();
 }
+
+esp_err_t esp_supplicant_disable_pmk_caching(bool disable)
+{
+    g_wpa_pmk_caching_disabled = disable;
+    return ESP_OK;
+}