espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-06-06 13:59:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(wpa_supplicant): revert wps struct to stay the same with lib

Browse Source
This commit is contained in:
Li Jingyi
2020-07-28 18:24:42 +08:00
parent 88d32a8aaf
commit be2e935c55
2 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
components/wpa_supplicant/src/wps/wps.h
View File

@ -1009,19 +1009,10 @@ enum wps_cb_status {
typedef void (*wps_st_cb_t)(int status);
#ifdef USE_WPS_TASK
enum wps_sig_type {
SIG_WPS_ENABLE = 1, //1
SIG_WPS_DISABLE, //2
SIG_WPS_START, //3
SIG_WPS_RX, //4
SIG_WPS_TIMER_TIMEOUT, //5
SIG_WPS_TIMER_MSG_TIMEOUT, //6
SIG_WPS_TIMER_SUCCESS_CB, //7
SIG_WPS_TIMER_SCAN, //8
SIG_WPS_TIMER_EAPOL_START, //9
SIG_WPS_NUM, //10
};
#if 1//def USE_WPS_TASK
#define SIG_WPS_START 0
#define SIG_WPS_RX 1
#define SIG_WPS_NUM 2
#endif
#define WPS_EAP_EXT_VENDOR_TYPE "WFA-SimpleConfig-Enrollee-1-0"

34
components/wpa_supplicant/src/wps/wps_i.h
View File

@ -125,6 +125,40 @@ struct wps_data {
#endif
};
#if 0
typedef enum wps_type {
WPS_TYPE_DISABLE = 0,
WPS_TYPE_E_PBC,
WPS_TYPE_E_PIN,
WPS_TYPE_E_DISPLAY,
WPS_TYPE_E_MAX,
WPS_TYPE_R_PBC,
WPS_TYPE_R_PIN,
WPS_TYPE_R_DISPLAY,
WPS_TYPE_R_MAX,
WPS_TYPE_ALL_MAX,
} WPS_TYPE_t;
#define WPS_MAX_MANUFACTURER_LEN 65
#define WPS_MAX_MODEL_NUMBER_LEN 33
#define WPS_MAX_MODEL_NAME_LEN 33
#define WPS_MAX_DEV_NAME_LEN 33
typedef struct {
char manufacturer[WPS_MAX_MANUFACTURER_LEN];
char model_number[WPS_MAX_MODEL_NUMBER_LEN];
char model_name[WPS_MAX_MODEL_NAME_LEN];
char device_name[WPS_MAX_DEV_NAME_LEN];
} esp_factory_information_t;
typedef struct {
WPS_TYPE_t wps_type;
const wps_crypto_funcs_t *crypto_funcs;
esp_factory_information_t factory_info;
}esp_wps_config_t;
wps_crypto_funcs_t wps_crypto_funcs;
#endif
/* wps_common.c */
void wps_kdf(const u8 *key, const u8 *label_prefix, size_t label_prefix_len,
const char *label, u8 *res, size_t res_len);