Merge branch 'bugfix/add_authmode_wpa_wpa2_wpa3_psk' into 'master'

esp_wifi: Handle case when AP advertises WPA, WPA2 and WPA3 securities simultaneously and other bugfixes

Closes IDFGH-11372

See merge request espressif/esp-idf!27220

components/esp_wifi/include/esp_wifi_types.h

@@ -56,7 +56,7 @@ typedef struct {
 } wifi_country_t;
 
 /* Strength of authmodes */
-/* OPEN < WEP < WPA_PSK < OWE < WPA2_PSK = WPA_WPA2_PSK < WAPI_PSK < WPA3_PSK = WPA2_WPA3_PSK < WPA3_EXT_PSK */
+/* OPEN < WEP < WPA_PSK < OWE < WPA2_PSK = WPA_WPA2_PSK < WAPI_PSK < WPA3_PSK = WPA2_WPA3_PSK < WPA3_EXT_PSK = WPA3_EXT_PSK_MIXED_MODE */
 typedef enum {
     WIFI_AUTH_OPEN = 0,         /**< authenticate mode : open */
     WIFI_AUTH_WEP,              /**< authenticate mode : WEP */
@@ -71,6 +71,7 @@ typedef enum {
     WIFI_AUTH_OWE,              /**< authenticate mode : OWE */
     WIFI_AUTH_WPA3_ENT_192,     /**< authenticate mode : WPA3_ENT_SUITE_B_192_BIT */
     WIFI_AUTH_WPA3_EXT_PSK,     /**< authenticate mode : WPA3_PSK_EXT_KEY */
+    WIFI_AUTH_WPA3_EXT_PSK_MIXED_MODE, /**< authenticate mode: WPA3_PSK + WPA3_PSK_EXT_KEY */
     WIFI_AUTH_MAX
 } wifi_auth_mode_t;
 

components/esp_wifi/lib

@@ -1 +1 @@
-Subproject commit 6f6e34ba09ee39817276e4886bc868705f8062d8
+Subproject commit b4991a9d2216f2cab9d7dfa1ed666be478f1aee0

examples/mesh/internal_communication/sdkconfig.defaults

@@ -0,0 +1 @@
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y

examples/system/ota/advanced_https_ota/sdkconfig.ci.bluedroid

@@ -7,6 +7,7 @@ CONFIG_CTRL_BTDM_MODEM_SLEEP=y
 CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
 CONFIG_BT_BTU_TASK_STACK_SIZE=4512
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+CONFIG_BT_STACK_NO_LOG=y
 
 # Partition Table
 CONFIG_PARTITION_TABLE_CUSTOM=y

examples/wifi/scan/main/scan.c

@@ -58,6 +58,9 @@ static void print_auth_mode(int authmode)
     case WIFI_AUTH_WPA3_EXT_PSK:
         ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_WPA3_EXT_PSK");
         break;
+    case WIFI_AUTH_WPA3_EXT_PSK_MIXED_MODE:
+        ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_WPA3_EXT_PSK_MIXED_MODE");
+        break;
     default:
         ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_UNKNOWN");
         break;