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

Merge branch 'fix/supplicant_md5sum_mismatch' into 'master'

Browse Source 
wpa_supplicant: Fix MD5 mismatch in esp_wifi_driver.h

See merge request espressif/esp-idf!6843
This commit is contained in:
Jiang Jiang Jian
2019-11-27 22:47:17 +08:00
parent ca8e9a7589 5618cf5100
commit f76ac480c1
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_wifi/lib

Submodule components/esp_wifi/lib updated: 6513ff9a71...057749197b

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

@@ -122,10 +122,8 @@ struct wpa_funcs {
int (*wpa_parse_wpa_ie)(const u8 *wpa_ie, size_t wpa_ie_len, wifi_wpa_ie_t *data); int (*wpa_parse_wpa_ie)(const u8 *wpa_ie, size_t wpa_ie_len, wifi_wpa_ie_t *data);
int (*wpa_config_bss)(u8 *bssid); int (*wpa_config_bss)(u8 *bssid);
int (*wpa_michael_mic_failure)(u16 is_unicast); int (*wpa_michael_mic_failure)(u16 is_unicast);
#ifdef CONFIG_WPA3_SAE uint8_t *(*wpa3_build_sae_msg)(uint8_t *bssid, uint32_t type, size_t *len);
u8 *(*wpa3_build_sae_msg)(u8 *bssid, u32 type, u32 *len); int (*wpa3_parse_sae_msg)(uint8_t *buf, size_t len, uint32_t type);
int (*wpa3_parse_sae_msg)(u8 *buf, u32 len, u32 type);
#endif
}; };
struct wpa2_funcs { struct wpa2_funcs {

11
components/wpa_supplicant/src/esp_supplicant/esp_wpa3_i.h
View File

@@ -18,6 +18,17 @@
#include "esp_wifi_driver.h" #include "esp_wifi_driver.h"
#ifdef CONFIG_WPA3_SAE
void esp_wifi_register_wpa3_cb(struct wpa_funcs *wpa_cb); void esp_wifi_register_wpa3_cb(struct wpa_funcs *wpa_cb);
#else /* CONFIG_WPA3_SAE */
static inline void esp_wifi_register_wpa3_cb(struct wpa_funcs *wpa_cb)
{
wpa_cb->wpa3_build_sae_msg = NULL;
wpa_cb->wpa3_parse_sae_msg = NULL;
}
#endif /* CONFIG_WPA3_SAE */
#endif /* ESP_WPA3_H */ #endif /* ESP_WPA3_H */

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

@@ -202,9 +202,7 @@ int esp_supplicant_init(void)
wpa_cb->wpa_parse_wpa_ie = wpa_parse_wpa_ie_wrapper; wpa_cb->wpa_parse_wpa_ie = wpa_parse_wpa_ie_wrapper;
wpa_cb->wpa_config_bss = NULL;//wpa_config_bss; wpa_cb->wpa_config_bss = NULL;//wpa_config_bss;
wpa_cb->wpa_michael_mic_failure = wpa_michael_mic_failure; wpa_cb->wpa_michael_mic_failure = wpa_michael_mic_failure;
#ifdef CONFIG_WPA3_SAE
esp_wifi_register_wpa3_cb(wpa_cb); esp_wifi_register_wpa3_cb(wpa_cb);
#endif /* CONFIG_WPA3_SAE */
esp_wifi_register_wpa_cb_internal(wpa_cb); esp_wifi_register_wpa_cb_internal(wpa_cb);