espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-01 03:34:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/8021x_sha256_akm_support' into 'master'

Browse Source 
esp_wifi: Add support for 802.1x sha256 auth key mode

Closes WIFI-2773

See merge request espressif/esp-idf!10412
This commit is contained in:
Jiang Jiang Jian
2020-09-29 20:45:12 +08:00
parent 96d59ff3e9 ebc0b42c75
commit 07499cc898
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_wifi/lib

Submodule components/esp_wifi/lib updated: 04203355fe...977bd355ec

3
components/wpa_supplicant/src/esp_supplicant/esp_wifi_driver.h
View File

@@ -65,7 +65,8 @@ enum {
WPA2_AUTH_CCKM = 0x07, WPA2_AUTH_CCKM = 0x07,
WPA2_AUTH_PSK_SHA256= 0x08, WPA2_AUTH_PSK_SHA256= 0x08,
WPA3_AUTH_PSK = 0x09, WPA3_AUTH_PSK = 0x09,
WPA2_AUTH_INVALID = 0x0a, WPA2_AUTH_ENT_SHA256= 0x0a,
WPA2_AUTH_INVALID = 0x0b,
}; };
typedef enum { typedef enum {

22
components/wpa_supplicant/src/rsn_supp/wpa.c
View File

@@ -138,6 +138,20 @@ uint32_t cipher_type_map_public_to_supp(wifi_cipher_type_t cipher)
} }
} }
static bool is_wpa2_enterprise_connection(void)
{
uint8_t authmode;
if (esp_wifi_sta_prof_is_wpa2_internal()) {
authmode = esp_wifi_sta_get_prof_authmode_internal();
if ((authmode == WPA2_AUTH_ENT) || (authmode == WPA2_AUTH_ENT_SHA256)) {
return true;
}
}
return false;
}
/** /**
* get_bssid - Get the current BSSID * get_bssid - Get the current BSSID
* @priv: private driver interface data * @priv: private driver interface data
@@ -589,8 +603,7 @@ void wpa_supplicant_process_1_of_4(struct wpa_sm *sm,
if (res) if (res)
goto failed; goto failed;
if (esp_wifi_sta_prof_is_wpa2_internal() && if (is_wpa2_enterprise_connection()) {
esp_wifi_sta_get_prof_authmode_internal() == WPA2_AUTH_ENT) {
pmksa_cache_set_current(sm, NULL, sm->bssid, 0, 0); pmksa_cache_set_current(sm, NULL, sm->bssid, 0, 0);
} }
@@ -2088,6 +2101,8 @@ void wpa_set_profile(u32 wpa_proto, u8 auth_mode)
sm->proto = wpa_proto; sm->proto = wpa_proto;
if (auth_mode == WPA2_AUTH_ENT) { if (auth_mode == WPA2_AUTH_ENT) {
sm->key_mgmt = WPA_KEY_MGMT_IEEE8021X; /* for wpa2 enterprise */ sm->key_mgmt = WPA_KEY_MGMT_IEEE8021X; /* for wpa2 enterprise */
} else if (auth_mode == WPA2_AUTH_ENT_SHA256) {
sm->key_mgmt = WPA_KEY_MGMT_IEEE8021X_SHA256; /* for wpa2 enterprise sha256 */
} else if (auth_mode == WPA2_AUTH_PSK_SHA256) { } else if (auth_mode == WPA2_AUTH_PSK_SHA256) {
sm->key_mgmt = WPA_KEY_MGMT_PSK_SHA256; sm->key_mgmt = WPA_KEY_MGMT_PSK_SHA256;
} else if (auth_mode == WPA3_AUTH_PSK) { } else if (auth_mode == WPA3_AUTH_PSK) {
@@ -2127,8 +2142,7 @@ int wpa_set_bss(char *macddr, char * bssid, u8 pairwise_cipher, u8 group_cipher,
sm->ap_notify_completed_rsne = esp_wifi_sta_is_ap_notify_completed_rsne_internal(); sm->ap_notify_completed_rsne = esp_wifi_sta_is_ap_notify_completed_rsne_internal();
if (sm->key_mgmt == WPA_KEY_MGMT_SAE || if (sm->key_mgmt == WPA_KEY_MGMT_SAE ||
(esp_wifi_sta_prof_is_wpa2_internal() && is_wpa2_enterprise_connection()) {
esp_wifi_sta_get_prof_authmode_internal() == WPA2_AUTH_ENT)) {
pmksa_cache_set_current(sm, NULL, (const u8*) bssid, 0, 0); pmksa_cache_set_current(sm, NULL, (const u8*) bssid, 0, 0);
wpa_sm_set_pmk_from_pmksa(sm); wpa_sm_set_pmk_from_pmksa(sm);
} }