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

feat(esp8266): support wpa_supplicant sync with idf

Browse Source
This commit is contained in:
Li Jingyi
2020-07-21 17:53:18 +08:00
parent 744f2cfec8
commit d5f01ec4be
2 changed files with 54 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
components/esp8266/include/esp_wifi_crypto_types.h
View File

@ -434,6 +434,47 @@ typedef void (*esp_aes_decrypt_t)(void *ctx, const unsigned char *crypt, unsigne
*/ */
typedef void * (*esp_aes_decrypt_init_t)(const unsigned char *key, unsigned int len); typedef void * (*esp_aes_decrypt_init_t)(const unsigned char *key, unsigned int len);
/**
* @brief One-Key CBC MAC (OMAC1) hash with AES-128 for MIC computation
*
* @key: 128-bit key for the hash operation
* @data: Data buffer for which a MIC is computed
* @data_len: Length of data buffer in bytes
* @mic: Buffer for MIC (128 bits, i.e., 16 bytes)
* Returns: 0 on success, -1 on failure
*/
typedef int (*esp_omac1_aes_128_t)(const uint8_t *key, const uint8_t *data, size_t data_len,
uint8_t *mic);
/**
* @brief Decrypt data using CCMP (Counter Mode CBC-MAC Protocol OR
* Counter Mode Cipher Block Chaining Message Authentication
* Code Protocol) which is used in IEEE 802.11i RSN standard.
* @tk: 128-bit Temporal Key for obtained during 4-way handshake
* @hdr: Pointer to IEEE802.11 frame headeri needed for AAD
* @data: Pointer to encrypted data buffer
* @data_len: Encrypted data length in bytes
* @decrypted_len: Length of decrypted data
* Returns: Pointer to decrypted data on success, NULL on failure
*/
typedef uint8_t * (*esp_ccmp_decrypt_t)(const uint8_t *tk, const uint8_t *ieee80211_hdr,
const uint8_t *data, size_t data_len, size_t *decrypted_len);
/**
* @brief Encrypt data using CCMP (Counter Mode CBC-MAC Protocol OR
* Counter Mode Cipher Block Chaining Message Authentication
* Code Protocol) which is used in IEEE 802.11i RSN standard.
* @tk: 128-bit Temporal Key for obtained during 4-way handshake
* @frame: Pointer to IEEE802.11 frame including header
* @len: Length of the frame including header
* @hdrlen: Length of the header
* @pn: Packet Number counter
* @keyid: Key ID to be mentioned in CCMP Vector
* @encrypted_len: Length of the encrypted frame including header
*/
typedef uint8_t * (*esp_ccmp_encrypt_t)(const uint8_t *tk, uint8_t *frame, size_t len, size_t hdrlen,
uint8_t *pn, int keyid, size_t *encrypted_len);
/** /**
* @brief Deinitialize AES decryption * @brief Deinitialize AES decryption
* *
@ -718,6 +759,9 @@ typedef struct {
esp_aes_decrypt_t aes_decrypt; esp_aes_decrypt_t aes_decrypt;
esp_aes_decrypt_init_t aes_decrypt_init; esp_aes_decrypt_init_t aes_decrypt_init;
esp_aes_decrypt_deinit_t aes_decrypt_deinit; esp_aes_decrypt_deinit_t aes_decrypt_deinit;
esp_omac1_aes_128_t omac1_aes_128;
esp_ccmp_decrypt_t ccmp_decrypt;
esp_ccmp_encrypt_t ccmp_encrypt;
}wpa_crypto_funcs_t; }wpa_crypto_funcs_t;
/** /**

10
components/esp8266/include/rom/ets_sys.h
View File

@ -174,6 +174,16 @@ void os_timer_arm(os_timer_t *ptimer, uint32_t msec, bool repeat_flag);
*/ */
void os_timer_disarm(os_timer_t *ptimer); void os_timer_disarm(os_timer_t *ptimer);
/* redefine esp-idf name to esp8266 */
#define ets_delay_us os_delay_us
#define ETSTimer os_timer_t
#define ETSTimerFunc os_timer_func_t
#define ets_timer_disarm os_timer_disarm
#define ets_timer_setfn os_timer_setfn
#define ets_timer_arm os_timer_arm
void ets_timer_done(os_timer_t *ptimer);
/** /**
* @} * @}
*/ */