Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/wpa3_mixed_mode_authype_v4.0' into 'release/v4.0'

Browse source 
esp_wifi: Add and utilize WPA3/WPA2 Mixed mode Authtype (backport v4.0)

See merge request espressif/esp-idf!8768
This commit is contained in:
Jiang Jiang Jian 2020-05-17 17:05:15 +08:00
commit fc2199c5d6
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
components/esp_wifi/include/esp_wifi_types.h
View file

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

2
components/esp_wifi/lib_esp32

@ -1 +1 @@
Subproject commit f6981a38f6c2394fc27ae3985e73af0405893084 Subproject commit f95cd7c239868c09a023eb36cf7fde3940e0ca22

6
examples/wifi/scan/main/scan.c
View file

@ -54,6 +54,12 @@ static void print_auth_mode(int authmode)
case WIFI_AUTH_WPA2_ENTERPRISE: case WIFI_AUTH_WPA2_ENTERPRISE:
ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_WPA2_ENTERPRISE"); ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_WPA2_ENTERPRISE");
break; break;
case WIFI_AUTH_WPA3_PSK:
ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_WPA3_PSK");
break;
case WIFI_AUTH_WPA2_WPA3_PSK:
ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_WPA2_WPA3_PSK");
break;
default: default:
ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_UNKNOWN"); ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_UNKNOWN");
break; break;