espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 10:47:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(wifi): Resolve comments for softap fixes

Browse Source
This commit is contained in:
Shreyas Sheth
2024-10-14 14:52:24 +05:30
committed by Kapil Gupta
parent 913999b8c3
commit 29a95d30cc
7 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_wifi/lib

Submodule components/esp_wifi/lib updated: 06d0eec710...b15699a76c

2
components/wpa_supplicant/esp_supplicant/src/esp_hostap.c
View File

@ -358,7 +358,7 @@ uint8_t wpa_status_to_reason_code(int status)
} }
bool hostap_new_assoc_sta(struct sta_info *sta, uint8_t *bssid, uint8_t *wpa_ie, bool hostap_new_assoc_sta(struct sta_info *sta, uint8_t *bssid, uint8_t *wpa_ie,
uint8_t wpa_ie_len, uint8_t *rsnxe, uint8_t rsnxe_len, uint8_t wpa_ie_len, uint8_t *rsnxe, uint16_t rsnxe_len,
bool *pmf_enable, int subtype, uint8_t *pairwise_cipher, uint8_t *reason) bool *pmf_enable, int subtype, uint8_t *pairwise_cipher, uint8_t *reason)
{ {
struct hostapd_data *hapd = (struct hostapd_data*)esp_wifi_get_hostap_private_internal(); struct hostapd_data *hapd = (struct hostapd_data*)esp_wifi_get_hostap_private_internal();

9
components/wpa_supplicant/esp_supplicant/src/esp_wpa3.c
View File

@ -548,14 +548,15 @@ static void wpa3_process_rx_confirm(wpa3_hostap_auth_event_t *evt)
esp_wifi_ap_get_sta_aid(frm->bssid, &aid); esp_wifi_ap_get_sta_aid(frm->bssid, &aid);
if (aid == 0) { if (aid == 0) {
esp_wifi_ap_deauth_internal(frm->bssid, ret); esp_wifi_ap_deauth_internal(frm->bssid, ret);
} else {
if (sta && sta->sae_data) {
wpabuf_free(sta->sae_data);
sta->sae_data = NULL;
}
} }
} }
} }
done: done:
if (sta && sta->sae_data) {
wpabuf_free(sta->sae_data);
sta->sae_data = NULL;
}
os_free(frm); os_free(frm);
} }

8
components/wpa_supplicant/src/ap/sta_info.c
View File

@ -113,10 +113,10 @@ void ap_free_sta(struct hostapd_data *hapd, struct sta_info *sta)
os_mutex_delete(sta->lock); os_mutex_delete(sta->lock);
sta->lock = NULL; sta->lock = NULL;
} }
if (sta->sae_data) { if (sta->sae_data) {
wpabuf_free(sta->sae_data); wpabuf_free(sta->sae_data);
sta->sae_data = NULL; sta->sae_data = NULL;
} }
#endif /* CONFIG_SAE */ #endif /* CONFIG_SAE */
wpa_auth_sta_deinit(sta->wpa_sm); wpa_auth_sta_deinit(sta->wpa_sm);
#ifdef CONFIG_WPS_REGISTRAR #ifdef CONFIG_WPS_REGISTRAR

11
components/wpa_supplicant/src/ap/wpa_auth_ie.c
View File

@ -572,6 +572,17 @@ wpa_validate_wpa_ie(struct wpa_authenticator *wpa_auth,
} }
} }
#ifdef CONFIG_SAE
if (wpa_auth->conf.ieee80211w == MGMT_FRAME_PROTECTION_OPTIONAL &&
wpa_auth->conf.sae_require_mfp &&
wpa_key_mgmt_sae(sm->wpa_key_mgmt) &&
!(data.capabilities & WPA_CAPABILITY_MFPC)) {
wpa_printf(MSG_DEBUG,
"Management frame protection required with SAE, but client did not enable it");
return WPA_MGMT_FRAME_PROTECTION_VIOLATION;
}
#endif /* CONFIG_SAE */
if (wpa_auth->conf.ieee80211w == NO_MGMT_FRAME_PROTECTION || if (wpa_auth->conf.ieee80211w == NO_MGMT_FRAME_PROTECTION ||
!(data.capabilities & WPA_CAPABILITY_MFPC)) !(data.capabilities & WPA_CAPABILITY_MFPC))
sm->mgmt_frame_prot = 0; sm->mgmt_frame_prot = 0;

3
components/wpa_supplicant/src/common/wpa_common.c
View File

@ -5,6 +5,7 @@
* This software may be distributed under the terms of the BSD license. * This software may be distributed under the terms of the BSD license.
* See README for more details. * See README for more details.
*/ */
#ifdef ESP_SUPPLICANT
#include "utils/includes.h" #include "utils/includes.h"
#include "utils/common.h" #include "utils/common.h"
@ -1576,3 +1577,5 @@ int wpa_cipher_put_suites(u8 *pos, int ciphers)
return num_suites; return num_suites;
} }
#endif // ESP_SUPPLICANT

4
components/wpa_supplicant/src/rsn_supp/wpa_ie.c
View File

@ -11,6 +11,7 @@
* *
* See README and COPYING for more details. * See README and COPYING for more details.
*/ */
#ifdef ESP_SUPPLICANT
#include "utils/includes.h" #include "utils/includes.h"
@ -455,3 +456,6 @@ int wpa_supplicant_parse_ies(const u8 *buf, size_t len,
return ret; return ret;
} }
#endif // ESP_SUPPLICANT