alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/add_unregister_wpa3_cb_v4.3' into 'release/v4.3'

Browse Source 
wpa_supplicant : Fix issues encountered in WFA testing (v4.3)

See merge request espressif/esp-idf!22893
This commit is contained in:
Jiang Jiang Jian 2023-03-31 12:27:48 +08:00
commit 5a160d20b5
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/wpa_supplicant/src/eap_peer/eap.c
View File

@ -614,6 +614,7 @@ void eap_peer_config_deinit(struct eap_sm *sm)
os_free(sm->config.new_password);
os_free(sm->config.eap_methods);
os_bzero(&sm->config, sizeof(struct eap_peer_config));
config_methods = NULL;
}
int eap_peer_blob_init(struct eap_sm *sm)

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

@ -260,4 +260,13 @@ void esp_wifi_register_wpa3_cb(struct wpa_funcs *wpa_cb)
wpa_cb->wpa3_parse_sae_msg = wpa3_parse_sae_msg;
}
void esp_wifi_unregister_wpa3_cb(void)
{
extern struct wpa_funcs *wpa_cb;
wpa_cb->wpa3_build_sae_msg = NULL;
wpa_cb->wpa3_parse_sae_msg = NULL;
}
#endif /* CONFIG_WPA3_SAE */

4
components/wpa_supplicant/src/esp_supplicant/esp_wpa_main.c
View File

@ -29,6 +29,8 @@
#include "esp_wpa2.h"
#include "esp_common_i.h"
struct wpa_funcs *wpa_cb;
void wpa_install_key(enum wpa_alg alg, u8 *addr, int key_idx, int set_tx,
u8 *seq, size_t seq_len, u8 *key, size_t key_len, enum key_flag key_flag)
{
@ -223,7 +225,6 @@ static void wpa_sta_disconnected_cb(uint8_t reason_code)
int esp_supplicant_init(void)
{
int ret = ESP_OK;
struct wpa_funcs *wpa_cb;
wpa_cb = (struct wpa_funcs *)os_zalloc(sizeof(struct wpa_funcs));
if (!wpa_cb) {
@ -271,5 +272,6 @@ int esp_supplicant_init(void)
int esp_supplicant_deinit(void)
{
esp_supplicant_common_deinit();
wpa_cb=NULL;
return esp_wifi_unregister_wpa_cb_internal();
}