Merge branch 'bugfix/fix_add_lib_error_and_some_wifi_bug' into 'master'

fix(wifi): fix add lib error and some wifi bug

See merge request sdk/ESP8266_RTOS_SDK!1551

components/esp8266/include/esp_wifi_types.h

@@ -61,6 +61,8 @@ typedef enum {
     WIFI_AUTH_WPA2_PSK,         /**< authenticate mode : WPA2_PSK */
     WIFI_AUTH_WPA_WPA2_PSK,     /**< authenticate mode : WPA_WPA2_PSK */
     WIFI_AUTH_WPA2_ENTERPRISE,  /**< authenticate mode : WPA2_ENTERPRISE */
+    WIFI_AUTH_WPA3_PSK,         /**< authenticate mode : WPA3_PSK */
+    WIFI_AUTH_WPA2_WPA3_PSK,    /**< authenticate mode : WPA2_WPA3_PSK */
     WIFI_AUTH_MAX
 } wifi_auth_mode_t;
 

components/esp8266/lib/VERSION

@@ -1,8 +1,8 @@
 gwen:
-    core:       a4246a0
-    net80211:   4a1ab49
-    pp:         4a1ab49
-    espnow:     a4246a0
+    core:       5a78602
+    net80211:   5a78602
+    pp:         5a78602
+    espnow:     5a78602
 
     smartconfig:  2.8.2
     phy:          1163.0

components/esp8266/source/esp_sleep.c

@@ -419,10 +419,13 @@ esp_err_t esp_pm_configure(const void* vconfig)
     return ESP_ERR_NOT_SUPPORTED;
 #endif
 
+    extern void reset_noise_timer(uint16_t interval);
     const esp_pm_config_esp8266_t* config = (const esp_pm_config_esp8266_t*) vconfig;
     if (config->light_sleep_enable) {
+        reset_noise_timer(3000);
         s_sleep_mode = ESP_CPU_LIGHTSLEEP;
     } else {
+        reset_noise_timer(100);
         s_sleep_mode = ESP_CPU_WAIT;
     }
     return ESP_OK;

components/wpa_supplicant/src/rsn_supp/pmksa_cache.c

@@ -18,7 +18,15 @@
 #ifdef IEEE8021X_EAPOL
 
 static const int pmksa_cache_max_entries = 10;
-static const int dot11RSNAConfigPMKLifetime = 43200;
+/*
+ * The PTK shall not be used longer than the PMK lifetime as determined by the minimum of
+ * the PMK lifetime indicated by the AS, e.g., Session-Timeout + dot1xAuthTxPeriod or from
+ * dot11RSNAConfigPMKLifetime. When RADIUS is used and the Session-Timeout attribute is
+ * not in the RADIUS Accept message, and if the key lifetime is not otherwise specified,
+ * then the PMK lifetime is infinite.
+ *                                     From 802.11-2016 12.7.1.3 Pairwise key hierarchy
+ * */
+static const int dot11RSNAConfigPMKLifetime = 43200 * 2 * 12;
 static const int dot11RSNAConfigPMKReauthThreshold = 70;
 
 struct rsn_pmksa_cache {