kopia lustrzana https://github.com/espressif/esp-idf
Merge branch 'bugfix/esp_supplicant_format' into 'master'
fix(wifi): update coding format of WiFi files See merge request espressif/esp-idf!28079pull/13651/head
Jiang Jiang Jian
commit
8f4f21580a
|
|
@ -1,4 +1,4 @@
|
|||
[codespell]
|
||||
skip = build,*.yuv,components/fatfs/src/*,alice.txt,*.rgb
|
||||
skip = build,*.yuv,components/fatfs/src/*,alice.txt,*.rgb,components/wpa_supplicant/*,components/esp_wifi/*
|
||||
ignore-words-list = ser,dout,rsource,fram,inout,shs,ans,aci,unstall,unstalling,hart
|
||||
write-changes = true
|
||||
|
|
|
|||
|
|
@ -71,10 +71,10 @@ static void IRAM_ATTR s_esp_dport_access_stall_other_cpu_end(void)
|
|||
If CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP is enabled. Prefer to allocate a chunk of memory in SPIRAM firstly.
|
||||
If failed, try to allocate it in internal memory then.
|
||||
*/
|
||||
IRAM_ATTR void *wifi_malloc( size_t size )
|
||||
IRAM_ATTR void *wifi_malloc(size_t size)
|
||||
{
|
||||
#if CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP
|
||||
return heap_caps_malloc_prefer(size, 2, MALLOC_CAP_DEFAULT|MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT|MALLOC_CAP_INTERNAL);
|
||||
return heap_caps_malloc_prefer(size, 2, MALLOC_CAP_DEFAULT | MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT | MALLOC_CAP_INTERNAL);
|
||||
#else
|
||||
return malloc(size);
|
||||
#endif
|
||||
|
|
@ -84,10 +84,10 @@ IRAM_ATTR void *wifi_malloc( size_t size )
|
|||
If CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP is enabled. Prefer to allocate a chunk of memory in SPIRAM firstly.
|
||||
If failed, try to allocate it in internal memory then.
|
||||
*/
|
||||
IRAM_ATTR void *wifi_realloc( void *ptr, size_t size )
|
||||
IRAM_ATTR void *wifi_realloc(void *ptr, size_t size)
|
||||
{
|
||||
#if CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP
|
||||
return heap_caps_realloc_prefer(ptr, size, 2, MALLOC_CAP_DEFAULT|MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT|MALLOC_CAP_INTERNAL);
|
||||
return heap_caps_realloc_prefer(ptr, size, 2, MALLOC_CAP_DEFAULT | MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT | MALLOC_CAP_INTERNAL);
|
||||
#else
|
||||
return realloc(ptr, size);
|
||||
#endif
|
||||
|
|
@ -97,10 +97,10 @@ IRAM_ATTR void *wifi_realloc( void *ptr, size_t size )
|
|||
If CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP is enabled. Prefer to allocate a chunk of memory in SPIRAM firstly.
|
||||
If failed, try to allocate it in internal memory then.
|
||||
*/
|
||||
IRAM_ATTR void *wifi_calloc( size_t n, size_t size )
|
||||
IRAM_ATTR void *wifi_calloc(size_t n, size_t size)
|
||||
{
|
||||
#if CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP
|
||||
return heap_caps_calloc_prefer(n, size, 2, MALLOC_CAP_DEFAULT|MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT|MALLOC_CAP_INTERNAL);
|
||||
return heap_caps_calloc_prefer(n, size, 2, MALLOC_CAP_DEFAULT | MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT | MALLOC_CAP_INTERNAL);
|
||||
#else
|
||||
return calloc(n, size);
|
||||
#endif
|
||||
|
|
@ -112,11 +112,11 @@ static void * IRAM_ATTR wifi_zalloc_wrapper(size_t size)
|
|||
return ptr;
|
||||
}
|
||||
|
||||
wifi_static_queue_t* wifi_create_queue( int queue_len, int item_size)
|
||||
wifi_static_queue_t* wifi_create_queue(int queue_len, int item_size)
|
||||
{
|
||||
wifi_static_queue_t *queue = NULL;
|
||||
|
||||
queue = (wifi_static_queue_t*)heap_caps_malloc(sizeof(wifi_static_queue_t), MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
|
||||
queue = (wifi_static_queue_t*)heap_caps_malloc(sizeof(wifi_static_queue_t), MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT);
|
||||
if (!queue) {
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -124,12 +124,12 @@ wifi_static_queue_t* wifi_create_queue( int queue_len, int item_size)
|
|||
#if CONFIG_SPIRAM_USE_MALLOC
|
||||
/* Wi-Fi still use internal RAM */
|
||||
|
||||
queue->storage = heap_caps_calloc(1, sizeof(StaticQueue_t) + (queue_len*item_size), MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
|
||||
queue->storage = heap_caps_calloc(1, sizeof(StaticQueue_t) + (queue_len * item_size), MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT);
|
||||
if (!queue->storage) {
|
||||
goto _error;
|
||||
}
|
||||
|
||||
queue->handle = xQueueCreateStatic( queue_len, item_size, ((uint8_t*)(queue->storage)) + sizeof(StaticQueue_t), (StaticQueue_t*)(queue->storage));
|
||||
queue->handle = xQueueCreateStatic(queue_len, item_size, ((uint8_t*)(queue->storage)) + sizeof(StaticQueue_t), (StaticQueue_t*)(queue->storage));
|
||||
|
||||
if (!queue->handle) {
|
||||
goto _error;
|
||||
|
|
@ -148,7 +148,7 @@ _error:
|
|||
|
||||
return NULL;
|
||||
#else
|
||||
queue->handle = xQueueCreate( queue_len, item_size);
|
||||
queue->handle = xQueueCreate(queue_len, item_size);
|
||||
return queue;
|
||||
#endif
|
||||
}
|
||||
|
|
@ -405,17 +405,17 @@ static int get_time_wrapper(void *t)
|
|||
|
||||
static void * IRAM_ATTR realloc_internal_wrapper(void *ptr, size_t size)
|
||||
{
|
||||
return heap_caps_realloc(ptr, size, MALLOC_CAP_8BIT|MALLOC_CAP_DMA|MALLOC_CAP_INTERNAL);
|
||||
return heap_caps_realloc(ptr, size, MALLOC_CAP_8BIT | MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL);
|
||||
}
|
||||
|
||||
static void * IRAM_ATTR calloc_internal_wrapper(size_t n, size_t size)
|
||||
{
|
||||
return heap_caps_calloc(n, size, MALLOC_CAP_8BIT|MALLOC_CAP_DMA|MALLOC_CAP_INTERNAL);
|
||||
return heap_caps_calloc(n, size, MALLOC_CAP_8BIT | MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL);
|
||||
}
|
||||
|
||||
static void * IRAM_ATTR zalloc_internal_wrapper(size_t size)
|
||||
{
|
||||
void *ptr = heap_caps_calloc(1, size, MALLOC_CAP_8BIT|MALLOC_CAP_DMA|MALLOC_CAP_INTERNAL);
|
||||
void *ptr = heap_caps_calloc(1, size, MALLOC_CAP_8BIT | MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL);
|
||||
return ptr;
|
||||
}
|
||||
|
||||
|
|
@ -629,8 +629,8 @@ wifi_osi_funcs_t g_wifi_osi_funcs = {
|
|||
._queue_msg_waiting = (uint32_t(*)(void *))uxQueueMessagesWaiting,
|
||||
._event_group_create = (void *(*)(void))xEventGroupCreate,
|
||||
._event_group_delete = (void(*)(void *))vEventGroupDelete,
|
||||
._event_group_set_bits = (uint32_t(*)(void *,uint32_t))xEventGroupSetBits,
|
||||
._event_group_clear_bits = (uint32_t(*)(void *,uint32_t))xEventGroupClearBits,
|
||||
._event_group_set_bits = (uint32_t(*)(void *, uint32_t))xEventGroupSetBits,
|
||||
._event_group_clear_bits = (uint32_t(*)(void *, uint32_t))xEventGroupClearBits,
|
||||
._event_group_wait_bits = event_group_wait_bits_wrapper,
|
||||
._task_create_pinned_to_core = task_create_pinned_to_core_wrapper,
|
||||
._task_create = task_create_wrapper,
|
||||
|
|
|
|||
|
|
@ -56,17 +56,17 @@ extern void wifi_apb80m_request(void);
|
|||
extern void wifi_apb80m_release(void);
|
||||
#endif
|
||||
|
||||
IRAM_ATTR void *wifi_malloc( size_t size )
|
||||
IRAM_ATTR void *wifi_malloc(size_t size)
|
||||
{
|
||||
return malloc(size);
|
||||
}
|
||||
|
||||
IRAM_ATTR void *wifi_realloc( void *ptr, size_t size )
|
||||
IRAM_ATTR void *wifi_realloc(void *ptr, size_t size)
|
||||
{
|
||||
return realloc(ptr, size);
|
||||
}
|
||||
|
||||
IRAM_ATTR void *wifi_calloc( size_t n, size_t size )
|
||||
IRAM_ATTR void *wifi_calloc(size_t n, size_t size)
|
||||
{
|
||||
return calloc(n, size);
|
||||
}
|
||||
|
|
@ -77,16 +77,16 @@ static void * IRAM_ATTR wifi_zalloc_wrapper(size_t size)
|
|||
return ptr;
|
||||
}
|
||||
|
||||
wifi_static_queue_t* wifi_create_queue( int queue_len, int item_size)
|
||||
wifi_static_queue_t* wifi_create_queue(int queue_len, int item_size)
|
||||
{
|
||||
wifi_static_queue_t *queue = NULL;
|
||||
|
||||
queue = (wifi_static_queue_t*)heap_caps_malloc(sizeof(wifi_static_queue_t), MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
|
||||
queue = (wifi_static_queue_t*)heap_caps_malloc(sizeof(wifi_static_queue_t), MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT);
|
||||
if (!queue) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
queue->handle = xQueueCreate( queue_len, item_size);
|
||||
queue->handle = xQueueCreate(queue_len, item_size);
|
||||
return queue;
|
||||
}
|
||||
|
||||
|
|
@ -317,31 +317,31 @@ static int get_time_wrapper(void *t)
|
|||
|
||||
static void * IRAM_ATTR realloc_internal_wrapper(void *ptr, size_t size)
|
||||
{
|
||||
return heap_caps_realloc(ptr, size, MALLOC_CAP_8BIT|MALLOC_CAP_DMA|MALLOC_CAP_INTERNAL);
|
||||
return heap_caps_realloc(ptr, size, MALLOC_CAP_8BIT | MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL);
|
||||
}
|
||||
|
||||
static void * IRAM_ATTR calloc_internal_wrapper(size_t n, size_t size)
|
||||
{
|
||||
return heap_caps_calloc(n, size, MALLOC_CAP_8BIT|MALLOC_CAP_DMA|MALLOC_CAP_INTERNAL);
|
||||
return heap_caps_calloc(n, size, MALLOC_CAP_8BIT | MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL);
|
||||
}
|
||||
|
||||
static void * IRAM_ATTR zalloc_internal_wrapper(size_t size)
|
||||
{
|
||||
void *ptr = heap_caps_calloc(1, size, MALLOC_CAP_8BIT|MALLOC_CAP_DMA|MALLOC_CAP_INTERNAL);
|
||||
void *ptr = heap_caps_calloc(1, size, MALLOC_CAP_8BIT | MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL);
|
||||
return ptr;
|
||||
}
|
||||
|
||||
static esp_err_t nvs_open_wrapper(const char* name, unsigned int open_mode, nvs_handle_t *out_handle)
|
||||
{
|
||||
return nvs_open(name,(nvs_open_mode_t)open_mode, out_handle);
|
||||
return nvs_open(name, (nvs_open_mode_t)open_mode, out_handle);
|
||||
}
|
||||
|
||||
static void esp_log_writev_wrapper(unsigned int level, const char *tag, const char *format, va_list args)
|
||||
{
|
||||
return esp_log_writev((esp_log_level_t)level,tag,format,args);
|
||||
return esp_log_writev((esp_log_level_t)level, tag, format, args);
|
||||
}
|
||||
|
||||
static void esp_log_write_wrapper(unsigned int level,const char *tag,const char *format, ...)
|
||||
static void esp_log_write_wrapper(unsigned int level, const char *tag, const char *format, ...)
|
||||
{
|
||||
va_list list;
|
||||
va_start(list, format);
|
||||
|
|
@ -568,8 +568,8 @@ wifi_osi_funcs_t g_wifi_osi_funcs = {
|
|||
._queue_msg_waiting = (uint32_t(*)(void *))uxQueueMessagesWaiting,
|
||||
._event_group_create = (void *(*)(void))xEventGroupCreate,
|
||||
._event_group_delete = (void(*)(void *))vEventGroupDelete,
|
||||
._event_group_set_bits = (uint32_t(*)(void *,uint32_t))xEventGroupSetBits,
|
||||
._event_group_clear_bits = (uint32_t(*)(void *,uint32_t))xEventGroupClearBits,
|
||||
._event_group_set_bits = (uint32_t(*)(void *, uint32_t))xEventGroupSetBits,
|
||||
._event_group_clear_bits = (uint32_t(*)(void *, uint32_t))xEventGroupClearBits,
|
||||
._event_group_wait_bits = event_group_wait_bits_wrapper,
|
||||
._task_create_pinned_to_core = task_create_pinned_to_core_wrapper,
|
||||
._task_create = task_create_wrapper,
|
||||
|
|
|
|||
|
|
@ -59,17 +59,17 @@ extern void wifi_apb80m_request(void);
|
|||
extern void wifi_apb80m_release(void);
|
||||
#endif
|
||||
|
||||
IRAM_ATTR void *wifi_malloc( size_t size )
|
||||
IRAM_ATTR void *wifi_malloc(size_t size)
|
||||
{
|
||||
return malloc(size);
|
||||
}
|
||||
|
||||
IRAM_ATTR void *wifi_realloc( void *ptr, size_t size )
|
||||
IRAM_ATTR void *wifi_realloc(void *ptr, size_t size)
|
||||
{
|
||||
return realloc(ptr, size);
|
||||
}
|
||||
|
||||
IRAM_ATTR void *wifi_calloc( size_t n, size_t size )
|
||||
IRAM_ATTR void *wifi_calloc(size_t n, size_t size)
|
||||
{
|
||||
return calloc(n, size);
|
||||
}
|
||||
|
|
@ -80,16 +80,16 @@ static void * IRAM_ATTR wifi_zalloc_wrapper(size_t size)
|
|||
return ptr;
|
||||
}
|
||||
|
||||
wifi_static_queue_t* wifi_create_queue( int queue_len, int item_size)
|
||||
wifi_static_queue_t* wifi_create_queue(int queue_len, int item_size)
|
||||
{
|
||||
wifi_static_queue_t *queue = NULL;
|
||||
|
||||
queue = (wifi_static_queue_t*)heap_caps_malloc(sizeof(wifi_static_queue_t), MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
|
||||
queue = (wifi_static_queue_t*)heap_caps_malloc(sizeof(wifi_static_queue_t), MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT);
|
||||
if (!queue) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
queue->handle = xQueueCreate( queue_len, item_size);
|
||||
queue->handle = xQueueCreate(queue_len, item_size);
|
||||
return queue;
|
||||
}
|
||||
|
||||
|
|
@ -334,31 +334,31 @@ static int get_time_wrapper(void *t)
|
|||
|
||||
static void * IRAM_ATTR realloc_internal_wrapper(void *ptr, size_t size)
|
||||
{
|
||||
return heap_caps_realloc(ptr, size, MALLOC_CAP_8BIT|MALLOC_CAP_DMA|MALLOC_CAP_INTERNAL);
|
||||
return heap_caps_realloc(ptr, size, MALLOC_CAP_8BIT | MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL);
|
||||
}
|
||||
|
||||
static void * IRAM_ATTR calloc_internal_wrapper(size_t n, size_t size)
|
||||
{
|
||||
return heap_caps_calloc(n, size, MALLOC_CAP_8BIT|MALLOC_CAP_DMA|MALLOC_CAP_INTERNAL);
|
||||
return heap_caps_calloc(n, size, MALLOC_CAP_8BIT | MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL);
|
||||
}
|
||||
|
||||
static void * IRAM_ATTR zalloc_internal_wrapper(size_t size)
|
||||
{
|
||||
void *ptr = heap_caps_calloc(1, size, MALLOC_CAP_8BIT|MALLOC_CAP_DMA|MALLOC_CAP_INTERNAL);
|
||||
void *ptr = heap_caps_calloc(1, size, MALLOC_CAP_8BIT | MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL);
|
||||
return ptr;
|
||||
}
|
||||
|
||||
static esp_err_t nvs_open_wrapper(const char* name, unsigned int open_mode, nvs_handle_t *out_handle)
|
||||
{
|
||||
return nvs_open(name,(nvs_open_mode_t)open_mode, out_handle);
|
||||
return nvs_open(name, (nvs_open_mode_t)open_mode, out_handle);
|
||||
}
|
||||
|
||||
static void esp_log_writev_wrapper(unsigned int level, const char *tag, const char *format, va_list args)
|
||||
{
|
||||
return esp_log_writev((esp_log_level_t)level,tag,format,args);
|
||||
return esp_log_writev((esp_log_level_t)level, tag, format, args);
|
||||
}
|
||||
|
||||
static void esp_log_write_wrapper(unsigned int level,const char *tag,const char *format, ...)
|
||||
static void esp_log_write_wrapper(unsigned int level, const char *tag, const char *format, ...)
|
||||
{
|
||||
va_list list;
|
||||
va_start(list, format);
|
||||
|
|
@ -585,8 +585,8 @@ wifi_osi_funcs_t g_wifi_osi_funcs = {
|
|||
._queue_msg_waiting = (uint32_t(*)(void *))uxQueueMessagesWaiting,
|
||||
._event_group_create = (void *(*)(void))xEventGroupCreate,
|
||||
._event_group_delete = (void(*)(void *))vEventGroupDelete,
|
||||
._event_group_set_bits = (uint32_t(*)(void *,uint32_t))xEventGroupSetBits,
|
||||
._event_group_clear_bits = (uint32_t(*)(void *,uint32_t))xEventGroupClearBits,
|
||||
._event_group_set_bits = (uint32_t(*)(void *, uint32_t))xEventGroupSetBits,
|
||||
._event_group_clear_bits = (uint32_t(*)(void *, uint32_t))xEventGroupClearBits,
|
||||
._event_group_wait_bits = event_group_wait_bits_wrapper,
|
||||
._task_create_pinned_to_core = task_create_pinned_to_core_wrapper,
|
||||
._task_create = task_create_wrapper,
|
||||
|
|
|
|||
|
|
@ -62,17 +62,17 @@ extern void wifi_apb80m_request(void);
|
|||
extern void wifi_apb80m_release(void);
|
||||
#endif
|
||||
|
||||
IRAM_ATTR void *wifi_malloc( size_t size )
|
||||
IRAM_ATTR void *wifi_malloc(size_t size)
|
||||
{
|
||||
return malloc(size);
|
||||
}
|
||||
|
||||
IRAM_ATTR void *wifi_realloc( void *ptr, size_t size )
|
||||
IRAM_ATTR void *wifi_realloc(void *ptr, size_t size)
|
||||
{
|
||||
return realloc(ptr, size);
|
||||
}
|
||||
|
||||
IRAM_ATTR void *wifi_calloc( size_t n, size_t size )
|
||||
IRAM_ATTR void *wifi_calloc(size_t n, size_t size)
|
||||
{
|
||||
return calloc(n, size);
|
||||
}
|
||||
|
|
@ -83,7 +83,7 @@ static void *IRAM_ATTR wifi_zalloc_wrapper(size_t size)
|
|||
return ptr;
|
||||
}
|
||||
|
||||
wifi_static_queue_t *wifi_create_queue( int queue_len, int item_size)
|
||||
wifi_static_queue_t *wifi_create_queue(int queue_len, int item_size)
|
||||
{
|
||||
wifi_static_queue_t *queue = NULL;
|
||||
|
||||
|
|
@ -92,7 +92,7 @@ wifi_static_queue_t *wifi_create_queue( int queue_len, int item_size)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
queue->handle = xQueueCreate( queue_len, item_size);
|
||||
queue->handle = xQueueCreate(queue_len, item_size);
|
||||
return queue;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -53,10 +53,10 @@ extern void wifi_apb80m_request(void);
|
|||
extern void wifi_apb80m_release(void);
|
||||
#endif
|
||||
|
||||
IRAM_ATTR void *wifi_malloc( size_t size )
|
||||
IRAM_ATTR void *wifi_malloc(size_t size)
|
||||
{
|
||||
#if CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP
|
||||
return heap_caps_malloc_prefer(size, 2, MALLOC_CAP_DEFAULT|MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT|MALLOC_CAP_INTERNAL);
|
||||
return heap_caps_malloc_prefer(size, 2, MALLOC_CAP_DEFAULT | MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT | MALLOC_CAP_INTERNAL);
|
||||
#else
|
||||
return malloc(size);
|
||||
#endif
|
||||
|
|
@ -66,10 +66,10 @@ IRAM_ATTR void *wifi_malloc( size_t size )
|
|||
If CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP is enabled. Prefer to allocate a chunk of memory in SPIRAM firstly.
|
||||
If failed, try to allocate it in internal memory then.
|
||||
*/
|
||||
IRAM_ATTR void *wifi_realloc( void *ptr, size_t size )
|
||||
IRAM_ATTR void *wifi_realloc(void *ptr, size_t size)
|
||||
{
|
||||
#if CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP
|
||||
return heap_caps_realloc_prefer(ptr, size, 2, MALLOC_CAP_DEFAULT|MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT|MALLOC_CAP_INTERNAL);
|
||||
return heap_caps_realloc_prefer(ptr, size, 2, MALLOC_CAP_DEFAULT | MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT | MALLOC_CAP_INTERNAL);
|
||||
#else
|
||||
return realloc(ptr, size);
|
||||
#endif
|
||||
|
|
@ -79,10 +79,10 @@ IRAM_ATTR void *wifi_realloc( void *ptr, size_t size )
|
|||
If CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP is enabled. Prefer to allocate a chunk of memory in SPIRAM firstly.
|
||||
If failed, try to allocate it in internal memory then.
|
||||
*/
|
||||
IRAM_ATTR void *wifi_calloc( size_t n, size_t size )
|
||||
IRAM_ATTR void *wifi_calloc(size_t n, size_t size)
|
||||
{
|
||||
#if CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP
|
||||
return heap_caps_calloc_prefer(n, size, 2, MALLOC_CAP_DEFAULT|MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT|MALLOC_CAP_INTERNAL);
|
||||
return heap_caps_calloc_prefer(n, size, 2, MALLOC_CAP_DEFAULT | MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT | MALLOC_CAP_INTERNAL);
|
||||
#else
|
||||
return calloc(n, size);
|
||||
#endif
|
||||
|
|
@ -94,7 +94,7 @@ static void *IRAM_ATTR wifi_zalloc_wrapper(size_t size)
|
|||
return ptr;
|
||||
}
|
||||
|
||||
wifi_static_queue_t *wifi_create_queue( int queue_len, int item_size)
|
||||
wifi_static_queue_t *wifi_create_queue(int queue_len, int item_size)
|
||||
{
|
||||
wifi_static_queue_t *queue = NULL;
|
||||
|
||||
|
|
@ -105,12 +105,12 @@ wifi_static_queue_t *wifi_create_queue( int queue_len, int item_size)
|
|||
|
||||
#if CONFIG_SPIRAM_USE_MALLOC
|
||||
|
||||
queue->storage = heap_caps_calloc(1, sizeof(StaticQueue_t) + (queue_len*item_size), MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
|
||||
queue->storage = heap_caps_calloc(1, sizeof(StaticQueue_t) + (queue_len * item_size), MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT);
|
||||
if (!queue->storage) {
|
||||
goto _error;
|
||||
}
|
||||
|
||||
queue->handle = xQueueCreateStatic( queue_len, item_size, ((uint8_t*)(queue->storage)) + sizeof(StaticQueue_t), (StaticQueue_t*)(queue->storage));
|
||||
queue->handle = xQueueCreateStatic(queue_len, item_size, ((uint8_t*)(queue->storage)) + sizeof(StaticQueue_t), (StaticQueue_t*)(queue->storage));
|
||||
|
||||
if (!queue->handle) {
|
||||
goto _error;
|
||||
|
|
@ -129,7 +129,7 @@ _error:
|
|||
|
||||
return NULL;
|
||||
#else
|
||||
queue->handle = xQueueCreate( queue_len, item_size);
|
||||
queue->handle = xQueueCreate(queue_len, item_size);
|
||||
return queue;
|
||||
#endif
|
||||
}
|
||||
|
|
@ -550,10 +550,10 @@ bool IRAM_ATTR esp_coex_common_env_is_chip_wrapper(void)
|
|||
void * esp_coex_common_spin_lock_create_wrapper(void)
|
||||
{
|
||||
portMUX_TYPE tmp = portMUX_INITIALIZER_UNLOCKED;
|
||||
void *mux = heap_caps_malloc(sizeof(portMUX_TYPE), MALLOC_CAP_8BIT|MALLOC_CAP_INTERNAL);
|
||||
void *mux = heap_caps_malloc(sizeof(portMUX_TYPE), MALLOC_CAP_8BIT | MALLOC_CAP_INTERNAL);
|
||||
|
||||
if (mux) {
|
||||
memcpy(mux,&tmp,sizeof(portMUX_TYPE));
|
||||
memcpy(mux, &tmp, sizeof(portMUX_TYPE));
|
||||
return mux;
|
||||
}
|
||||
return NULL;
|
||||
|
|
@ -630,7 +630,7 @@ void IRAM_ATTR esp_coex_common_timer_arm_us_wrapper(void *ptimer, uint32_t us, b
|
|||
|
||||
void * IRAM_ATTR esp_coex_common_malloc_internal_wrapper(size_t size)
|
||||
{
|
||||
return heap_caps_malloc(size, MALLOC_CAP_8BIT|MALLOC_CAP_DMA|MALLOC_CAP_INTERNAL);
|
||||
return heap_caps_malloc(size, MALLOC_CAP_8BIT | MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL);
|
||||
}
|
||||
|
||||
wifi_osi_funcs_t g_wifi_osi_funcs = {
|
||||
|
|
|
|||
|
|
@ -62,10 +62,10 @@ extern void wifi_apb80m_release(void);
|
|||
If CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP is enabled. Prefer to allocate a chunk of memory in SPIRAM firstly.
|
||||
If failed, try to allocate it in internal memory then.
|
||||
*/
|
||||
IRAM_ATTR void *wifi_malloc( size_t size )
|
||||
IRAM_ATTR void *wifi_malloc(size_t size)
|
||||
{
|
||||
#if CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP
|
||||
return heap_caps_malloc_prefer(size, 2, MALLOC_CAP_DEFAULT|MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT|MALLOC_CAP_INTERNAL);
|
||||
return heap_caps_malloc_prefer(size, 2, MALLOC_CAP_DEFAULT | MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT | MALLOC_CAP_INTERNAL);
|
||||
#else
|
||||
return malloc(size);
|
||||
#endif
|
||||
|
|
@ -75,10 +75,10 @@ IRAM_ATTR void *wifi_malloc( size_t size )
|
|||
If CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP is enabled. Prefer to allocate a chunk of memory in SPIRAM firstly.
|
||||
If failed, try to allocate it in internal memory then.
|
||||
*/
|
||||
IRAM_ATTR void *wifi_realloc( void *ptr, size_t size )
|
||||
IRAM_ATTR void *wifi_realloc(void *ptr, size_t size)
|
||||
{
|
||||
#if CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP
|
||||
return heap_caps_realloc_prefer(ptr, size, 2, MALLOC_CAP_DEFAULT|MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT|MALLOC_CAP_INTERNAL);
|
||||
return heap_caps_realloc_prefer(ptr, size, 2, MALLOC_CAP_DEFAULT | MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT | MALLOC_CAP_INTERNAL);
|
||||
#else
|
||||
return realloc(ptr, size);
|
||||
#endif
|
||||
|
|
@ -88,10 +88,10 @@ IRAM_ATTR void *wifi_realloc( void *ptr, size_t size )
|
|||
If CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP is enabled. Prefer to allocate a chunk of memory in SPIRAM firstly.
|
||||
If failed, try to allocate it in internal memory then.
|
||||
*/
|
||||
IRAM_ATTR void *wifi_calloc( size_t n, size_t size )
|
||||
IRAM_ATTR void *wifi_calloc(size_t n, size_t size)
|
||||
{
|
||||
#if CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP
|
||||
return heap_caps_calloc_prefer(n, size, 2, MALLOC_CAP_DEFAULT|MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT|MALLOC_CAP_INTERNAL);
|
||||
return heap_caps_calloc_prefer(n, size, 2, MALLOC_CAP_DEFAULT | MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT | MALLOC_CAP_INTERNAL);
|
||||
#else
|
||||
return calloc(n, size);
|
||||
#endif
|
||||
|
|
@ -103,11 +103,11 @@ static void * IRAM_ATTR wifi_zalloc_wrapper(size_t size)
|
|||
return ptr;
|
||||
}
|
||||
|
||||
wifi_static_queue_t* wifi_create_queue( int queue_len, int item_size)
|
||||
wifi_static_queue_t* wifi_create_queue(int queue_len, int item_size)
|
||||
{
|
||||
wifi_static_queue_t *queue = NULL;
|
||||
|
||||
queue = (wifi_static_queue_t*)heap_caps_malloc(sizeof(wifi_static_queue_t), MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
|
||||
queue = (wifi_static_queue_t*)heap_caps_malloc(sizeof(wifi_static_queue_t), MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT);
|
||||
if (!queue) {
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -115,12 +115,12 @@ wifi_static_queue_t* wifi_create_queue( int queue_len, int item_size)
|
|||
#if CONFIG_SPIRAM_USE_MALLOC
|
||||
/* Wi-Fi still use internal RAM */
|
||||
|
||||
queue->storage = heap_caps_calloc(1, sizeof(StaticQueue_t) + (queue_len*item_size), MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
|
||||
queue->storage = heap_caps_calloc(1, sizeof(StaticQueue_t) + (queue_len * item_size), MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT);
|
||||
if (!queue->storage) {
|
||||
goto _error;
|
||||
}
|
||||
|
||||
queue->handle = xQueueCreateStatic( queue_len, item_size, ((uint8_t*)(queue->storage)) + sizeof(StaticQueue_t), (StaticQueue_t*)(queue->storage));
|
||||
queue->handle = xQueueCreateStatic(queue_len, item_size, ((uint8_t*)(queue->storage)) + sizeof(StaticQueue_t), (StaticQueue_t*)(queue->storage));
|
||||
|
||||
if (!queue->handle) {
|
||||
goto _error;
|
||||
|
|
@ -139,7 +139,7 @@ _error:
|
|||
|
||||
return NULL;
|
||||
#else
|
||||
queue->handle = xQueueCreate( queue_len, item_size);
|
||||
queue->handle = xQueueCreate(queue_len, item_size);
|
||||
return queue;
|
||||
#endif
|
||||
}
|
||||
|
|
@ -396,17 +396,17 @@ static int get_time_wrapper(void *t)
|
|||
|
||||
static void * IRAM_ATTR realloc_internal_wrapper(void *ptr, size_t size)
|
||||
{
|
||||
return heap_caps_realloc(ptr, size, MALLOC_CAP_8BIT|MALLOC_CAP_DMA|MALLOC_CAP_INTERNAL);
|
||||
return heap_caps_realloc(ptr, size, MALLOC_CAP_8BIT | MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL);
|
||||
}
|
||||
|
||||
static void * IRAM_ATTR calloc_internal_wrapper(size_t n, size_t size)
|
||||
{
|
||||
return heap_caps_calloc(n, size, MALLOC_CAP_8BIT|MALLOC_CAP_DMA|MALLOC_CAP_INTERNAL);
|
||||
return heap_caps_calloc(n, size, MALLOC_CAP_8BIT | MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL);
|
||||
}
|
||||
|
||||
static void * IRAM_ATTR zalloc_internal_wrapper(size_t size)
|
||||
{
|
||||
void *ptr = heap_caps_calloc(1, size, MALLOC_CAP_8BIT|MALLOC_CAP_DMA|MALLOC_CAP_INTERNAL);
|
||||
void *ptr = heap_caps_calloc(1, size, MALLOC_CAP_8BIT | MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL);
|
||||
return ptr;
|
||||
}
|
||||
|
||||
|
|
@ -622,8 +622,8 @@ wifi_osi_funcs_t g_wifi_osi_funcs = {
|
|||
._queue_msg_waiting = (uint32_t(*)(void *))uxQueueMessagesWaiting,
|
||||
._event_group_create = (void *(*)(void))xEventGroupCreate,
|
||||
._event_group_delete = (void(*)(void *))vEventGroupDelete,
|
||||
._event_group_set_bits = (uint32_t(*)(void *,uint32_t))xEventGroupSetBits,
|
||||
._event_group_clear_bits = (uint32_t(*)(void *,uint32_t))xEventGroupClearBits,
|
||||
._event_group_set_bits = (uint32_t(*)(void *, uint32_t))xEventGroupSetBits,
|
||||
._event_group_clear_bits = (uint32_t(*)(void *, uint32_t))xEventGroupClearBits,
|
||||
._event_group_wait_bits = event_group_wait_bits_wrapper,
|
||||
._task_create_pinned_to_core = task_create_pinned_to_core_wrapper,
|
||||
._task_create = task_create_wrapper,
|
||||
|
|
|
|||
|
|
@ -65,10 +65,10 @@ extern void wifi_apb80m_release(void);
|
|||
If CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP is enabled. Prefer to allocate a chunk of memory in SPIRAM firstly.
|
||||
If failed, try to allocate it in internal memory then.
|
||||
*/
|
||||
IRAM_ATTR void *wifi_malloc( size_t size )
|
||||
IRAM_ATTR void *wifi_malloc(size_t size)
|
||||
{
|
||||
#if CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP
|
||||
return heap_caps_malloc_prefer(size, 2, MALLOC_CAP_DEFAULT|MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT|MALLOC_CAP_INTERNAL);
|
||||
return heap_caps_malloc_prefer(size, 2, MALLOC_CAP_DEFAULT | MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT | MALLOC_CAP_INTERNAL);
|
||||
#else
|
||||
return malloc(size);
|
||||
#endif
|
||||
|
|
@ -78,10 +78,10 @@ IRAM_ATTR void *wifi_malloc( size_t size )
|
|||
If CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP is enabled. Prefer to allocate a chunk of memory in SPIRAM firstly.
|
||||
If failed, try to allocate it in internal memory then.
|
||||
*/
|
||||
IRAM_ATTR void *wifi_realloc( void *ptr, size_t size )
|
||||
IRAM_ATTR void *wifi_realloc(void *ptr, size_t size)
|
||||
{
|
||||
#if CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP
|
||||
return heap_caps_realloc_prefer(ptr, size, 2, MALLOC_CAP_DEFAULT|MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT|MALLOC_CAP_INTERNAL);
|
||||
return heap_caps_realloc_prefer(ptr, size, 2, MALLOC_CAP_DEFAULT | MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT | MALLOC_CAP_INTERNAL);
|
||||
#else
|
||||
return realloc(ptr, size);
|
||||
#endif
|
||||
|
|
@ -91,10 +91,10 @@ IRAM_ATTR void *wifi_realloc( void *ptr, size_t size )
|
|||
If CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP is enabled. Prefer to allocate a chunk of memory in SPIRAM firstly.
|
||||
If failed, try to allocate it in internal memory then.
|
||||
*/
|
||||
IRAM_ATTR void *wifi_calloc( size_t n, size_t size )
|
||||
IRAM_ATTR void *wifi_calloc(size_t n, size_t size)
|
||||
{
|
||||
#if CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP
|
||||
return heap_caps_calloc_prefer(n, size, 2, MALLOC_CAP_DEFAULT|MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT|MALLOC_CAP_INTERNAL);
|
||||
return heap_caps_calloc_prefer(n, size, 2, MALLOC_CAP_DEFAULT | MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT | MALLOC_CAP_INTERNAL);
|
||||
#else
|
||||
return calloc(n, size);
|
||||
#endif
|
||||
|
|
@ -106,11 +106,11 @@ static void * IRAM_ATTR wifi_zalloc_wrapper(size_t size)
|
|||
return ptr;
|
||||
}
|
||||
|
||||
wifi_static_queue_t* wifi_create_queue( int queue_len, int item_size)
|
||||
wifi_static_queue_t* wifi_create_queue(int queue_len, int item_size)
|
||||
{
|
||||
wifi_static_queue_t *queue = NULL;
|
||||
|
||||
queue = (wifi_static_queue_t*)heap_caps_malloc(sizeof(wifi_static_queue_t), MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
|
||||
queue = (wifi_static_queue_t*)heap_caps_malloc(sizeof(wifi_static_queue_t), MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT);
|
||||
if (!queue) {
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -118,12 +118,12 @@ wifi_static_queue_t* wifi_create_queue( int queue_len, int item_size)
|
|||
#if CONFIG_SPIRAM_USE_MALLOC
|
||||
/* Wi-Fi still use internal RAM */
|
||||
|
||||
queue->storage = heap_caps_calloc(1, sizeof(StaticQueue_t) + (queue_len*item_size), MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
|
||||
queue->storage = heap_caps_calloc(1, sizeof(StaticQueue_t) + (queue_len * item_size), MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT);
|
||||
if (!queue->storage) {
|
||||
goto _error;
|
||||
}
|
||||
|
||||
queue->handle = xQueueCreateStatic( queue_len, item_size, ((uint8_t*)(queue->storage)) + sizeof(StaticQueue_t), (StaticQueue_t*)(queue->storage));
|
||||
queue->handle = xQueueCreateStatic(queue_len, item_size, ((uint8_t*)(queue->storage)) + sizeof(StaticQueue_t), (StaticQueue_t*)(queue->storage));
|
||||
|
||||
if (!queue->handle) {
|
||||
goto _error;
|
||||
|
|
@ -142,7 +142,7 @@ _error:
|
|||
|
||||
return NULL;
|
||||
#else
|
||||
queue->handle = xQueueCreate( queue_len, item_size);
|
||||
queue->handle = xQueueCreate(queue_len, item_size);
|
||||
return queue;
|
||||
#endif
|
||||
}
|
||||
|
|
@ -413,17 +413,17 @@ static int get_time_wrapper(void *t)
|
|||
|
||||
static void * IRAM_ATTR realloc_internal_wrapper(void *ptr, size_t size)
|
||||
{
|
||||
return heap_caps_realloc(ptr, size, MALLOC_CAP_8BIT|MALLOC_CAP_DMA|MALLOC_CAP_INTERNAL);
|
||||
return heap_caps_realloc(ptr, size, MALLOC_CAP_8BIT | MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL);
|
||||
}
|
||||
|
||||
static void * IRAM_ATTR calloc_internal_wrapper(size_t n, size_t size)
|
||||
{
|
||||
return heap_caps_calloc(n, size, MALLOC_CAP_8BIT|MALLOC_CAP_DMA|MALLOC_CAP_INTERNAL);
|
||||
return heap_caps_calloc(n, size, MALLOC_CAP_8BIT | MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL);
|
||||
}
|
||||
|
||||
static void * IRAM_ATTR zalloc_internal_wrapper(size_t size)
|
||||
{
|
||||
void *ptr = heap_caps_calloc(1, size, MALLOC_CAP_8BIT|MALLOC_CAP_DMA|MALLOC_CAP_INTERNAL);
|
||||
void *ptr = heap_caps_calloc(1, size, MALLOC_CAP_8BIT | MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL);
|
||||
return ptr;
|
||||
}
|
||||
|
||||
|
|
@ -595,7 +595,6 @@ static void IRAM_ATTR esp_empty_wrapper(void)
|
|||
|
||||
}
|
||||
|
||||
|
||||
static void esp_phy_enable_wrapper(void)
|
||||
{
|
||||
esp_phy_enable(PHY_MODEM_WIFI);
|
||||
|
|
@ -642,8 +641,8 @@ wifi_osi_funcs_t g_wifi_osi_funcs = {
|
|||
._queue_msg_waiting = (uint32_t(*)(void *))uxQueueMessagesWaiting,
|
||||
._event_group_create = (void *(*)(void))xEventGroupCreate,
|
||||
._event_group_delete = (void(*)(void *))vEventGroupDelete,
|
||||
._event_group_set_bits = (uint32_t(*)(void *,uint32_t))xEventGroupSetBits,
|
||||
._event_group_clear_bits = (uint32_t(*)(void *,uint32_t))xEventGroupClearBits,
|
||||
._event_group_set_bits = (uint32_t(*)(void *, uint32_t))xEventGroupSetBits,
|
||||
._event_group_clear_bits = (uint32_t(*)(void *, uint32_t))xEventGroupClearBits,
|
||||
._event_group_wait_bits = event_group_wait_bits_wrapper,
|
||||
._task_create_pinned_to_core = task_create_pinned_to_core_wrapper,
|
||||
._task_create = task_create_wrapper,
|
||||
|
|
|
|||
|
|
@ -144,7 +144,6 @@ extern "C" {
|
|||
#define MESH_ASSOC_FLAG_ROOTS_FOUND (0x20) /**< roots conflict is found, means that thre are at least two roots in the mesh network */
|
||||
#define MESH_ASSOC_FLAG_ROOT_FIXED (0x40) /**< the root is fixed in the mesh network */
|
||||
|
||||
|
||||
/**
|
||||
* @brief Mesh PS (Power Save) duty cycle type
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -268,7 +268,7 @@ esp_err_t esp_now_mod_peer(const esp_now_peer_info_t *peer);
|
|||
* - others: failed
|
||||
*/
|
||||
esp_err_t esp_wifi_config_espnow_rate(wifi_interface_t ifx, wifi_phy_rate_t rate)
|
||||
__attribute__((deprecated("This API can be only used when rate is non-HE rate, \
|
||||
__attribute__((deprecated("This API can be only used when rate is non-HE rate, \
|
||||
please use esp_now_set_peer_rate_config if you want full support of the rate.")));
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -121,33 +121,33 @@ typedef struct {
|
|||
} __attribute__((packed)) esp_wifi_vht_siga1_t;
|
||||
|
||||
typedef struct {
|
||||
uint32_t ru_allocation :8;
|
||||
uint32_t crc :4;
|
||||
uint32_t tail :6; //18 bits
|
||||
uint32_t ru_allocation : 8;
|
||||
uint32_t crc : 4;
|
||||
uint32_t tail : 6; //18 bits
|
||||
} esp_wifi_mu_sigb_common_t;
|
||||
|
||||
typedef struct {
|
||||
uint32_t ru_allocation :16;
|
||||
uint32_t center_26tone_ru :1;
|
||||
uint32_t crc :4;
|
||||
uint32_t tail :6; //not included into the sigb_common_info (21bits)
|
||||
uint32_t ru_allocation : 16;
|
||||
uint32_t center_26tone_ru : 1;
|
||||
uint32_t crc : 4;
|
||||
uint32_t tail : 6; //not included into the sigb_common_info (21bits)
|
||||
} esp_wifi_mu_sigb_common_80mhz_ppdu_t;
|
||||
|
||||
typedef struct {
|
||||
uint32_t sta_id :11;
|
||||
uint32_t nsts :3;
|
||||
uint32_t beamformed :1;
|
||||
uint32_t he_mcs :4;
|
||||
uint32_t dcm :1;
|
||||
uint32_t coding :1;
|
||||
uint32_t sta_id : 11;
|
||||
uint32_t nsts : 3;
|
||||
uint32_t beamformed : 1;
|
||||
uint32_t he_mcs : 4;
|
||||
uint32_t dcm : 1;
|
||||
uint32_t coding : 1;
|
||||
} esp_wifi_mu_sigb_user_non_mimo_t;
|
||||
|
||||
typedef struct {
|
||||
uint32_t sta_id :11;
|
||||
uint32_t spatial_config :4;
|
||||
uint32_t he_mcs :4;
|
||||
uint32_t rsvd :1;
|
||||
uint32_t coding :1;
|
||||
uint32_t sta_id : 11;
|
||||
uint32_t spatial_config : 4;
|
||||
uint32_t he_mcs : 4;
|
||||
uint32_t rsvd : 1;
|
||||
uint32_t coding : 1;
|
||||
} esp_wifi_mu_sigb_user_mimo_t;
|
||||
|
||||
#define ESP_TEST_RX_MU_USER_NUM (9)
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@
|
|||
*
|
||||
*/
|
||||
|
||||
|
||||
#ifndef __ESP_WIFI_INTERNAL_H__
|
||||
#define __ESP_WIFI_INTERNAL_H__
|
||||
|
||||
|
|
@ -46,7 +45,7 @@ typedef struct {
|
|||
*/
|
||||
typedef enum {
|
||||
WIFI_LOG_NONE = 0,
|
||||
WIFI_LOG_ERROR , /*enabled by default*/
|
||||
WIFI_LOG_ERROR, /*enabled by default*/
|
||||
WIFI_LOG_WARNING, /*enabled by default*/
|
||||
WIFI_LOG_INFO, /*enabled by default*/
|
||||
WIFI_LOG_DEBUG, /*can be set in menuconfig*/
|
||||
|
|
@ -74,7 +73,6 @@ typedef enum {
|
|||
#define WIFI_LOG_SUBMODULE_CONN (1<<2) /*logs related to connecting*/
|
||||
#define WIFI_LOG_SUBMODULE_SCAN (1<<3) /*logs related to scanning*/
|
||||
|
||||
|
||||
/**
|
||||
* @brief Initialize Wi-Fi Driver
|
||||
* Alloc resource for WiFi driver, such as WiFi control structure, RX/TX buffer,
|
||||
|
|
@ -215,7 +213,6 @@ esp_err_t esp_wifi_internal_wapi_deinit(void);
|
|||
*/
|
||||
esp_err_t esp_wifi_internal_reg_netstack_buf_cb(wifi_netstack_buf_ref_cb_t ref, wifi_netstack_buf_free_cb_t free);
|
||||
|
||||
|
||||
/**
|
||||
* @brief The WiFi RX callback function
|
||||
*
|
||||
|
|
@ -370,7 +367,7 @@ esp_err_t esp_wifi_internal_esp_wifi_he_md5_check(const char *md5);
|
|||
*
|
||||
* @return A pointer to the memory allocated on success, NULL on failure
|
||||
*/
|
||||
void *wifi_malloc( size_t size );
|
||||
void *wifi_malloc(size_t size);
|
||||
|
||||
/**
|
||||
* @brief Reallocate a chunk of memory for WiFi driver
|
||||
|
|
@ -382,7 +379,7 @@ void *wifi_malloc( size_t size );
|
|||
*
|
||||
* @return A pointer to the memory allocated on success, NULL on failure
|
||||
*/
|
||||
void *wifi_realloc( void *ptr, size_t size );
|
||||
void *wifi_realloc(void *ptr, size_t size);
|
||||
|
||||
/**
|
||||
* @brief Callocate memory for WiFi driver
|
||||
|
|
@ -394,7 +391,7 @@ void *wifi_realloc( void *ptr, size_t size );
|
|||
*
|
||||
* @return A pointer to the memory allocated on success, NULL on failure
|
||||
*/
|
||||
void *wifi_calloc( size_t n, size_t size );
|
||||
void *wifi_calloc(size_t n, size_t size);
|
||||
|
||||
/**
|
||||
* @brief Update WiFi MAC time
|
||||
|
|
@ -403,7 +400,7 @@ void *wifi_calloc( size_t n, size_t size );
|
|||
*
|
||||
* @return Always returns ESP_OK
|
||||
*/
|
||||
typedef esp_err_t (* wifi_mac_time_update_cb_t)( uint32_t time_delta );
|
||||
typedef esp_err_t (* wifi_mac_time_update_cb_t)(uint32_t time_delta);
|
||||
|
||||
/**
|
||||
* @brief Update WiFi MAC time
|
||||
|
|
@ -412,7 +409,7 @@ typedef esp_err_t (* wifi_mac_time_update_cb_t)( uint32_t time_delta );
|
|||
*
|
||||
* @return Always returns ESP_OK
|
||||
*/
|
||||
esp_err_t esp_wifi_internal_update_mac_time( uint32_t time_delta );
|
||||
esp_err_t esp_wifi_internal_update_mac_time(uint32_t time_delta);
|
||||
|
||||
/**
|
||||
* @brief Set current WiFi log level
|
||||
|
|
@ -539,7 +536,6 @@ void esp_wifi_power_domain_on(void);
|
|||
*/
|
||||
void esp_wifi_power_domain_off(void);
|
||||
|
||||
|
||||
#if (CONFIG_FREERTOS_USE_TICKLESS_IDLE && SOC_PM_MODEM_RETENTION_BY_REGDMA)
|
||||
/**
|
||||
* @brief Get wifi mac sleep retention hardware context configuration and size
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
|
||||
/* Notes about WiFi Programming
|
||||
*
|
||||
* WiFi programming model can be depicted as following picture:
|
||||
|
|
@ -561,7 +560,6 @@ esp_err_t esp_wifi_scan_get_ap_record(wifi_ap_record_t *ap_record);
|
|||
*/
|
||||
esp_err_t esp_wifi_clear_ap_list(void);
|
||||
|
||||
|
||||
/**
|
||||
* @brief Get information of AP to which the device is associated with
|
||||
*
|
||||
|
|
@ -749,7 +747,6 @@ esp_err_t esp_wifi_set_country(const wifi_country_t *country);
|
|||
*/
|
||||
esp_err_t esp_wifi_get_country(wifi_country_t *country);
|
||||
|
||||
|
||||
/**
|
||||
* @brief Set MAC address of WiFi station, soft-AP or NAN interface.
|
||||
*
|
||||
|
|
@ -983,7 +980,7 @@ esp_err_t esp_wifi_set_storage(wifi_storage_t storage);
|
|||
* @param vnd_ie Pointer to the vendor specific element data received.
|
||||
* @param rssi Received signal strength indication.
|
||||
*/
|
||||
typedef void (*esp_vendor_ie_cb_t) (void *ctx, wifi_vendor_ie_type_t type, const uint8_t sa[6], const vendor_ie_data_t *vnd_ie, int rssi);
|
||||
typedef void (*esp_vendor_ie_cb_t)(void *ctx, wifi_vendor_ie_type_t type, const uint8_t sa[6], const vendor_ie_data_t *vnd_ie, int rssi);
|
||||
|
||||
/**
|
||||
* @brief Set 802.11 Vendor-Specific Information Element
|
||||
|
|
@ -1115,7 +1112,6 @@ esp_err_t esp_wifi_80211_tx(wifi_interface_t ifx, const void *buffer, int len, b
|
|||
*/
|
||||
typedef void (* wifi_csi_cb_t)(void *ctx, wifi_csi_info_t *data);
|
||||
|
||||
|
||||
/**
|
||||
* @brief Register the RX callback function of CSI data.
|
||||
*
|
||||
|
|
@ -1194,7 +1190,6 @@ esp_err_t esp_wifi_set_ant_gpio(const wifi_ant_gpio_config_t *config) __attribut
|
|||
*/
|
||||
esp_err_t esp_wifi_get_ant_gpio(wifi_ant_gpio_config_t *config) __attribute__((deprecated("Please use esp_phy_get_ant_gpio instead")));
|
||||
|
||||
|
||||
/**
|
||||
* @brief Set antenna configuration
|
||||
*
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef ESP_WIFI_MAX_CONN_NUM
|
||||
// Number of maximum wifi connection may be undefined if we have no native wifi support on this target
|
||||
// and at the same time there's no native interface injected by the wifi_remote component.
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: 2017-2023 Espressif Systems (Shanghai) CO LTD
|
||||
* SPDX-FileCopyrightText: 2017-2024 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
|
||||
#ifndef __ESP_WIFI_CRYPTO_TYPES_H__
|
||||
#define __ESP_WIFI_CRYPTO_TYPES_H__
|
||||
|
||||
|
|
@ -33,7 +32,7 @@ typedef enum {
|
|||
ESP_CRYPTO_HASH_ALG_MD5, ESP_CRYPTO_HASH_ALG_SHA1,
|
||||
ESP_CRYPTO_HASH_ALG_HMAC_MD5, ESP_CRYPTO_HASH_ALG_HMAC_SHA1,
|
||||
ESP_CRYPTO_HASH_ALG_SHA256, ESP_CRYPTO_HASH_ALG_HMAC_SHA256
|
||||
}esp_crypto_hash_alg_t;
|
||||
} esp_crypto_hash_alg_t;
|
||||
|
||||
/*
|
||||
* Enumeration for block cipher operations.
|
||||
|
|
@ -423,14 +422,14 @@ typedef struct wpa_crypto_funcs_t {
|
|||
esp_aes_gmac_t aes_gmac; /**< One-Key GMAC hash callback function with AES for MIC computation */
|
||||
esp_sha256_vector_t sha256_vector; /**< SHA256 hash callback function for data vector */
|
||||
esp_crc32_le_t crc32; /**< CRC32 value callback function in little endian */
|
||||
}wpa_crypto_funcs_t;
|
||||
} wpa_crypto_funcs_t;
|
||||
|
||||
/**
|
||||
* @brief The crypto callback function structure used in mesh vendor IE encryption. The
|
||||
* structure can be set as software crypto or the crypto optimized by device's
|
||||
* hardware.
|
||||
*/
|
||||
typedef struct{
|
||||
typedef struct {
|
||||
esp_aes_128_encrypt_t aes_128_encrypt; /**< Callback function used in mesh vendor IE encryption */
|
||||
esp_aes_128_decrypt_t aes_128_decrypt; /**< Callback function used in mesh vendor IE decryption */
|
||||
} mesh_crypto_funcs_t;
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
|
||||
/**
|
||||
* @brief Set up an individual TWT agreement (NegotiationType=0) or change TWT parameters of the existing TWT agreement
|
||||
* - TWT Wake Interval = TWT Wake Interval Mantissa * (2 ^ TWT Wake Interval Exponent), unit: us
|
||||
|
|
|
|||
|
|
@ -114,17 +114,16 @@ typedef enum {
|
|||
/**
|
||||
* @brief TWT setup config
|
||||
*/
|
||||
typedef struct
|
||||
{
|
||||
typedef struct {
|
||||
wifi_twt_setup_cmds_t setup_cmd; /**< Indicates the type of TWT command */
|
||||
uint16_t trigger :1; /**< 1: a trigger-enabled TWT, 0: a non-trigger-enabled TWT */
|
||||
uint16_t flow_type :1; /**< 0: an announced TWT, 1: an unannounced TWT */
|
||||
uint16_t flow_id :3; /**< When set up an individual TWT agreement, the flow id will be assigned by AP after a successful agreement setup.
|
||||
uint16_t trigger : 1; /**< 1: a trigger-enabled TWT, 0: a non-trigger-enabled TWT */
|
||||
uint16_t flow_type : 1; /**< 0: an announced TWT, 1: an unannounced TWT */
|
||||
uint16_t flow_id : 3; /**< When set up an individual TWT agreement, the flow id will be assigned by AP after a successful agreement setup.
|
||||
flow_id could be specified to a value in the range of [0, 7], but it might be changed by AP in the response.
|
||||
When change TWT parameters of the existing TWT agreement, flow_id should be an existing one. The value range is [0, 7]. */
|
||||
uint16_t wake_invl_expn :5; /**< TWT Wake Interval Exponent. The value range is [0, 31]. */
|
||||
uint16_t wake_duration_unit :1; /**< TWT Wake duration unit, 0: 256us 1: TU (TU = 1024us)*/
|
||||
uint16_t reserved :5; /**< bit: 11.15 reserved */
|
||||
uint16_t wake_invl_expn : 5; /**< TWT Wake Interval Exponent. The value range is [0, 31]. */
|
||||
uint16_t wake_duration_unit : 1; /**< TWT Wake duration unit, 0: 256us 1: TU (TU = 1024us)*/
|
||||
uint16_t reserved : 5; /**< bit: 11.15 reserved */
|
||||
uint8_t min_wake_dura; /**< Nominal Minimum Wake Duration, indicates the minimum amount of time, in unit of 256 us, that the TWT requesting STA expects that it needs to be awake. The value range is [1, 255]. */
|
||||
uint16_t wake_invl_mant; /**< TWT Wake Interval Mantissa. The value range is [1, 65535]. */
|
||||
uint16_t twt_id; /**< TWT connection id, the value range is [0, 32767]. */
|
||||
|
|
@ -161,38 +160,38 @@ typedef enum {
|
|||
*/
|
||||
#if CONFIG_IDF_TARGET_ESP32C5
|
||||
typedef struct {
|
||||
signed rssi:8; /**< the RSSI of the reception frame */
|
||||
unsigned rate:5; /**< if cur_bb_format is RX_BB_FORMAT_11B, it's the transmission rate. otherwise it's Rate field of L-SIG */
|
||||
signed rssi: 8; /**< the RSSI of the reception frame */
|
||||
unsigned rate: 5; /**< if cur_bb_format is RX_BB_FORMAT_11B, it's the transmission rate. otherwise it's Rate field of L-SIG */
|
||||
unsigned : 1; /**< reserved */
|
||||
unsigned : 2; /**< reserved */
|
||||
unsigned : 12; /**< reserved */
|
||||
unsigned rxmatch0:1; /**< indicate whether the reception frame is from interface 0 */
|
||||
unsigned rxmatch1:1; /**< indicate whether the reception frame is from interface 1 */
|
||||
unsigned rxmatch2:1; /**< indicate whether the reception frame is from interface 2 */
|
||||
unsigned rxmatch3:1; /**< indicate whether the reception frame is from interface 3 */
|
||||
unsigned rxmatch0: 1; /**< indicate whether the reception frame is from interface 0 */
|
||||
unsigned rxmatch1: 1; /**< indicate whether the reception frame is from interface 1 */
|
||||
unsigned rxmatch2: 1; /**< indicate whether the reception frame is from interface 2 */
|
||||
unsigned rxmatch3: 1; /**< indicate whether the reception frame is from interface 3 */
|
||||
uint32_t he_siga1; /**< HE-SIGA1 or HT-SIG or VHT-SIG */
|
||||
unsigned rxend_state:8; /**< reception state, 0: successful, others: failure */
|
||||
unsigned rxend_state: 8; /**< reception state, 0: successful, others: failure */
|
||||
uint16_t he_siga2; /**< HE-SIGA2 */
|
||||
unsigned : 7; /**< reserved */
|
||||
unsigned is_group:1; /**< indicate whether the reception is a group addressed frame */
|
||||
unsigned timestamp:32; /**< timestamp. The local time when this packet is received. It is precise only if modem sleep or light sleep is not enabled. unit: microsecond */
|
||||
unsigned is_group: 1; /**< indicate whether the reception is a group addressed frame */
|
||||
unsigned timestamp: 32; /**< timestamp. The local time when this packet is received. It is precise only if modem sleep or light sleep is not enabled. unit: microsecond */
|
||||
unsigned : 15; /**< reserved */
|
||||
unsigned : 15; /**< reserved */
|
||||
unsigned : 2; /**< reserved */
|
||||
unsigned noise_floor:8; /**< the noise floor of the reception frame */
|
||||
unsigned noise_floor: 8; /**< the noise floor of the reception frame */
|
||||
signed : 8; /**< reserved */
|
||||
signed : 8; /**< reserved */
|
||||
unsigned : 8; /**< reserved */
|
||||
unsigned : 8; /**< reserved */
|
||||
unsigned : 8; /**< reserved */
|
||||
unsigned : 2; /**< reserved */
|
||||
unsigned sigb_len:10; /**< the sigb length */
|
||||
unsigned sigb_len: 10; /**< the sigb length */
|
||||
unsigned : 1; /**< reserved */
|
||||
unsigned : 1; /**< reserved */
|
||||
unsigned : 1; /**< reserved */
|
||||
unsigned : 1; /**< reserved */
|
||||
unsigned channel:4; /**< the primary channel */
|
||||
unsigned second:4; /**< the second channel if in HT40 */
|
||||
unsigned channel: 4; /**< the primary channel */
|
||||
unsigned second: 4; /**< the second channel if in HT40 */
|
||||
unsigned : 12; /**< reserved */
|
||||
unsigned : 4; /**< reserved */
|
||||
unsigned : 1; /**< reserved */
|
||||
|
|
@ -204,9 +203,9 @@ typedef struct {
|
|||
unsigned : 1; /**< reserved */
|
||||
unsigned : 12; /**< reserved */
|
||||
unsigned : 12; /**< reserved */
|
||||
unsigned cur_bb_format:4; /**< the format of the reception frame */
|
||||
unsigned rx_channel_estimate_len:10; /**< the length of the channel information */
|
||||
unsigned rx_channel_estimate_info_vld:1; /**< indicate the channel information is valid */
|
||||
unsigned cur_bb_format: 4; /**< the format of the reception frame */
|
||||
unsigned rx_channel_estimate_len: 10; /**< the length of the channel information */
|
||||
unsigned rx_channel_estimate_info_vld: 1; /**< indicate the channel information is valid */
|
||||
unsigned : 5; /**< reserved */
|
||||
unsigned : 21; /**< reserved */
|
||||
unsigned : 10; /**< reserved */
|
||||
|
|
@ -221,11 +220,11 @@ typedef struct {
|
|||
unsigned : 1; /**< reserved */
|
||||
unsigned : 8; /**< reserved */
|
||||
unsigned : 16; /**< reserved */
|
||||
unsigned sig_len:14; /**< the length of the reception MPDU */
|
||||
unsigned sig_len: 14; /**< the length of the reception MPDU */
|
||||
unsigned : 2; /**< reserved */
|
||||
unsigned dump_len:14; /**< the length of the reception MPDU excluding the FCS */
|
||||
unsigned dump_len: 14; /**< the length of the reception MPDU excluding the FCS */
|
||||
unsigned : 2; /**< reserved */
|
||||
unsigned rx_state:8; /**< reception state, 0: successful, others: failure */
|
||||
unsigned rx_state: 8; /**< reception state, 0: successful, others: failure */
|
||||
unsigned : 8; /**< reserved */
|
||||
unsigned : 16; /**< reserved */
|
||||
} __attribute__((packed)) esp_wifi_rxctrl_t;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
|
||||
#ifndef __ESP_WIFI_TYPES_H__
|
||||
#define __ESP_WIFI_TYPES_H__
|
||||
|
||||
|
|
@ -209,9 +208,9 @@ typedef enum {
|
|||
|
||||
/** @brief Description of a WiFi AP HE Info */
|
||||
typedef struct {
|
||||
uint8_t bss_color:6; /**< an unsigned integer whose value is the BSS Color of the BSS corresponding to the AP */
|
||||
uint8_t partial_bss_color:1; /**< indicate if an AID assignment rule based on the BSS color */
|
||||
uint8_t bss_color_disabled:1; /**< indicate if the use of BSS color is disabled */
|
||||
uint8_t bss_color: 6; /**< an unsigned integer whose value is the BSS Color of the BSS corresponding to the AP */
|
||||
uint8_t partial_bss_color: 1; /**< indicate if an AID assignment rule based on the BSS color */
|
||||
uint8_t bss_color_disabled: 1; /**< indicate if the use of BSS color is disabled */
|
||||
uint8_t bssid_index; /**< in M-BSSID set, identifies the nontransmitted BSSID */
|
||||
} wifi_he_ap_info_t;
|
||||
|
||||
|
|
@ -226,17 +225,17 @@ typedef struct {
|
|||
wifi_cipher_type_t pairwise_cipher; /**< pairwise cipher of AP */
|
||||
wifi_cipher_type_t group_cipher; /**< group cipher of AP */
|
||||
wifi_ant_t ant; /**< antenna used to receive beacon from AP */
|
||||
uint32_t phy_11b:1; /**< bit: 0 flag to identify if 11b mode is enabled or not */
|
||||
uint32_t phy_11g:1; /**< bit: 1 flag to identify if 11g mode is enabled or not */
|
||||
uint32_t phy_11n:1; /**< bit: 2 flag to identify if 11n mode is enabled or not */
|
||||
uint32_t phy_lr:1; /**< bit: 3 flag to identify if low rate is enabled or not */
|
||||
uint32_t phy_11a:1; /**< bit: 4 flag to identify if 11ax mode is enabled or not */
|
||||
uint32_t phy_11ac:1; /**< bit: 5 flag to identify if 11ax mode is enabled or not */
|
||||
uint32_t phy_11ax:1; /**< bit: 6 flag to identify if 11ax mode is enabled or not */
|
||||
uint32_t wps:1; /**< bit: 7 flag to identify if WPS is supported or not */
|
||||
uint32_t ftm_responder:1; /**< bit: 8 flag to identify if FTM is supported in responder mode */
|
||||
uint32_t ftm_initiator:1; /**< bit: 9 flag to identify if FTM is supported in initiator mode */
|
||||
uint32_t reserved:22; /**< bit: 10..31 reserved */
|
||||
uint32_t phy_11b: 1; /**< bit: 0 flag to identify if 11b mode is enabled or not */
|
||||
uint32_t phy_11g: 1; /**< bit: 1 flag to identify if 11g mode is enabled or not */
|
||||
uint32_t phy_11n: 1; /**< bit: 2 flag to identify if 11n mode is enabled or not */
|
||||
uint32_t phy_lr: 1; /**< bit: 3 flag to identify if low rate is enabled or not */
|
||||
uint32_t phy_11a: 1; /**< bit: 4 flag to identify if 11ax mode is enabled or not */
|
||||
uint32_t phy_11ac: 1; /**< bit: 5 flag to identify if 11ax mode is enabled or not */
|
||||
uint32_t phy_11ax: 1; /**< bit: 6 flag to identify if 11ax mode is enabled or not */
|
||||
uint32_t wps: 1; /**< bit: 7 flag to identify if WPS is supported or not */
|
||||
uint32_t ftm_responder: 1; /**< bit: 8 flag to identify if FTM is supported in responder mode */
|
||||
uint32_t ftm_initiator: 1; /**< bit: 9 flag to identify if FTM is supported in initiator mode */
|
||||
uint32_t reserved: 22; /**< bit: 10..31 reserved */
|
||||
wifi_country_t country; /**< country information of AP */
|
||||
wifi_he_ap_info_t he_ap; /**< HE AP info */
|
||||
uint8_t bandwidth; /**< For either 20 MHz or 40 MHz operation, the Channel Width field is set to 0.
|
||||
|
|
@ -252,19 +251,19 @@ typedef struct {
|
|||
typedef enum {
|
||||
WIFI_FAST_SCAN = 0, /**< Do fast scan, scan will end after find SSID match AP */
|
||||
WIFI_ALL_CHANNEL_SCAN, /**< All channel scan, scan will end after scan all the channel */
|
||||
}wifi_scan_method_t;
|
||||
} wifi_scan_method_t;
|
||||
|
||||
typedef enum {
|
||||
WIFI_CONNECT_AP_BY_SIGNAL = 0, /**< Sort match AP in scan list by RSSI */
|
||||
WIFI_CONNECT_AP_BY_SECURITY, /**< Sort match AP in scan list by security mode */
|
||||
}wifi_sort_method_t;
|
||||
} wifi_sort_method_t;
|
||||
|
||||
/** @brief Structure describing parameters for a WiFi fast scan */
|
||||
typedef struct {
|
||||
int8_t rssi; /**< The minimum rssi to accept in the fast scan mode */
|
||||
wifi_auth_mode_t authmode; /**< The weakest authmode to accept in the fast scan mode
|
||||
Note: In case this value is not set and password is set as per WPA2 standards(password len >= 8), it will be defaulted to WPA2 and device won't connect to deprecated WEP/WPA networks. Please set authmode threshold as WIFI_AUTH_WEP/WIFI_AUTH_WPA_PSK to connect to WEP/WPA networks */
|
||||
}wifi_scan_threshold_t;
|
||||
} wifi_scan_threshold_t;
|
||||
|
||||
typedef enum {
|
||||
WIFI_PS_NONE, /**< No power save */
|
||||
|
|
@ -340,26 +339,26 @@ typedef struct {
|
|||
wifi_sort_method_t sort_method; /**< sort the connect AP in the list by rssi or security mode */
|
||||
wifi_scan_threshold_t threshold; /**< When scan_threshold is set, only APs which have an auth mode that is more secure than the selected auth mode and a signal stronger than the minimum RSSI will be used. */
|
||||
wifi_pmf_config_t pmf_cfg; /**< Configuration for Protected Management Frame. Will be advertised in RSN Capabilities in RSN IE. */
|
||||
uint32_t rm_enabled:1; /**< Whether Radio Measurements are enabled for the connection */
|
||||
uint32_t btm_enabled:1; /**< Whether BSS Transition Management is enabled for the connection. Note that when btm is enabled, the application itself should not set specific bssid (i.e using bssid_set and bssid in this config)or channel to connect to. This defeats the purpose of a BTM supported network, and hence if btm is supported and a specific bssid or channel is set in this config, it will be cleared from the config at the first disconnection or connection so that the device can roam to other BSS. It is recommended not to set BSSID when BTM is enabled. */
|
||||
uint32_t mbo_enabled:1; /**< Whether MBO is enabled for the connection. Note that when mbo is enabled, the application itself should not set specific bssid (i.e using bssid_set and bssid in this config)or channel to connect to. This defeats the purpose of a MBO supported network, and hence if btm is supported and a specific bssid or channel is set in this config, it will be cleared from the config at the first disconnection or connection so that the device can roam to other BSS. It is recommended not to set BSSID when MBO is enabled. Enabling mbo here, automatically enables btm and rm above.*/
|
||||
uint32_t ft_enabled:1; /**< Whether FT is enabled for the connection */
|
||||
uint32_t owe_enabled:1; /**< Whether OWE is enabled for the connection */
|
||||
uint32_t transition_disable:1; /**< Whether to enable transition disable feature */
|
||||
uint32_t reserved:26; /**< Reserved for future feature set */
|
||||
uint32_t rm_enabled: 1; /**< Whether Radio Measurements are enabled for the connection */
|
||||
uint32_t btm_enabled: 1; /**< Whether BSS Transition Management is enabled for the connection. Note that when btm is enabled, the application itself should not set specific bssid (i.e using bssid_set and bssid in this config)or channel to connect to. This defeats the purpose of a BTM supported network, and hence if btm is supported and a specific bssid or channel is set in this config, it will be cleared from the config at the first disconnection or connection so that the device can roam to other BSS. It is recommended not to set BSSID when BTM is enabled. */
|
||||
uint32_t mbo_enabled: 1; /**< Whether MBO is enabled for the connection. Note that when mbo is enabled, the application itself should not set specific bssid (i.e using bssid_set and bssid in this config)or channel to connect to. This defeats the purpose of a MBO supported network, and hence if btm is supported and a specific bssid or channel is set in this config, it will be cleared from the config at the first disconnection or connection so that the device can roam to other BSS. It is recommended not to set BSSID when MBO is enabled. Enabling mbo here, automatically enables btm and rm above.*/
|
||||
uint32_t ft_enabled: 1; /**< Whether FT is enabled for the connection */
|
||||
uint32_t owe_enabled: 1; /**< Whether OWE is enabled for the connection */
|
||||
uint32_t transition_disable: 1; /**< Whether to enable transition disable feature */
|
||||
uint32_t reserved: 26; /**< Reserved for future feature set */
|
||||
wifi_sae_pwe_method_t sae_pwe_h2e; /**< Configuration for SAE PWE derivation method */
|
||||
wifi_sae_pk_mode_t sae_pk_mode; /**< Configuration for SAE-PK (Public Key) Authentication method */
|
||||
uint8_t failure_retry_cnt; /**< Number of connection retries station will do before moving to next AP. scan_method should be set as WIFI_ALL_CHANNEL_SCAN to use this config.
|
||||
Note: Enabling this may cause connection time to increase in case best AP doesn't behave properly. */
|
||||
uint32_t he_dcm_set:1; /**< Whether DCM max.constellation for transmission and reception is set. */
|
||||
uint32_t he_dcm_max_constellation_tx:2; /**< Indicate the max.constellation for DCM in TB PPDU the STA supported. 0: not supported. 1: BPSK, 2: QPSK, 3: 16-QAM. The default value is 3. */
|
||||
uint32_t he_dcm_max_constellation_rx:2; /**< Indicate the max.constellation for DCM in both Data field and HE-SIG-B field the STA supported. 0: not supported. 1: BPSK, 2: QPSK, 3: 16-QAM. The default value is 3. */
|
||||
uint32_t he_mcs9_enabled:1; /**< Whether to support HE-MCS 0 to 9. The default value is 0. */
|
||||
uint32_t he_su_beamformee_disabled:1; /**< Whether to disable support for operation as an SU beamformee. */
|
||||
uint32_t he_trig_su_bmforming_feedback_disabled:1; /**< Whether to disable support the transmission of SU feedback in an HE TB sounding sequence. */
|
||||
uint32_t he_trig_mu_bmforming_partial_feedback_disabled:1; /**< Whether to disable support the transmission of partial-bandwidth MU feedback in an HE TB sounding sequence. */
|
||||
uint32_t he_trig_cqi_feedback_disabled:1; /**< Whether to disable support the transmission of CQI feedback in an HE TB sounding sequence. */
|
||||
uint32_t he_reserved:22; /**< Reserved for future feature set */
|
||||
uint32_t he_dcm_set: 1; /**< Whether DCM max.constellation for transmission and reception is set. */
|
||||
uint32_t he_dcm_max_constellation_tx: 2; /**< Indicate the max.constellation for DCM in TB PPDU the STA supported. 0: not supported. 1: BPSK, 2: QPSK, 3: 16-QAM. The default value is 3. */
|
||||
uint32_t he_dcm_max_constellation_rx: 2; /**< Indicate the max.constellation for DCM in both Data field and HE-SIG-B field the STA supported. 0: not supported. 1: BPSK, 2: QPSK, 3: 16-QAM. The default value is 3. */
|
||||
uint32_t he_mcs9_enabled: 1; /**< Whether to support HE-MCS 0 to 9. The default value is 0. */
|
||||
uint32_t he_su_beamformee_disabled: 1; /**< Whether to disable support for operation as an SU beamformee. */
|
||||
uint32_t he_trig_su_bmforming_feedback_disabled: 1; /**< Whether to disable support the transmission of SU feedback in an HE TB sounding sequence. */
|
||||
uint32_t he_trig_mu_bmforming_partial_feedback_disabled: 1; /**< Whether to disable support the transmission of partial-bandwidth MU feedback in an HE TB sounding sequence. */
|
||||
uint32_t he_trig_cqi_feedback_disabled: 1; /**< Whether to disable support the transmission of CQI feedback in an HE TB sounding sequence. */
|
||||
uint32_t he_reserved: 22; /**< Reserved for future feature set */
|
||||
uint8_t sae_h2e_identifier[SAE_H2E_IDENTIFIER_LEN];/**< Password identifier for H2E. this needs to be null terminated string */
|
||||
} wifi_sta_config_t;
|
||||
|
||||
|
|
@ -390,15 +389,15 @@ typedef union {
|
|||
typedef struct {
|
||||
uint8_t mac[6]; /**< mac address */
|
||||
int8_t rssi; /**< current average rssi of sta connected */
|
||||
uint32_t phy_11b:1; /**< bit: 0 flag to identify if 11b mode is enabled or not */
|
||||
uint32_t phy_11g:1; /**< bit: 1 flag to identify if 11g mode is enabled or not */
|
||||
uint32_t phy_11n:1; /**< bit: 2 flag to identify if 11n mode is enabled or not */
|
||||
uint32_t phy_lr:1; /**< bit: 3 flag to identify if low rate is enabled or not */
|
||||
uint32_t phy_11a:1; /**< bit: 4 flag to identify if 11ax mode is enabled or not */
|
||||
uint32_t phy_11ac:1; /**< bit: 5 flag to identify if 11ax mode is enabled or not */
|
||||
uint32_t phy_11ax:1; /**< bit: 6 flag to identify if 11ax mode is enabled or not */
|
||||
uint32_t is_mesh_child:1;/**< bit: 7 flag to identify mesh child */
|
||||
uint32_t reserved:24; /**< bit: 8..31 reserved */
|
||||
uint32_t phy_11b: 1; /**< bit: 0 flag to identify if 11b mode is enabled or not */
|
||||
uint32_t phy_11g: 1; /**< bit: 1 flag to identify if 11g mode is enabled or not */
|
||||
uint32_t phy_11n: 1; /**< bit: 2 flag to identify if 11n mode is enabled or not */
|
||||
uint32_t phy_lr: 1; /**< bit: 3 flag to identify if low rate is enabled or not */
|
||||
uint32_t phy_11a: 1; /**< bit: 4 flag to identify if 11ax mode is enabled or not */
|
||||
uint32_t phy_11ac: 1; /**< bit: 5 flag to identify if 11ax mode is enabled or not */
|
||||
uint32_t phy_11ax: 1; /**< bit: 6 flag to identify if 11ax mode is enabled or not */
|
||||
uint32_t is_mesh_child: 1; /**< bit: 7 flag to identify mesh child */
|
||||
uint32_t reserved: 24; /**< bit: 8..31 reserved */
|
||||
} wifi_sta_info_t;
|
||||
|
||||
typedef enum {
|
||||
|
|
@ -434,8 +433,7 @@ typedef enum {
|
|||
/**
|
||||
* @brief Operation Phymode
|
||||
*/
|
||||
typedef enum
|
||||
{
|
||||
typedef enum {
|
||||
WIFI_PHY_MODE_LR, /**< PHY mode for Low Rate */
|
||||
WIFI_PHY_MODE_11B, /**< PHY mode for 11b */
|
||||
WIFI_PHY_MODE_11G, /**< PHY mode for 11g */
|
||||
|
|
@ -472,7 +470,6 @@ typedef enum {
|
|||
WIFI_PKT_MISC, /**< Other type, such as MIMO etc. 'buf' argument is wifi_promiscuous_pkt_t but the payload is zero length. */
|
||||
} wifi_promiscuous_pkt_type_t;
|
||||
|
||||
|
||||
#define WIFI_PROMIS_FILTER_MASK_ALL (0xFFFFFFFF) /**< filter all packets */
|
||||
#define WIFI_PROMIS_FILTER_MASK_MGMT (1) /**< filter the packets with type of WIFI_PKT_MGMT */
|
||||
#define WIFI_PROMIS_FILTER_MASK_CTRL (1<<1) /**< filter the packets with type of WIFI_PKT_CTRL */
|
||||
|
|
@ -616,9 +613,9 @@ typedef struct {
|
|||
wifi_nan_service_type_t type; /**< Service type */
|
||||
char matching_filter[ESP_WIFI_MAX_FILTER_LEN]; /**< Comma separated filters for filtering services */
|
||||
char svc_info[ESP_WIFI_MAX_SVC_INFO_LEN]; /**< Service info shared in Publish frame */
|
||||
uint8_t single_replied_event:1; /**< Give single Replied event or every time */
|
||||
uint8_t datapath_reqd:1; /**< NAN Datapath required for the service */
|
||||
uint8_t reserved:6; /**< Reserved */
|
||||
uint8_t single_replied_event: 1; /**< Give single Replied event or every time */
|
||||
uint8_t datapath_reqd: 1; /**< NAN Datapath required for the service */
|
||||
uint8_t reserved: 6; /**< Reserved */
|
||||
} wifi_nan_publish_cfg_t;
|
||||
|
||||
/**
|
||||
|
|
@ -630,8 +627,8 @@ typedef struct {
|
|||
wifi_nan_service_type_t type; /**< Service type */
|
||||
char matching_filter[ESP_WIFI_MAX_FILTER_LEN]; /**< Comma separated filters for filtering services */
|
||||
char svc_info[ESP_WIFI_MAX_SVC_INFO_LEN]; /**< Service info shared in Subscribe frame */
|
||||
uint8_t single_match_event:1; /**< Give single Match event or every time */
|
||||
uint8_t reserved:7; /**< Reserved */
|
||||
uint8_t single_match_event: 1; /**< Give single Match event or every time */
|
||||
uint8_t reserved: 7; /**< Reserved */
|
||||
} wifi_nan_subscribe_cfg_t;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -35,54 +35,54 @@ typedef esp_wifi_rxctrl_t wifi_pkt_rx_ctrl_t;
|
|||
#else
|
||||
/** @brief Received packet radio metadata header, this is the common header at the beginning of all promiscuous mode RX callback buffers */
|
||||
typedef struct {
|
||||
signed rssi:8; /**< Received Signal Strength Indicator(RSSI) of packet. unit: dBm */
|
||||
unsigned rate:5; /**< PHY rate encoding of the packet. Only valid for non HT(11bg) packet */
|
||||
unsigned :1; /**< reserved */
|
||||
unsigned sig_mode:2; /**< Protocol of the received packet, 0: non HT(11bg) packet; 1: HT(11n) packet; 3: VHT(11ac) packet */
|
||||
unsigned :16; /**< reserved */
|
||||
unsigned mcs:7; /**< Modulation Coding Scheme. If is HT(11n) packet, shows the modulation, range from 0 to 76(MSC0 ~ MCS76) */
|
||||
unsigned cwb:1; /**< Channel Bandwidth of the packet. 0: 20MHz; 1: 40MHz */
|
||||
unsigned :16; /**< reserved */
|
||||
unsigned smoothing:1; /**< Set to 1 indicates that channel estimate smoothing is recommended.
|
||||
signed rssi: 8; /**< Received Signal Strength Indicator(RSSI) of packet. unit: dBm */
|
||||
unsigned rate: 5; /**< PHY rate encoding of the packet. Only valid for non HT(11bg) packet */
|
||||
unsigned : 1; /**< reserved */
|
||||
unsigned sig_mode: 2; /**< Protocol of the received packet, 0: non HT(11bg) packet; 1: HT(11n) packet; 3: VHT(11ac) packet */
|
||||
unsigned : 16; /**< reserved */
|
||||
unsigned mcs: 7; /**< Modulation Coding Scheme. If is HT(11n) packet, shows the modulation, range from 0 to 76(MSC0 ~ MCS76) */
|
||||
unsigned cwb: 1; /**< Channel Bandwidth of the packet. 0: 20MHz; 1: 40MHz */
|
||||
unsigned : 16; /**< reserved */
|
||||
unsigned smoothing: 1; /**< Set to 1 indicates that channel estimate smoothing is recommended.
|
||||
Set to 0 indicates that only per-carrierindependent (unsmoothed) channel estimate is recommended. */
|
||||
unsigned not_sounding:1; /**< Set to 0 indicates that PPDU is a sounding PPDU. Set to 1indicates that the PPDU is not a sounding PPDU.
|
||||
unsigned not_sounding: 1; /**< Set to 0 indicates that PPDU is a sounding PPDU. Set to 1indicates that the PPDU is not a sounding PPDU.
|
||||
sounding PPDU is used for channel estimation by the request receiver */
|
||||
unsigned :1; /**< reserved */
|
||||
unsigned aggregation:1; /**< Aggregation. 0: MPDU packet; 1: AMPDU packet */
|
||||
unsigned stbc:2; /**< Space Time Block Code(STBC). 0: non STBC packet; 1: STBC packet */
|
||||
unsigned fec_coding:1; /**< Forward Error Correction(FEC). Flag is set for 11n packets which are LDPC */
|
||||
unsigned sgi:1; /**< Short Guide Interval(SGI). 0: Long GI; 1: Short GI */
|
||||
unsigned : 1; /**< reserved */
|
||||
unsigned aggregation: 1; /**< Aggregation. 0: MPDU packet; 1: AMPDU packet */
|
||||
unsigned stbc: 2; /**< Space Time Block Code(STBC). 0: non STBC packet; 1: STBC packet */
|
||||
unsigned fec_coding: 1; /**< Forward Error Correction(FEC). Flag is set for 11n packets which are LDPC */
|
||||
unsigned sgi: 1; /**< Short Guide Interval(SGI). 0: Long GI; 1: Short GI */
|
||||
#if CONFIG_IDF_TARGET_ESP32
|
||||
signed noise_floor:8; /**< noise floor of Radio Frequency Module(RF). unit: dBm*/
|
||||
signed noise_floor: 8; /**< noise floor of Radio Frequency Module(RF). unit: dBm*/
|
||||
#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C2
|
||||
unsigned :8; /**< reserved */
|
||||
unsigned : 8; /**< reserved */
|
||||
#endif
|
||||
unsigned ampdu_cnt:8; /**< the number of subframes aggregated in AMPDU */
|
||||
unsigned channel:4; /**< primary channel on which this packet is received */
|
||||
unsigned secondary_channel:4; /**< secondary channel on which this packet is received. 0: none; 1: above; 2: below */
|
||||
unsigned :8; /**< reserved */
|
||||
unsigned timestamp:32; /**< timestamp. The local time when this packet is received. It is precise only if modem sleep or light sleep is not enabled. unit: microsecond */
|
||||
unsigned :32; /**< reserved */
|
||||
unsigned ampdu_cnt: 8; /**< the number of subframes aggregated in AMPDU */
|
||||
unsigned channel: 4; /**< primary channel on which this packet is received */
|
||||
unsigned secondary_channel: 4; /**< secondary channel on which this packet is received. 0: none; 1: above; 2: below */
|
||||
unsigned : 8; /**< reserved */
|
||||
unsigned timestamp: 32; /**< timestamp. The local time when this packet is received. It is precise only if modem sleep or light sleep is not enabled. unit: microsecond */
|
||||
unsigned : 32; /**< reserved */
|
||||
#if CONFIG_IDF_TARGET_ESP32S2
|
||||
unsigned :32; /**< reserved */
|
||||
unsigned : 32; /**< reserved */
|
||||
#elif CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C2
|
||||
signed noise_floor:8; /**< noise floor of Radio Frequency Module(RF). unit: dBm*/
|
||||
unsigned :24; /**< reserved */
|
||||
unsigned :32; /**< reserved */
|
||||
signed noise_floor: 8; /**< noise floor of Radio Frequency Module(RF). unit: dBm*/
|
||||
unsigned : 24; /**< reserved */
|
||||
unsigned : 32; /**< reserved */
|
||||
#endif
|
||||
unsigned :31; /**< reserved */
|
||||
unsigned ant:1; /**< antenna number from which this packet is received. 0: WiFi antenna 0; 1: WiFi antenna 1 */
|
||||
unsigned : 31; /**< reserved */
|
||||
unsigned ant: 1; /**< antenna number from which this packet is received. 0: WiFi antenna 0; 1: WiFi antenna 1 */
|
||||
#if CONFIG_IDF_TARGET_ESP32S2
|
||||
signed noise_floor:8; /**< noise floor of Radio Frequency Module(RF). unit: dBm*/
|
||||
unsigned :24; /**< reserved */
|
||||
signed noise_floor: 8; /**< noise floor of Radio Frequency Module(RF). unit: dBm*/
|
||||
unsigned : 24; /**< reserved */
|
||||
#elif CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C2
|
||||
unsigned :32; /**< reserved */
|
||||
unsigned :32; /**< reserved */
|
||||
unsigned :32; /**< reserved */
|
||||
unsigned : 32; /**< reserved */
|
||||
unsigned : 32; /**< reserved */
|
||||
unsigned : 32; /**< reserved */
|
||||
#endif
|
||||
unsigned sig_len:12; /**< length of packet including Frame Check Sequence(FCS) */
|
||||
unsigned :12; /**< reserved */
|
||||
unsigned rx_state:8; /**< state of the packet. 0: no error; others: error numbers which are not public */
|
||||
unsigned sig_len: 12; /**< length of packet including Frame Check Sequence(FCS) */
|
||||
unsigned : 12; /**< reserved */
|
||||
unsigned rx_state: 8; /**< state of the packet. 0: no error; others: error numbers which are not public */
|
||||
} wifi_pkt_rx_ctrl_t;
|
||||
#endif
|
||||
|
||||
|
|
@ -105,7 +105,6 @@ typedef struct {
|
|||
} wifi_csi_config_t;
|
||||
#endif // !CONFIG_SOC_WIFI_HE_SUPPORT
|
||||
|
||||
|
||||
/** @brief Payload passed to 'buf' parameter of promiscuous mode RX callback.
|
||||
*/
|
||||
typedef struct {
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 49c8e2d99d2dfc26e49b320327fb6df06dfc9722
|
||||
Subproject commit 852cfcfa667356b2ae99052d6fbe5fdb587956eb
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: 2010-2022 Espressif Systems (Shanghai) CO LTD
|
||||
* SPDX-FileCopyrightText: 2010-2024 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
|
@ -86,7 +86,7 @@ static void sc_ack_send_task(void *pvParameters)
|
|||
remote_port = SC_ACK_TOUCH_SERVER_PORT;
|
||||
} else if (ack->type == SC_TYPE_ESPTOUCH_V2) {
|
||||
uint8_t port_bit = ack->ctx.token;
|
||||
if(port_bit > 3) {
|
||||
if (port_bit > 3) {
|
||||
port_bit = 0;
|
||||
}
|
||||
remote_port = SC_ACK_TOUCH_V2_SERVER_PORT(port_bit);
|
||||
|
|
@ -194,8 +194,7 @@ static void sc_ack_send_task(void *pvParameters)
|
|||
goto _end;
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
vTaskDelay((TickType_t)(100 / portTICK_PERIOD_MS));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: 2019-2023 Espressif Systems (Shanghai) CO LTD
|
||||
* SPDX-FileCopyrightText: 2019-2024 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
|
@ -278,13 +278,13 @@ esp_err_t esp_wifi_set_default_wifi_nan_handlers(void)
|
|||
esp_err_t esp_wifi_clear_default_wifi_driver_and_handlers(void *esp_netif)
|
||||
{
|
||||
int i;
|
||||
for (i = 0; i< MAX_WIFI_IFS; ++i) {
|
||||
for (i = 0; i < MAX_WIFI_IFS; ++i) {
|
||||
// clear internal static pointers to netifs
|
||||
if (s_wifi_netifs[i] == esp_netif) {
|
||||
s_wifi_netifs[i] = NULL;
|
||||
}
|
||||
}
|
||||
for (i = 0; i< MAX_WIFI_IFS; ++i) {
|
||||
for (i = 0; i < MAX_WIFI_IFS; ++i) {
|
||||
// check if all netifs are cleared to delete default handlers
|
||||
if (s_wifi_netifs[i] != NULL) {
|
||||
break;
|
||||
|
|
@ -298,7 +298,6 @@ esp_err_t esp_wifi_clear_default_wifi_driver_and_handlers(void *esp_netif)
|
|||
return disconnect_and_destroy(esp_netif);
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
// Object manipulation
|
||||
//
|
||||
|
|
@ -360,7 +359,6 @@ esp_err_t esp_netif_attach_wifi_nan(esp_netif_t *esp_netif)
|
|||
}
|
||||
#endif
|
||||
|
||||
|
||||
//
|
||||
// Default WiFi creation from user code
|
||||
//
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: 2019-2023 Espressif Systems (Shanghai) CO LTD
|
||||
* SPDX-FileCopyrightText: 2019-2024 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
|
@ -83,7 +83,7 @@ static esp_err_t wifi_driver_start(esp_netif_t * esp_netif, void * args)
|
|||
esp_netif_driver_ifconfig_t driver_ifconfig = {
|
||||
.handle = driver,
|
||||
.transmit = wifi_transmit,
|
||||
.transmit_wrap= wifi_transmit_wrap,
|
||||
.transmit_wrap = wifi_transmit_wrap,
|
||||
.driver_free_rx_buffer = wifi_free
|
||||
};
|
||||
|
||||
|
|
@ -140,8 +140,7 @@ esp_err_t esp_wifi_register_if_rxcb(wifi_netif_driver_t ifx, esp_netif_receive_t
|
|||
wifi_rxcb_t rxcb = NULL;
|
||||
esp_err_t ret;
|
||||
|
||||
switch (wifi_interface)
|
||||
{
|
||||
switch (wifi_interface) {
|
||||
|
||||
case WIFI_IF_STA:
|
||||
rxcb = wifi_sta_receive;
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ void tearDown(void)
|
|||
check_leak(before_free_32bit, after_free_32bit, "32BIT");
|
||||
}
|
||||
|
||||
|
||||
void app_main(void)
|
||||
{
|
||||
ESP_ERROR_CHECK(nvs_flash_init());
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD
|
||||
* SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Unlicense OR CC0-1.0
|
||||
*
|
||||
|
|
@ -24,7 +24,6 @@
|
|||
#include "freertos/task.h"
|
||||
#include "freertos/event_groups.h"
|
||||
|
||||
|
||||
#ifndef TEST_SUFFIX_STR
|
||||
#define TEST_SUFFIX_STR "_0000"
|
||||
#endif
|
||||
|
|
@ -34,7 +33,6 @@
|
|||
#define TEST_DEFAULT_CHANNEL (6)
|
||||
#define CONNECT_TIMEOUT_MS (8000)
|
||||
|
||||
|
||||
#define GOT_IP_EVENT (1)
|
||||
#define WIFI_DISCONNECT_EVENT (1<<1)
|
||||
#define WIFI_STA_CONNECTED (1<<2)
|
||||
|
|
@ -42,7 +40,6 @@
|
|||
|
||||
#define EVENT_HANDLER_FLAG_DO_NOT_AUTO_RECONNECT 0x00000001
|
||||
|
||||
|
||||
static const char* TAG = "test_wifi";
|
||||
static uint32_t wifi_event_handler_flag;
|
||||
static esp_netif_t* s_ap_netif = NULL;
|
||||
|
|
@ -54,7 +51,7 @@ static void wifi_event_handler(void* arg, esp_event_base_t event_base,
|
|||
int32_t event_id, void* event_data)
|
||||
{
|
||||
ESP_LOGI(TAG, "wifi event handler: %"PRIi32, event_id);
|
||||
switch(event_id) {
|
||||
switch (event_id) {
|
||||
case WIFI_EVENT_STA_START:
|
||||
ESP_LOGI(TAG, "WIFI_EVENT_STA_START");
|
||||
break;
|
||||
|
|
@ -74,7 +71,7 @@ static void wifi_event_handler(void* arg, esp_event_base_t event_base,
|
|||
ESP_LOGI(TAG, "WIFI_EVENT_STA_DISCONNECTED");
|
||||
wifi_event_sta_disconnected_t *event = (wifi_event_sta_disconnected_t *)event_data;
|
||||
ESP_LOGI(TAG, "disconnect reason: %u", event->reason);
|
||||
if (! (EVENT_HANDLER_FLAG_DO_NOT_AUTO_RECONNECT & wifi_event_handler_flag) ) {
|
||||
if (!(EVENT_HANDLER_FLAG_DO_NOT_AUTO_RECONNECT & wifi_event_handler_flag)) {
|
||||
TEST_ESP_OK(esp_wifi_connect());
|
||||
}
|
||||
if (wifi_events) {
|
||||
|
|
@ -87,14 +84,13 @@ static void wifi_event_handler(void* arg, esp_event_base_t event_base,
|
|||
return;
|
||||
}
|
||||
|
||||
|
||||
static void ip_event_handler(void* arg, esp_event_base_t event_base,
|
||||
int32_t event_id, void* event_data)
|
||||
{
|
||||
ip_event_got_ip_t *event;
|
||||
|
||||
ESP_LOGI(TAG, "ip event handler");
|
||||
switch(event_id) {
|
||||
switch (event_id) {
|
||||
case IP_EVENT_STA_GOT_IP:
|
||||
event = (ip_event_got_ip_t*)event_data;
|
||||
ESP_LOGI(TAG, "IP_EVENT_STA_GOT_IP");
|
||||
|
|
@ -131,7 +127,6 @@ static esp_err_t event_deinit(void)
|
|||
|
||||
#define EMPH_STR(s) "****** "s" ******"
|
||||
|
||||
|
||||
static void start_wifi_as_softap(void)
|
||||
{
|
||||
wifi_config_t w_config = {
|
||||
|
|
@ -181,7 +176,7 @@ static void stop_wifi(void)
|
|||
vEventGroupDelete(wifi_events);
|
||||
wifi_events = NULL;
|
||||
}
|
||||
vTaskDelay(500/portTICK_PERIOD_MS);
|
||||
vTaskDelay(500 / portTICK_PERIOD_MS);
|
||||
}
|
||||
|
||||
static void receive_ds2ds_packet(void)
|
||||
|
|
@ -189,7 +184,7 @@ static void receive_ds2ds_packet(void)
|
|||
start_wifi_as_softap();
|
||||
|
||||
// wait for sender to send packets
|
||||
vTaskDelay(1000/portTICK_PERIOD_MS);
|
||||
vTaskDelay(1000 / portTICK_PERIOD_MS);
|
||||
stop_wifi();
|
||||
}
|
||||
|
||||
|
|
@ -210,7 +205,7 @@ static void send_ds2ds_packet(void)
|
|||
esp_wifi_80211_tx(WIFI_IF_AP, ds2ds_pdu, sizeof(ds2ds_pdu), true);
|
||||
vTaskDelay(50 / portTICK_PERIOD_MS);
|
||||
}
|
||||
vTaskDelay(500/portTICK_PERIOD_MS);
|
||||
vTaskDelay(500 / portTICK_PERIOD_MS);
|
||||
stop_wifi();
|
||||
}
|
||||
|
||||
|
|
@ -228,7 +223,7 @@ static void wifi_connect(void)
|
|||
TEST_ESP_OK(esp_wifi_set_config(WIFI_IF_STA, &w_config));
|
||||
TEST_ESP_OK(esp_wifi_connect());
|
||||
ESP_LOGI(TAG, "start esp_wifi_connect: %s", TEST_DEFAULT_SSID);
|
||||
bits = xEventGroupWaitBits(wifi_events, GOT_IP_EVENT, 1, 0, CONNECT_TIMEOUT_MS/portTICK_PERIOD_MS);
|
||||
bits = xEventGroupWaitBits(wifi_events, GOT_IP_EVENT, 1, 0, CONNECT_TIMEOUT_MS / portTICK_PERIOD_MS);
|
||||
TEST_ASSERT(bits & GOT_IP_EVENT);
|
||||
}
|
||||
|
||||
|
|
@ -238,7 +233,7 @@ static void test_wifi_connection_sta(void)
|
|||
start_wifi_as_sta();
|
||||
|
||||
// make sure softap has started
|
||||
vTaskDelay(1000/portTICK_PERIOD_MS);
|
||||
vTaskDelay(1000 / portTICK_PERIOD_MS);
|
||||
wifi_connect();
|
||||
|
||||
// do not auto reconnect after connected
|
||||
|
|
@ -258,7 +253,7 @@ static void test_wifi_connection_softap(void)
|
|||
start_wifi_as_softap();
|
||||
|
||||
// wait station connected
|
||||
bits = xEventGroupWaitBits(wifi_events, WIFI_AP_STA_CONNECTED, 1, 0, CONNECT_TIMEOUT_MS/portTICK_PERIOD_MS);
|
||||
bits = xEventGroupWaitBits(wifi_events, WIFI_AP_STA_CONNECTED, 1, 0, CONNECT_TIMEOUT_MS / portTICK_PERIOD_MS);
|
||||
TEST_ASSERT(bits & WIFI_AP_STA_CONNECTED);
|
||||
|
||||
// wait 70s (longer than station side)
|
||||
|
|
@ -275,7 +270,7 @@ static void esp_wifi_connect_first_time(void)
|
|||
{
|
||||
start_wifi_as_sta();
|
||||
// make sure softap has started
|
||||
vTaskDelay(1000/portTICK_PERIOD_MS);
|
||||
vTaskDelay(1000 / portTICK_PERIOD_MS);
|
||||
|
||||
wifi_config_t w_config;
|
||||
memset(&w_config, 0, sizeof(w_config));
|
||||
|
|
@ -296,7 +291,7 @@ static void test_wifi_connect_at_scan_phase(void)
|
|||
esp_wifi_connect_first_time();
|
||||
|
||||
// connect when first connect in scan
|
||||
vTaskDelay(300/portTICK_PERIOD_MS);
|
||||
vTaskDelay(300 / portTICK_PERIOD_MS);
|
||||
ESP_LOGI(TAG, "connect when first connect in scan");
|
||||
TEST_ESP_ERR(ESP_ERR_WIFI_CONN, esp_wifi_connect());
|
||||
wifi_event_handler_flag |= EVENT_HANDLER_FLAG_DO_NOT_AUTO_RECONNECT;
|
||||
|
|
@ -310,7 +305,7 @@ static void test_wifi_connect_before_connected_phase(void)
|
|||
esp_wifi_connect_first_time();
|
||||
|
||||
// connect before connected
|
||||
vTaskDelay(730/portTICK_PERIOD_MS);
|
||||
vTaskDelay(730 / portTICK_PERIOD_MS);
|
||||
ESP_LOGI(TAG, "connect when first connect after scan before connected");
|
||||
TEST_ESP_ERR(ESP_ERR_WIFI_CONN, esp_wifi_connect());
|
||||
wifi_event_handler_flag |= EVENT_HANDLER_FLAG_DO_NOT_AUTO_RECONNECT;
|
||||
|
|
@ -328,7 +323,7 @@ static void test_wifi_connect_after_connected_phase(void)
|
|||
xEventGroupClearBits(wifi_events, WIFI_STA_CONNECTED | WIFI_DISCONNECT_EVENT);
|
||||
ESP_LOGI(TAG, "connect after connected");
|
||||
TEST_ESP_OK(esp_wifi_connect());
|
||||
bits = xEventGroupWaitBits(wifi_events, WIFI_STA_CONNECTED | WIFI_DISCONNECT_EVENT, pdTRUE, pdFALSE, CONNECT_TIMEOUT_MS/portTICK_PERIOD_MS);
|
||||
bits = xEventGroupWaitBits(wifi_events, WIFI_STA_CONNECTED | WIFI_DISCONNECT_EVENT, pdTRUE, pdFALSE, CONNECT_TIMEOUT_MS / portTICK_PERIOD_MS);
|
||||
// shouldn't reconnect
|
||||
TEST_ASSERT((bits & WIFI_AP_STA_CONNECTED) == 0);
|
||||
// shouldn't disconnect
|
||||
|
|
@ -344,7 +339,7 @@ static void set_wifi_softap(void)
|
|||
start_wifi_as_softap();
|
||||
|
||||
// wait for sta connect
|
||||
vTaskDelay(20000/portTICK_PERIOD_MS);
|
||||
vTaskDelay(20000 / portTICK_PERIOD_MS);
|
||||
stop_wifi();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@ void tearDown(void)
|
|||
check_leak(before_free_32bit, after_free_32bit, "32BIT");
|
||||
}
|
||||
|
||||
|
||||
void app_main(void)
|
||||
{
|
||||
ESP_ERROR_CHECK(nvs_flash_init());
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
|
||||
* SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Unlicense OR CC0-1.0
|
||||
*/
|
||||
|
|
@ -20,8 +20,8 @@ TEST_CASE("wifi set country code", "[wifi_init]")
|
|||
TEST_ESP_OK(esp_wifi_init(&cfg));
|
||||
|
||||
wifi_country_t country;
|
||||
wifi_country_t country_01 = {.cc="01", .schan=1, .nchan=11, .policy=WIFI_COUNTRY_POLICY_MANUAL};
|
||||
wifi_country_t country_CN = {.cc="CN", .schan=1, .nchan=13, .policy=WIFI_COUNTRY_POLICY_MANUAL};
|
||||
wifi_country_t country_01 = {.cc = "01", .schan = 1, .nchan = 11, .policy = WIFI_COUNTRY_POLICY_MANUAL};
|
||||
wifi_country_t country_CN = {.cc = "CN", .schan = 1, .nchan = 13, .policy = WIFI_COUNTRY_POLICY_MANUAL};
|
||||
|
||||
ESP_LOGI(TAG, EMPH_STR("esp_wifi_get_country (default)"));
|
||||
TEST_ESP_OK(esp_wifi_get_country(&country));
|
||||
|
|
@ -34,7 +34,6 @@ TEST_CASE("wifi set country code", "[wifi_init]")
|
|||
TEST_ESP_OK(esp_wifi_get_country(&country));
|
||||
TEST_ASSERT(country.cc[0] == country_CN.cc[0] && country.cc[1] == country_CN.cc[1]);
|
||||
|
||||
|
||||
ESP_LOGI(TAG, EMPH_STR("esp_wifi_deinit"));
|
||||
TEST_ESP_OK(esp_wifi_deinit());
|
||||
|
||||
|
|
@ -55,7 +54,6 @@ TEST_CASE("wifi set country code", "[wifi_init]")
|
|||
TEST_ESP_OK(esp_wifi_get_country_code(&country_code_string[0]));
|
||||
TEST_ASSERT(country_code_string[0] == country_code_string_CN[0] && country_code_string[1] == country_code_string_CN[1]);
|
||||
|
||||
|
||||
ESP_LOGI(TAG, EMPH_STR("esp_wifi_deinit"));
|
||||
TEST_ESP_OK(esp_wifi_deinit());
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
|
||||
* SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Unlicense OR CC0-1.0
|
||||
*/
|
||||
|
|
@ -15,13 +15,12 @@
|
|||
|
||||
#define EMPH_STR(s) "****** "s" ******"
|
||||
|
||||
|
||||
static const char* TAG = "test_wifi_init";
|
||||
|
||||
static void wifi_event_handler(void* arg, esp_event_base_t event_base, int32_t event_id, void* event_data)
|
||||
{
|
||||
printf("wifi event handle called.\n");
|
||||
switch(event_id) {
|
||||
switch (event_id) {
|
||||
case WIFI_EVENT_AP_START:
|
||||
ESP_LOGI(TAG, "WIFI_EVENT_AP_START");
|
||||
break;
|
||||
|
|
@ -46,7 +45,7 @@ static esp_err_t event_init(void)
|
|||
|
||||
static esp_err_t event_deinit(void)
|
||||
{
|
||||
ESP_ERROR_CHECK(esp_event_handler_unregister(WIFI_EVENT,ESP_EVENT_ANY_ID,&wifi_event_handler));
|
||||
ESP_ERROR_CHECK(esp_event_handler_unregister(WIFI_EVENT, ESP_EVENT_ANY_ID, &wifi_event_handler));
|
||||
ESP_ERROR_CHECK(esp_event_loop_delete_default());
|
||||
return ESP_OK;
|
||||
}
|
||||
|
|
@ -75,9 +74,9 @@ TEST_CASE("wifi driver can start on APP CPU", "[wifi_init]")
|
|||
TEST_ASSERT_NOT_NULL(sema);
|
||||
printf("Creating tasks\n");
|
||||
#ifndef CONFIG_FREERTOS_UNICORE
|
||||
xTaskCreatePinnedToCore(wifi_driver_can_start_on_APP_CPU_task, "wifi_driver_can_start_on_APP_CPU_task", 2048*2, &sema, 3, &th, 1);
|
||||
xTaskCreatePinnedToCore(wifi_driver_can_start_on_APP_CPU_task, "wifi_driver_can_start_on_APP_CPU_task", 2048 * 2, &sema, 3, &th, 1);
|
||||
#else
|
||||
xTaskCreate(wifi_driver_can_start_on_APP_CPU_task, "wifi_driver_can_start_on_APP_CPU_task", 2048*2, &sema, 3, &th);
|
||||
xTaskCreate(wifi_driver_can_start_on_APP_CPU_task, "wifi_driver_can_start_on_APP_CPU_task", 2048 * 2, &sema, 3, &th);
|
||||
#endif
|
||||
TEST_ASSERT_NOT_NULL(th);
|
||||
xSemaphoreTake(sema, portMAX_DELAY);
|
||||
|
|
|
|||
|
|
@ -83,8 +83,9 @@ static nan_ctx_t s_nan_ctx;
|
|||
|
||||
void esp_wifi_nan_get_ipv6_linklocal_from_mac(ip6_addr_t *ip6, uint8_t *mac_addr)
|
||||
{
|
||||
if (ip6 == NULL || mac_addr == NULL)
|
||||
if (ip6 == NULL || mac_addr == NULL) {
|
||||
return;
|
||||
}
|
||||
/* Link-local prefix. */
|
||||
ip6->addr[0] = htonl(0xfe800000ul);
|
||||
ip6->addr[1] = 0;
|
||||
|
|
|
|||
|
|
@ -42,7 +42,6 @@ typedef struct {
|
|||
bool fast_pac_format_binary; /**< Set to true for binary format PAC, false for ASCII format PAC */
|
||||
} esp_eap_fast_config;
|
||||
|
||||
|
||||
/**
|
||||
* @brief Enable EAP authentication(WiFi Enterprise) for the station mode.
|
||||
*
|
||||
|
|
@ -61,7 +60,6 @@ typedef struct {
|
|||
*/
|
||||
esp_err_t esp_wifi_sta_enterprise_enable(void);
|
||||
|
||||
|
||||
/**
|
||||
* @brief Disable EAP authentication(WiFi Enterprise) for the station mode.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD
|
||||
* SPDX-FileCopyrightText: 2020-2024 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -181,7 +181,6 @@ esp_err_t esp_wifi_ap_wps_disable(void);
|
|||
*/
|
||||
esp_err_t esp_wifi_ap_wps_start(const unsigned char *pin);
|
||||
|
||||
|
||||
/**
|
||||
* @}
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
|
||||
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
|
@ -33,7 +33,6 @@ struct crypto_bignum *crypto_bignum_init(void)
|
|||
return (struct crypto_bignum *)bn;
|
||||
}
|
||||
|
||||
|
||||
struct crypto_bignum *crypto_bignum_init_set(const u8 *buf, size_t len)
|
||||
{
|
||||
int ret = 0;
|
||||
|
|
@ -50,7 +49,6 @@ cleanup:
|
|||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
struct crypto_bignum * crypto_bignum_init_uint(unsigned int val)
|
||||
{
|
||||
|
||||
|
|
@ -65,14 +63,12 @@ struct crypto_bignum * crypto_bignum_init_uint(unsigned int val)
|
|||
return (struct crypto_bignum *)bn;
|
||||
}
|
||||
|
||||
|
||||
void crypto_bignum_deinit(struct crypto_bignum *n, int clear)
|
||||
{
|
||||
mbedtls_mpi_free((mbedtls_mpi *)n);
|
||||
os_free((mbedtls_mpi *)n);
|
||||
}
|
||||
|
||||
|
||||
int crypto_bignum_to_bin(const struct crypto_bignum *a,
|
||||
u8 *buf, size_t buflen, size_t padlen)
|
||||
{
|
||||
|
|
@ -102,7 +98,6 @@ cleanup:
|
|||
return ret;
|
||||
}
|
||||
|
||||
|
||||
int crypto_bignum_add(const struct crypto_bignum *a,
|
||||
const struct crypto_bignum *b,
|
||||
struct crypto_bignum *c)
|
||||
|
|
@ -111,7 +106,6 @@ int crypto_bignum_add(const struct crypto_bignum *a,
|
|||
-1 : 0;
|
||||
}
|
||||
|
||||
|
||||
int crypto_bignum_mod(const struct crypto_bignum *a,
|
||||
const struct crypto_bignum *b,
|
||||
struct crypto_bignum *c)
|
||||
|
|
@ -119,7 +113,6 @@ int crypto_bignum_mod(const struct crypto_bignum *a,
|
|||
return mbedtls_mpi_mod_mpi((mbedtls_mpi *) c, (const mbedtls_mpi *) a, (const mbedtls_mpi *) b) ? -1 : 0;
|
||||
}
|
||||
|
||||
|
||||
int crypto_bignum_exptmod(const struct crypto_bignum *a,
|
||||
const struct crypto_bignum *b,
|
||||
const struct crypto_bignum *c,
|
||||
|
|
@ -129,7 +122,6 @@ int crypto_bignum_exptmod(const struct crypto_bignum *a,
|
|||
|
||||
}
|
||||
|
||||
|
||||
int crypto_bignum_inverse(const struct crypto_bignum *a,
|
||||
const struct crypto_bignum *b,
|
||||
struct crypto_bignum *c)
|
||||
|
|
@ -138,7 +130,6 @@ int crypto_bignum_inverse(const struct crypto_bignum *a,
|
|||
(const mbedtls_mpi *) b) ? -1 : 0;
|
||||
}
|
||||
|
||||
|
||||
int crypto_bignum_sub(const struct crypto_bignum *a,
|
||||
const struct crypto_bignum *b,
|
||||
struct crypto_bignum *c)
|
||||
|
|
@ -147,7 +138,6 @@ int crypto_bignum_sub(const struct crypto_bignum *a,
|
|||
-1 : 0;
|
||||
}
|
||||
|
||||
|
||||
int crypto_bignum_div(const struct crypto_bignum *a,
|
||||
const struct crypto_bignum *b,
|
||||
struct crypto_bignum *c)
|
||||
|
|
@ -156,7 +146,6 @@ int crypto_bignum_div(const struct crypto_bignum *a,
|
|||
-1 : 0;
|
||||
}
|
||||
|
||||
|
||||
int crypto_bignum_mulmod(const struct crypto_bignum *a,
|
||||
const struct crypto_bignum *b,
|
||||
const struct crypto_bignum *c,
|
||||
|
|
@ -176,19 +165,18 @@ int crypto_bignum_sqrmod(const struct crypto_bignum *a,
|
|||
return -1;
|
||||
}
|
||||
|
||||
res = mbedtls_mpi_copy((mbedtls_mpi *) tmp,(const mbedtls_mpi *) a);
|
||||
res = crypto_bignum_mulmod(a,tmp,b,c);
|
||||
res = mbedtls_mpi_copy((mbedtls_mpi *) tmp, (const mbedtls_mpi *) a);
|
||||
res = crypto_bignum_mulmod(a, tmp, b, c);
|
||||
|
||||
crypto_bignum_deinit(tmp, 0);
|
||||
return res ? -1 : 0;
|
||||
}
|
||||
|
||||
|
||||
int crypto_bignum_rshift(const struct crypto_bignum *a, int n,
|
||||
struct crypto_bignum *r)
|
||||
{
|
||||
int res;
|
||||
res = mbedtls_mpi_copy((mbedtls_mpi *) r,(const mbedtls_mpi *) a);
|
||||
res = mbedtls_mpi_copy((mbedtls_mpi *) r, (const mbedtls_mpi *) a);
|
||||
if (res) {
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -198,26 +186,22 @@ int crypto_bignum_rshift(const struct crypto_bignum *a, int n,
|
|||
|
||||
}
|
||||
|
||||
|
||||
int crypto_bignum_cmp(const struct crypto_bignum *a,
|
||||
const struct crypto_bignum *b)
|
||||
{
|
||||
return mbedtls_mpi_cmp_mpi((const mbedtls_mpi *) a, (const mbedtls_mpi *) b);
|
||||
}
|
||||
|
||||
|
||||
int crypto_bignum_bits(const struct crypto_bignum *a)
|
||||
{
|
||||
return mbedtls_mpi_bitlen((const mbedtls_mpi *) a);
|
||||
}
|
||||
|
||||
|
||||
int crypto_bignum_is_zero(const struct crypto_bignum *a)
|
||||
{
|
||||
return (mbedtls_mpi_cmp_int((const mbedtls_mpi *) a, 0) == 0);
|
||||
}
|
||||
|
||||
|
||||
int crypto_bignum_is_one(const struct crypto_bignum *a)
|
||||
{
|
||||
return (mbedtls_mpi_cmp_int((const mbedtls_mpi *) a, 1) == 0);
|
||||
|
|
@ -300,11 +284,13 @@ int crypto_bignum_addmod(const struct crypto_bignum *a,
|
|||
struct crypto_bignum *tmp = crypto_bignum_init();
|
||||
int ret = -1;
|
||||
|
||||
if (mbedtls_mpi_add_mpi((mbedtls_mpi *) tmp, (const mbedtls_mpi *) a, (const mbedtls_mpi *) b) < 0)
|
||||
if (mbedtls_mpi_add_mpi((mbedtls_mpi *) tmp, (const mbedtls_mpi *) a, (const mbedtls_mpi *) b) < 0) {
|
||||
goto fail;
|
||||
}
|
||||
|
||||
if (mbedtls_mpi_mod_mpi( (mbedtls_mpi *) d, (const mbedtls_mpi *) tmp, (const mbedtls_mpi *) c) < 0)
|
||||
if (mbedtls_mpi_mod_mpi((mbedtls_mpi *) d, (const mbedtls_mpi *) tmp, (const mbedtls_mpi *) c) < 0) {
|
||||
goto fail;
|
||||
}
|
||||
|
||||
ret = 0;
|
||||
fail:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
|
||||
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
|
@ -78,7 +78,6 @@ struct crypto_ec *crypto_ec_init(int group)
|
|||
return e;
|
||||
}
|
||||
|
||||
|
||||
void crypto_ec_deinit(struct crypto_ec *e)
|
||||
{
|
||||
if (e == NULL) {
|
||||
|
|
@ -89,7 +88,6 @@ void crypto_ec_deinit(struct crypto_ec *e)
|
|||
os_free(e);
|
||||
}
|
||||
|
||||
|
||||
struct crypto_ec_point *crypto_ec_point_init(struct crypto_ec *e)
|
||||
{
|
||||
mbedtls_ecp_point *pt;
|
||||
|
|
@ -99,7 +97,7 @@ struct crypto_ec_point *crypto_ec_point_init(struct crypto_ec *e)
|
|||
|
||||
pt = os_zalloc(sizeof(mbedtls_ecp_point));
|
||||
|
||||
if( pt == NULL) {
|
||||
if (pt == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
@ -108,7 +106,6 @@ struct crypto_ec_point *crypto_ec_point_init(struct crypto_ec *e)
|
|||
return (struct crypto_ec_point *) pt;
|
||||
}
|
||||
|
||||
|
||||
size_t crypto_ec_prime_len(struct crypto_ec *e)
|
||||
{
|
||||
return mbedtls_mpi_size(&e->group.P);
|
||||
|
|
@ -119,7 +116,6 @@ size_t crypto_ec_order_len(struct crypto_ec *e)
|
|||
return mbedtls_mpi_size(&e->group.N);
|
||||
}
|
||||
|
||||
|
||||
size_t crypto_ec_prime_len_bits(struct crypto_ec *e)
|
||||
{
|
||||
return mbedtls_mpi_bitlen(&e->group.P);
|
||||
|
|
@ -134,7 +130,7 @@ struct crypto_ec_group *crypto_ec_get_group_byname(const char *name)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
mbedtls_ecp_group_init( &e->group );
|
||||
mbedtls_ecp_group_init(&e->group);
|
||||
|
||||
if (mbedtls_ecp_group_load(&e->group, curve->grp_id)) {
|
||||
crypto_ec_deinit(e);
|
||||
|
|
@ -149,19 +145,16 @@ const struct crypto_bignum *crypto_ec_get_prime(struct crypto_ec *e)
|
|||
return (const struct crypto_bignum *) &e->group.P;
|
||||
}
|
||||
|
||||
|
||||
const struct crypto_bignum *crypto_ec_get_order(struct crypto_ec *e)
|
||||
{
|
||||
return (const struct crypto_bignum *) &e->group.N;
|
||||
}
|
||||
|
||||
|
||||
const struct crypto_bignum * crypto_ec_get_b(struct crypto_ec *e)
|
||||
{
|
||||
return (const struct crypto_bignum *) &e->group.B;
|
||||
}
|
||||
|
||||
|
||||
void crypto_ec_point_deinit(struct crypto_ec_point *p, int clear)
|
||||
{
|
||||
mbedtls_ecp_point_free((mbedtls_ecp_point *) p);
|
||||
|
|
@ -174,7 +167,7 @@ int crypto_ec_point_to_bin(struct crypto_ec *e,
|
|||
int len = mbedtls_mpi_size(&e->group.P);
|
||||
|
||||
if (x) {
|
||||
if(crypto_bignum_to_bin((struct crypto_bignum *) & ((mbedtls_ecp_point *) point)->MBEDTLS_PRIVATE(X),
|
||||
if (crypto_bignum_to_bin((struct crypto_bignum *) & ((mbedtls_ecp_point *) point)->MBEDTLS_PRIVATE(X),
|
||||
x, len, len) < 0) {
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -182,7 +175,7 @@ int crypto_ec_point_to_bin(struct crypto_ec *e,
|
|||
}
|
||||
|
||||
if (y) {
|
||||
if(crypto_bignum_to_bin((struct crypto_bignum *) & ((mbedtls_ecp_point *) point)->MBEDTLS_PRIVATE(Y),
|
||||
if (crypto_bignum_to_bin((struct crypto_bignum *) & ((mbedtls_ecp_point *) point)->MBEDTLS_PRIVATE(Y),
|
||||
y, len, len) < 0) {
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -197,17 +190,17 @@ int crypto_ec_get_affine_coordinates(struct crypto_ec *e, struct crypto_ec_point
|
|||
int ret = -1;
|
||||
mbedtls_ecp_point *point = (mbedtls_ecp_point *)pt;
|
||||
|
||||
if (!mbedtls_ecp_is_zero(point) && (mbedtls_mpi_cmp_int( &point->MBEDTLS_PRIVATE(Z), 1 ) == 0 )) {
|
||||
if (!mbedtls_ecp_is_zero(point) && (mbedtls_mpi_cmp_int(&point->MBEDTLS_PRIVATE(Z), 1) == 0)) {
|
||||
// Affine coordinates mean that z should be 1,
|
||||
wpa_printf(MSG_ERROR, "Z coordinate is neither 0 or 1");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (x) {
|
||||
MBEDTLS_MPI_CHK(mbedtls_mpi_copy((mbedtls_mpi*) x, &((mbedtls_ecp_point* )point)->MBEDTLS_PRIVATE(X)));
|
||||
MBEDTLS_MPI_CHK(mbedtls_mpi_copy((mbedtls_mpi*) x, &((mbedtls_ecp_point*)point)->MBEDTLS_PRIVATE(X)));
|
||||
}
|
||||
if (y) {
|
||||
MBEDTLS_MPI_CHK(mbedtls_mpi_copy((mbedtls_mpi*) y, &((mbedtls_ecp_point* )point)->MBEDTLS_PRIVATE(Y)));
|
||||
MBEDTLS_MPI_CHK(mbedtls_mpi_copy((mbedtls_mpi*) y, &((mbedtls_ecp_point*)point)->MBEDTLS_PRIVATE(Y)));
|
||||
}
|
||||
return 0;
|
||||
cleanup:
|
||||
|
|
@ -244,7 +237,6 @@ cleanup:
|
|||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
int crypto_ec_point_add(struct crypto_ec *e, const struct crypto_ec_point *a,
|
||||
const struct crypto_ec_point *b,
|
||||
struct crypto_ec_point *c)
|
||||
|
|
@ -254,15 +246,14 @@ int crypto_ec_point_add(struct crypto_ec *e, const struct crypto_ec_point *a,
|
|||
|
||||
mbedtls_mpi_init(&one);
|
||||
|
||||
MBEDTLS_MPI_CHK(mbedtls_mpi_lset( &one, 1 ));
|
||||
MBEDTLS_MPI_CHK(mbedtls_ecp_muladd(&e->group, (mbedtls_ecp_point *) c, &one, (const mbedtls_ecp_point *)a , &one, (const mbedtls_ecp_point *)b));
|
||||
MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&one, 1));
|
||||
MBEDTLS_MPI_CHK(mbedtls_ecp_muladd(&e->group, (mbedtls_ecp_point *) c, &one, (const mbedtls_ecp_point *)a, &one, (const mbedtls_ecp_point *)b));
|
||||
|
||||
cleanup:
|
||||
mbedtls_mpi_free(&one);
|
||||
return ret ? -1 : 0;
|
||||
}
|
||||
|
||||
|
||||
int crypto_ec_point_mul(struct crypto_ec *e, const struct crypto_ec_point *p,
|
||||
const struct crypto_bignum *b,
|
||||
struct crypto_ec_point *res)
|
||||
|
|
@ -289,7 +280,6 @@ cleanup:
|
|||
return ret ? -1 : 0;
|
||||
}
|
||||
|
||||
|
||||
/* Currently mbedtls does not have any function for inverse
|
||||
* This function calculates inverse of a point.
|
||||
* Set R = -P
|
||||
|
|
@ -309,7 +299,7 @@ static int ecp_opp(const mbedtls_ecp_group *grp, mbedtls_ecp_point *R, const mbe
|
|||
}
|
||||
|
||||
cleanup:
|
||||
return (ret );
|
||||
return (ret);
|
||||
}
|
||||
|
||||
int crypto_ec_point_invert(struct crypto_ec *e, struct crypto_ec_point *p)
|
||||
|
|
@ -347,10 +337,11 @@ int crypto_ec_point_solve_y_coord(struct crypto_ec *e,
|
|||
MBEDTLS_MPI_CHK(mbedtls_mpi_div_int(&temp, NULL, &temp, 4));
|
||||
MBEDTLS_MPI_CHK(mbedtls_mpi_exp_mod(y, y_sqr, &temp, &e->group.P, NULL));
|
||||
|
||||
if (y_bit != mbedtls_mpi_get_bit(y, 0))
|
||||
if (y_bit != mbedtls_mpi_get_bit(y, 0)) {
|
||||
MBEDTLS_MPI_CHK(mbedtls_mpi_sub_mpi(y, &e->group.P, y));
|
||||
}
|
||||
|
||||
MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&((mbedtls_ecp_point* )p)->MBEDTLS_PRIVATE(X), (const mbedtls_mpi*) x));
|
||||
MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&((mbedtls_ecp_point*)p)->MBEDTLS_PRIVATE(X), (const mbedtls_mpi*) x));
|
||||
MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&((mbedtls_ecp_point *)p)->MBEDTLS_PRIVATE(Z), 1));
|
||||
} else {
|
||||
ret = 1;
|
||||
|
|
@ -439,7 +430,7 @@ int crypto_ec_point_is_on_curve(struct crypto_ec *e,
|
|||
|
||||
/* Calculate y^2 mod P*/
|
||||
MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&two, 2));
|
||||
MBEDTLS_MPI_CHK(mbedtls_mpi_exp_mod(&y_sqr_lhs, &((const mbedtls_ecp_point *)p)->MBEDTLS_PRIVATE(Y) , &two, &e->group.P, NULL));
|
||||
MBEDTLS_MPI_CHK(mbedtls_mpi_exp_mod(&y_sqr_lhs, &((const mbedtls_ecp_point *)p)->MBEDTLS_PRIVATE(Y), &two, &e->group.P, NULL));
|
||||
|
||||
y_sqr_rhs = (mbedtls_mpi *) crypto_ec_point_compute_y_sqr(e, (const struct crypto_bignum *) & ((const mbedtls_ecp_point *)p)->MBEDTLS_PRIVATE(X));
|
||||
|
||||
|
|
@ -511,7 +502,6 @@ static struct crypto_key *crypto_alloc_key(void)
|
|||
return (struct crypto_key *)key;
|
||||
}
|
||||
|
||||
|
||||
struct crypto_key * crypto_ec_set_pubkey_point(const struct crypto_ec_group *group,
|
||||
const u8 *buf, size_t len)
|
||||
{
|
||||
|
|
@ -546,9 +536,10 @@ struct crypto_key * crypto_ec_set_pubkey_point(const struct crypto_ec_group *gro
|
|||
goto fail;
|
||||
}
|
||||
/* Assign values */
|
||||
if( ( ret = mbedtls_pk_setup( key,
|
||||
mbedtls_pk_info_from_type(MBEDTLS_PK_ECKEY) ) ) != 0 )
|
||||
if ((ret = mbedtls_pk_setup(key,
|
||||
mbedtls_pk_info_from_type(MBEDTLS_PK_ECKEY))) != 0) {
|
||||
goto fail;
|
||||
}
|
||||
|
||||
mbedtls_ecp_copy(&mbedtls_pk_ec(*key)->MBEDTLS_PRIVATE(Q), point);
|
||||
mbedtls_ecp_group_load(&mbedtls_pk_ec(*key)->MBEDTLS_PRIVATE(grp), ecp_grp->id);
|
||||
|
|
@ -557,15 +548,16 @@ struct crypto_key * crypto_ec_set_pubkey_point(const struct crypto_ec_group *gro
|
|||
crypto_ec_point_deinit((struct crypto_ec_point *)point, 0);
|
||||
return pkey;
|
||||
fail:
|
||||
if (point)
|
||||
if (point) {
|
||||
crypto_ec_point_deinit((struct crypto_ec_point *)point, 0);
|
||||
if (key)
|
||||
}
|
||||
if (key) {
|
||||
mbedtls_pk_free(key);
|
||||
}
|
||||
pkey = NULL;
|
||||
return pkey;
|
||||
}
|
||||
|
||||
|
||||
void crypto_ec_free_key(struct crypto_key *key)
|
||||
{
|
||||
mbedtls_pk_context *pkey = (mbedtls_pk_context *)key;
|
||||
|
|
@ -580,7 +572,6 @@ struct crypto_ec_point *crypto_ec_get_public_key(struct crypto_key *key)
|
|||
return (struct crypto_ec_point *)&mbedtls_pk_ec(*pkey)->MBEDTLS_PRIVATE(Q);
|
||||
}
|
||||
|
||||
|
||||
int crypto_ec_get_priv_key_der(struct crypto_key *key, unsigned char **key_data, int *key_len)
|
||||
{
|
||||
mbedtls_pk_context *pkey = (mbedtls_pk_context *)key;
|
||||
|
|
@ -613,7 +604,7 @@ struct crypto_ec_group *crypto_ec_get_group_from_key(struct crypto_key *key)
|
|||
{
|
||||
mbedtls_pk_context *pkey = (mbedtls_pk_context *)key;
|
||||
|
||||
return (struct crypto_ec_group *)&(mbedtls_pk_ec(*pkey)->MBEDTLS_PRIVATE(grp));
|
||||
return (struct crypto_ec_group *) & (mbedtls_pk_ec(*pkey)->MBEDTLS_PRIVATE(grp));
|
||||
}
|
||||
|
||||
int crypto_ec_key_group(struct crypto_ec_key *key)
|
||||
|
|
@ -628,24 +619,26 @@ struct crypto_bignum *crypto_ec_get_private_key(struct crypto_key *key)
|
|||
{
|
||||
mbedtls_pk_context *pkey = (mbedtls_pk_context *)key;
|
||||
|
||||
return ((struct crypto_bignum *)&(mbedtls_pk_ec(*pkey)->MBEDTLS_PRIVATE(d)));
|
||||
return ((struct crypto_bignum *) & (mbedtls_pk_ec(*pkey)->MBEDTLS_PRIVATE(d)));
|
||||
}
|
||||
|
||||
int crypto_ec_get_publickey_buf(struct crypto_key *key, u8 *key_buf, int len)
|
||||
{
|
||||
mbedtls_pk_context *pkey = (mbedtls_pk_context *)key;
|
||||
unsigned char buf[MBEDTLS_MPI_MAX_SIZE + 10]; /* tag, length + MPI */
|
||||
unsigned char *c = buf + sizeof(buf );
|
||||
unsigned char *c = buf + sizeof(buf);
|
||||
int pk_len = 0;
|
||||
|
||||
memset(buf, 0, sizeof(buf) );
|
||||
pk_len = mbedtls_pk_write_pubkey( &c, buf, pkey);
|
||||
memset(buf, 0, sizeof(buf));
|
||||
pk_len = mbedtls_pk_write_pubkey(&c, buf, pkey);
|
||||
|
||||
if (pk_len < 0)
|
||||
if (pk_len < 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (len == 0)
|
||||
if (len == 0) {
|
||||
return pk_len;
|
||||
}
|
||||
|
||||
os_memcpy(key_buf, buf + MBEDTLS_MPI_MAX_SIZE + 10 - pk_len, pk_len);
|
||||
|
||||
|
|
@ -656,7 +649,7 @@ int crypto_write_pubkey_der(struct crypto_key *key, unsigned char **key_buf)
|
|||
{
|
||||
unsigned char *buf = os_malloc(ECP_PUB_DER_MAX_BYTES);
|
||||
|
||||
if(!buf) {
|
||||
if (!buf) {
|
||||
wpa_printf(MSG_ERROR, "memory allocation failed");
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -802,7 +795,6 @@ fail:
|
|||
return ret;
|
||||
}
|
||||
|
||||
|
||||
int crypto_ecdsa_get_sign(unsigned char *hash,
|
||||
const struct crypto_bignum *r, const struct crypto_bignum *s, struct crypto_key *csign, int hash_len)
|
||||
{
|
||||
|
|
@ -811,7 +803,7 @@ int crypto_ecdsa_get_sign(unsigned char *hash,
|
|||
|
||||
mbedtls_ecdsa_context *ctx = os_malloc(sizeof(*ctx));
|
||||
if (!ctx) {
|
||||
wpa_printf(MSG_ERROR,"failed to allcate memory");
|
||||
wpa_printf(MSG_ERROR, "failed to allcate memory");
|
||||
return -1;
|
||||
}
|
||||
mbedtls_ecdsa_init(ctx);
|
||||
|
|
@ -854,10 +846,10 @@ void crypto_debug_print_ec_key(const char *title, struct crypto_key *key)
|
|||
{
|
||||
#ifdef DEBUG_PRINT
|
||||
mbedtls_pk_context *pkey = (mbedtls_pk_context *)key;
|
||||
mbedtls_ecp_keypair *ecp = mbedtls_pk_ec( *pkey );
|
||||
mbedtls_ecp_keypair *ecp = mbedtls_pk_ec(*pkey);
|
||||
u8 x[32], y[32], d[32];
|
||||
wpa_printf(MSG_ERROR, "curve: %s",
|
||||
mbedtls_ecp_curve_info_from_grp_id( ecp->MBEDTLS_PRIVATE(grp).id )->name );
|
||||
mbedtls_ecp_curve_info_from_grp_id(ecp->MBEDTLS_PRIVATE(grp).id)->name);
|
||||
int len = mbedtls_mpi_size((mbedtls_mpi *)crypto_ec_get_prime((struct crypto_ec *)crypto_ec_get_group_from_key(key)));
|
||||
|
||||
wpa_printf(MSG_ERROR, "prime len is %d", len);
|
||||
|
|
@ -866,7 +858,7 @@ void crypto_debug_print_ec_key(const char *title, struct crypto_key *key)
|
|||
d, len, len);
|
||||
wpa_hexdump(MSG_ERROR, "Q_x:", x, 32);
|
||||
wpa_hexdump(MSG_ERROR, "Q_y:", y, 32);
|
||||
wpa_hexdump(MSG_ERROR, "d: ", d , 32);
|
||||
wpa_hexdump(MSG_ERROR, "d: ", d, 32);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
@ -903,9 +895,10 @@ struct crypto_key * crypto_ec_gen_keypair(u16 ike_group)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
if(mbedtls_pk_setup(kctx,
|
||||
mbedtls_pk_info_from_type(MBEDTLS_PK_ECKEY)) != 0 )
|
||||
if (mbedtls_pk_setup(kctx,
|
||||
mbedtls_pk_info_from_type(MBEDTLS_PK_ECKEY)) != 0) {
|
||||
goto fail;
|
||||
}
|
||||
|
||||
mbedtls_ecp_gen_key(MBEDTLS_ECP_DP_SECP256R1, mbedtls_pk_ec(*kctx), //get this from argument
|
||||
crypto_rng_wrapper, NULL);
|
||||
|
|
@ -922,57 +915,59 @@ fail:
|
|||
* namedCurve OBJECT IDENTIFIER
|
||||
* }
|
||||
*/
|
||||
static int pk_write_ec_param( unsigned char **p, unsigned char *start,
|
||||
mbedtls_ecp_keypair *ec )
|
||||
static int pk_write_ec_param(unsigned char **p, unsigned char *start,
|
||||
mbedtls_ecp_keypair *ec)
|
||||
{
|
||||
int ret;
|
||||
size_t len = 0;
|
||||
const char *oid;
|
||||
size_t oid_len;
|
||||
|
||||
if( ( ret = mbedtls_oid_get_oid_by_ec_grp( ec->MBEDTLS_PRIVATE(grp).id, &oid, &oid_len ) ) != 0 )
|
||||
return( ret );
|
||||
if ((ret = mbedtls_oid_get_oid_by_ec_grp(ec->MBEDTLS_PRIVATE(grp).id, &oid, &oid_len)) != 0) {
|
||||
return (ret);
|
||||
}
|
||||
|
||||
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_oid( p, start, oid, oid_len ) );
|
||||
MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_oid(p, start, oid, oid_len));
|
||||
|
||||
return( (int) len );
|
||||
return ((int) len);
|
||||
}
|
||||
|
||||
static int pk_write_ec_pubkey_formatted( unsigned char **p, unsigned char *start,
|
||||
mbedtls_ecp_keypair *ec, int format )
|
||||
static int pk_write_ec_pubkey_formatted(unsigned char **p, unsigned char *start,
|
||||
mbedtls_ecp_keypair *ec, int format)
|
||||
{
|
||||
int ret;
|
||||
size_t len = 0;
|
||||
unsigned char buf[MBEDTLS_ECP_MAX_PT_LEN];
|
||||
|
||||
if( ( ret = mbedtls_ecp_point_write_binary( &ec->MBEDTLS_PRIVATE(grp), &ec->MBEDTLS_PRIVATE(Q),
|
||||
if ((ret = mbedtls_ecp_point_write_binary(&ec->MBEDTLS_PRIVATE(grp), &ec->MBEDTLS_PRIVATE(Q),
|
||||
format,
|
||||
&len, buf, sizeof( buf ) ) ) != 0 )
|
||||
{
|
||||
return( ret );
|
||||
&len, buf, sizeof(buf))) != 0) {
|
||||
return (ret);
|
||||
}
|
||||
|
||||
if( *p < start || (size_t)( *p - start ) < len )
|
||||
return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
|
||||
if (*p < start || (size_t)(*p - start) < len) {
|
||||
return (MBEDTLS_ERR_ASN1_BUF_TOO_SMALL);
|
||||
}
|
||||
|
||||
*p -= len;
|
||||
memcpy( *p, buf, len );
|
||||
memcpy(*p, buf, len);
|
||||
|
||||
return( (int) len );
|
||||
return ((int) len);
|
||||
}
|
||||
|
||||
int mbedtls_pk_write_pubkey_formatted( unsigned char **p, unsigned char *start,
|
||||
const mbedtls_pk_context *key, int format )
|
||||
int mbedtls_pk_write_pubkey_formatted(unsigned char **p, unsigned char *start,
|
||||
const mbedtls_pk_context *key, int format)
|
||||
{
|
||||
int ret;
|
||||
size_t len = 0;
|
||||
|
||||
if( mbedtls_pk_get_type( key ) == MBEDTLS_PK_ECKEY )
|
||||
MBEDTLS_ASN1_CHK_ADD( len, pk_write_ec_pubkey_formatted( p, start, mbedtls_pk_ec( *key ), format ) );
|
||||
else
|
||||
return( MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE );
|
||||
if (mbedtls_pk_get_type(key) == MBEDTLS_PK_ECKEY) {
|
||||
MBEDTLS_ASN1_CHK_ADD(len, pk_write_ec_pubkey_formatted(p, start, mbedtls_pk_ec(*key), format));
|
||||
} else {
|
||||
return (MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE);
|
||||
}
|
||||
|
||||
return( (int) len );
|
||||
return ((int) len);
|
||||
}
|
||||
|
||||
int crypto_pk_write_formatted_pubkey_der(mbedtls_pk_context *key, unsigned char *buf, size_t size, int format)
|
||||
|
|
@ -982,15 +977,17 @@ int crypto_pk_write_formatted_pubkey_der(mbedtls_pk_context *key, unsigned char
|
|||
size_t len = 0, par_len = 0, oid_len;
|
||||
const char *oid;
|
||||
|
||||
if( size == 0 )
|
||||
return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
|
||||
if (size == 0) {
|
||||
return (MBEDTLS_ERR_ASN1_BUF_TOO_SMALL);
|
||||
}
|
||||
|
||||
c = buf + size;
|
||||
|
||||
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_pk_write_pubkey_formatted( &c, buf, key, format) );
|
||||
MBEDTLS_ASN1_CHK_ADD(len, mbedtls_pk_write_pubkey_formatted(&c, buf, key, format));
|
||||
|
||||
if( c - buf < 1 )
|
||||
return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
|
||||
if (c - buf < 1) {
|
||||
return (MBEDTLS_ERR_ASN1_BUF_TOO_SMALL);
|
||||
}
|
||||
|
||||
/*
|
||||
* SubjectPublicKeyInfo ::= SEQUENCE {
|
||||
|
|
@ -1000,37 +997,35 @@ int crypto_pk_write_formatted_pubkey_der(mbedtls_pk_context *key, unsigned char
|
|||
*--c = 0;
|
||||
len += 1;
|
||||
|
||||
MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_len(&c, buf, len));
|
||||
MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_tag(&c, buf, MBEDTLS_ASN1_BIT_STRING));
|
||||
|
||||
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( &c, buf, len ) );
|
||||
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( &c, buf, MBEDTLS_ASN1_BIT_STRING ) );
|
||||
|
||||
if( ( ret = mbedtls_oid_get_oid_by_pk_alg( mbedtls_pk_get_type( key ),
|
||||
&oid, &oid_len ) ) != 0 )
|
||||
{
|
||||
return( ret );
|
||||
if ((ret = mbedtls_oid_get_oid_by_pk_alg(mbedtls_pk_get_type(key),
|
||||
&oid, &oid_len)) != 0) {
|
||||
return (ret);
|
||||
}
|
||||
|
||||
if( mbedtls_pk_get_type( key ) == MBEDTLS_PK_ECKEY )
|
||||
{
|
||||
MBEDTLS_ASN1_CHK_ADD( par_len, pk_write_ec_param( &c, buf, mbedtls_pk_ec( *key ) ) );
|
||||
if (mbedtls_pk_get_type(key) == MBEDTLS_PK_ECKEY) {
|
||||
MBEDTLS_ASN1_CHK_ADD(par_len, pk_write_ec_param(&c, buf, mbedtls_pk_ec(*key)));
|
||||
}
|
||||
|
||||
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_algorithm_identifier( &c, buf, oid, oid_len,
|
||||
par_len ) );
|
||||
MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_algorithm_identifier(&c, buf, oid, oid_len,
|
||||
par_len));
|
||||
|
||||
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( &c, buf, len ) );
|
||||
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( &c, buf, MBEDTLS_ASN1_CONSTRUCTED |
|
||||
MBEDTLS_ASN1_SEQUENCE ) );
|
||||
MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_len(&c, buf, len));
|
||||
MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_tag(&c, buf, MBEDTLS_ASN1_CONSTRUCTED |
|
||||
MBEDTLS_ASN1_SEQUENCE));
|
||||
|
||||
return( (int) len );
|
||||
return ((int) len);
|
||||
}
|
||||
|
||||
int crypto_ec_write_pub_key(struct crypto_key *key, unsigned char **key_buf)
|
||||
{
|
||||
unsigned char output_buf[1600] = {0};
|
||||
int len = crypto_pk_write_formatted_pubkey_der((mbedtls_pk_context *)key, output_buf, 1600, 1);
|
||||
if (len <= 0)
|
||||
if (len <= 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
*key_buf = os_malloc(len);
|
||||
if (!*key_buf) {
|
||||
|
|
@ -1044,7 +1039,7 @@ int crypto_ec_write_pub_key(struct crypto_key *key, unsigned char **key_buf)
|
|||
|
||||
int crypto_mbedtls_get_grp_id(int group)
|
||||
{
|
||||
switch(group) {
|
||||
switch (group) {
|
||||
case IANA_SECP256R1:
|
||||
return MBEDTLS_ECP_DP_SECP256R1;
|
||||
case IANA_SECP384R1:
|
||||
|
|
@ -1099,7 +1094,7 @@ struct crypto_ecdh * crypto_ecdh_init(int group)
|
|||
}
|
||||
|
||||
/* Generates ECDH keypair on elliptic curve */
|
||||
if (mbedtls_ecdh_gen_public(ACCESS_ECDH(&ctx, grp), ACCESS_ECDH(&ctx, d), ACCESS_ECDH(&ctx, Q), mbedtls_ctr_drbg_random, &ctr_drbg)!=0) {
|
||||
if (mbedtls_ecdh_gen_public(ACCESS_ECDH(&ctx, grp), ACCESS_ECDH(&ctx, d), ACCESS_ECDH(&ctx, Q), mbedtls_ctr_drbg_random, &ctr_drbg) != 0) {
|
||||
wpa_printf(MSG_ERROR, "ECDH keypair on curve failed");
|
||||
goto fail;
|
||||
}
|
||||
|
|
@ -1123,7 +1118,7 @@ struct wpabuf * crypto_ecdh_get_pubkey(struct crypto_ecdh *ecdh, int y)
|
|||
struct wpabuf *public_key = NULL;
|
||||
uint8_t *buf = NULL;
|
||||
mbedtls_ecdh_context *ctx = (mbedtls_ecdh_context *)ecdh;
|
||||
size_t prime_len = ACCESS_ECDH(ctx, grp).pbits/8;
|
||||
size_t prime_len = ACCESS_ECDH(ctx, grp).pbits / 8;
|
||||
|
||||
buf = os_zalloc(y ? prime_len : 2 * prime_len);
|
||||
if (!buf) {
|
||||
|
|
@ -1164,35 +1159,35 @@ struct wpabuf * crypto_ecdh_set_peerkey(struct crypto_ecdh *ecdh, int inc_y,
|
|||
wpa_printf(MSG_ERROR, "Seeding entropy source failed");
|
||||
goto cleanup;
|
||||
}
|
||||
len_prime = ACCESS_ECDH(ctx, grp).pbits/8;
|
||||
len_prime = ACCESS_ECDH(ctx, grp).pbits / 8;
|
||||
bn_x = crypto_bignum_init_set(key, len);
|
||||
|
||||
/* Initialize data for EC point */
|
||||
ec_pt = crypto_ec_point_init((struct crypto_ec*)ACCESS_ECDH(&ctx, grp));
|
||||
if (!ec_pt) {
|
||||
wpa_printf(MSG_ERROR,"Initializing for EC point failed");
|
||||
wpa_printf(MSG_ERROR, "Initializing for EC point failed");
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
if (crypto_ec_point_solve_y_coord((struct crypto_ec*)ACCESS_ECDH(&ctx, grp), ec_pt, bn_x, inc_y) != 0) {
|
||||
wpa_printf(MSG_ERROR,"Failed to solve for y coordinate");
|
||||
if (crypto_ec_point_solve_y_coord((struct crypto_ec *)ACCESS_ECDH(&ctx, grp), ec_pt, bn_x, inc_y) != 0) {
|
||||
wpa_printf(MSG_ERROR, "Failed to solve for y coordinate");
|
||||
goto cleanup;
|
||||
}
|
||||
px = os_zalloc(len);
|
||||
py = os_zalloc(len);
|
||||
buf = os_zalloc(2*len);
|
||||
buf = os_zalloc(2 * len);
|
||||
|
||||
if (!px || !py || !buf) {
|
||||
wpa_printf(MSG_ERROR, "Memory allocation failed");
|
||||
goto cleanup;
|
||||
}
|
||||
if (crypto_ec_point_to_bin((struct crypto_ec*)ACCESS_ECDH(&ctx, grp), ec_pt, px, py) != 0) {
|
||||
wpa_printf(MSG_ERROR,"Failed to write EC point value as binary data");
|
||||
if (crypto_ec_point_to_bin((struct crypto_ec *)ACCESS_ECDH(&ctx, grp), ec_pt, px, py) != 0) {
|
||||
wpa_printf(MSG_ERROR, "Failed to write EC point value as binary data");
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
os_memcpy(buf, px, len);
|
||||
os_memcpy(buf+len, py, len);
|
||||
os_memcpy(buf + len, py, len);
|
||||
|
||||
pkey = crypto_ec_set_pubkey_point((struct crypto_ec_group*)ACCESS_ECDH(&ctx, grp), buf, len);
|
||||
if (!pkey) {
|
||||
|
|
@ -1200,13 +1195,12 @@ struct wpabuf * crypto_ecdh_set_peerkey(struct crypto_ecdh *ecdh, int inc_y,
|
|||
goto cleanup;
|
||||
}
|
||||
|
||||
|
||||
mbedtls_pk_context *peer = (mbedtls_pk_context*)pkey;
|
||||
|
||||
/* Setup ECDH context from EC key */
|
||||
/* Call to mbedtls_ecdh_get_params() will initialize the context when not LEGACY context */
|
||||
/* Call to mbedtls_ecdh_get_params() will initialize the context when not LEGACY context */
|
||||
if (ctx != NULL && peer != NULL) {
|
||||
mbedtls_ecp_copy( ACCESS_ECDH(&ctx, Qp), &(mbedtls_pk_ec(*peer))->MBEDTLS_PRIVATE(Q) );
|
||||
mbedtls_ecp_copy(ACCESS_ECDH(&ctx, Qp), &(mbedtls_pk_ec(*peer))->MBEDTLS_PRIVATE(Q));
|
||||
#ifndef CONFIG_MBEDTLS_ECDH_LEGACY_CONTEXT
|
||||
ctx->MBEDTLS_PRIVATE(var) = MBEDTLS_ECDH_VARIANT_MBEDTLS_2_0;
|
||||
#endif
|
||||
|
|
@ -1214,7 +1208,7 @@ struct wpabuf * crypto_ecdh_set_peerkey(struct crypto_ecdh *ecdh, int inc_y,
|
|||
wpa_printf(MSG_ERROR, "Failed to set peer's ECDH context");
|
||||
goto cleanup;
|
||||
}
|
||||
int len_secret = inc_y ? 2*len : len;
|
||||
int len_secret = inc_y ? 2 * len : len;
|
||||
secret = os_zalloc(len_secret);
|
||||
if (!secret) {
|
||||
wpa_printf(MSG_ERROR, "Allocation failed for secret");
|
||||
|
|
@ -1243,7 +1237,6 @@ cleanup:
|
|||
return sh_secret;
|
||||
}
|
||||
|
||||
|
||||
struct crypto_ec_key *crypto_ec_key_parse_pub(const u8 *der, size_t der_len)
|
||||
{
|
||||
int ret;
|
||||
|
|
@ -1264,7 +1257,6 @@ struct crypto_ec_key *crypto_ec_key_parse_pub(const u8 *der, size_t der_len)
|
|||
return (struct crypto_ec_key *)pkey;
|
||||
}
|
||||
|
||||
|
||||
void crypto_ec_key_deinit(struct crypto_ec_key *key)
|
||||
{
|
||||
mbedtls_pk_free((mbedtls_pk_context *)key);
|
||||
|
|
@ -1286,7 +1278,7 @@ int crypto_ec_key_verify_signature(struct crypto_ec_key *key, const u8 *data,
|
|||
mbedtls_ecp_keypair *ec_key = mbedtls_pk_ec(*((mbedtls_pk_context *)key));
|
||||
mbedtls_ecp_group *grp = &ec_key->MBEDTLS_PRIVATE(grp);
|
||||
|
||||
if ((ret = mbedtls_ecp_group_copy(&ctx_verify->MBEDTLS_PRIVATE(grp),grp)) != 0) {
|
||||
if ((ret = mbedtls_ecp_group_copy(&ctx_verify->MBEDTLS_PRIVATE(grp), grp)) != 0) {
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
|
|
@ -1307,5 +1299,4 @@ cleanup:
|
|||
return ret;
|
||||
}
|
||||
|
||||
|
||||
#endif /* CONFIG_ECC */
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
|
||||
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
|
@ -31,7 +31,7 @@ static void crypto_dump_verify_info(u32 flags)
|
|||
{
|
||||
char dump_buffer[1024];
|
||||
|
||||
mbedtls_x509_crt_verify_info(dump_buffer, 1024, " ! ", flags );
|
||||
mbedtls_x509_crt_verify_info(dump_buffer, 1024, " ! ", flags);
|
||||
wpa_printf(MSG_ERROR, "%s", dump_buffer);
|
||||
}
|
||||
#else
|
||||
|
|
@ -52,10 +52,12 @@ int crypto_verify_cert(const u8 *cert_start, int certlen, const u8 *ca_cert_star
|
|||
mbedtls_x509_crt *ca_cert = os_zalloc(sizeof(mbedtls_x509_crt));
|
||||
|
||||
if (!cert || !ca_cert) {
|
||||
if (cert)
|
||||
if (cert) {
|
||||
os_free(cert);
|
||||
if (ca_cert)
|
||||
}
|
||||
if (ca_cert) {
|
||||
os_free(ca_cert);
|
||||
}
|
||||
wpa_printf(MSG_ERROR, "%s: memory allocation failed", __func__);
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -72,11 +74,12 @@ int crypto_verify_cert(const u8 *cert_start, int certlen, const u8 *ca_cert_star
|
|||
goto cleanup;
|
||||
}
|
||||
|
||||
ret = mbedtls_x509_crt_verify(cert, ca_cert, NULL, NULL, &flags, NULL, NULL );
|
||||
ret = mbedtls_x509_crt_verify(cert, ca_cert, NULL, NULL, &flags, NULL, NULL);
|
||||
|
||||
/* Certification is failed, try to get some more info */
|
||||
if (ret != 0)
|
||||
if (ret != 0) {
|
||||
crypto_dump_verify_info(flags);
|
||||
}
|
||||
|
||||
cleanup:
|
||||
mbedtls_x509_crt_free(cert);
|
||||
|
|
@ -93,8 +96,9 @@ struct crypto_public_key * crypto_public_key_import(const u8 *key, size_t len)
|
|||
int ret;
|
||||
mbedtls_pk_context *pkey = os_zalloc(sizeof(*pkey));
|
||||
|
||||
if (!pkey)
|
||||
if (!pkey) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
mbedtls_pk_init(pkey);
|
||||
ret = mbedtls_pk_parse_public_key(pkey, key, len);
|
||||
|
|
@ -114,8 +118,9 @@ struct crypto_private_key * crypto_private_key_import(const u8 *key,
|
|||
{
|
||||
int ret;
|
||||
mbedtls_pk_context *pkey = os_zalloc(sizeof(mbedtls_pk_context));
|
||||
if (!pkey)
|
||||
if (!pkey) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
mbedtls_pk_init(pkey);
|
||||
|
||||
|
|
@ -158,7 +163,7 @@ struct crypto_public_key *crypto_public_key_from_cert(const u8 *buf,
|
|||
|
||||
mbedtls_pk_init(kctx);
|
||||
|
||||
if(mbedtls_pk_setup(kctx, mbedtls_pk_info_from_type(mbedtls_pk_get_type(&cert->pk))) != 0) {
|
||||
if (mbedtls_pk_setup(kctx, mbedtls_pk_info_from_type(mbedtls_pk_get_type(&cert->pk))) != 0) {
|
||||
wpa_printf(MSG_ERROR, "key setup failed");
|
||||
goto fail;
|
||||
}
|
||||
|
|
@ -190,45 +195,46 @@ int crypto_public_key_encrypt_pkcs1_v15(struct crypto_public_key *key,
|
|||
mbedtls_ctr_drbg_context *ctr_drbg = os_zalloc(sizeof(*ctr_drbg));
|
||||
|
||||
if (!pkey || !entropy || !ctr_drbg) {
|
||||
if (entropy)
|
||||
if (entropy) {
|
||||
os_free(entropy);
|
||||
if (ctr_drbg)
|
||||
}
|
||||
if (ctr_drbg) {
|
||||
os_free(ctr_drbg);
|
||||
}
|
||||
wpa_printf(MSG_ERROR, "failed to allocate memory");
|
||||
return -1;
|
||||
}
|
||||
|
||||
mbedtls_entropy_init( entropy );
|
||||
mbedtls_ctr_drbg_init( ctr_drbg );
|
||||
mbedtls_entropy_init(entropy);
|
||||
mbedtls_ctr_drbg_init(ctr_drbg);
|
||||
|
||||
ret = mbedtls_ctr_drbg_seed( ctr_drbg, mbedtls_entropy_func,
|
||||
ret = mbedtls_ctr_drbg_seed(ctr_drbg, mbedtls_entropy_func,
|
||||
entropy, (const unsigned char *) pers,
|
||||
strlen( pers ) );
|
||||
if( ret != 0 ) {
|
||||
strlen(pers));
|
||||
if (ret != 0) {
|
||||
wpa_printf(MSG_ERROR, " failed ! mbedtls_ctr_drbg_seed returned %d",
|
||||
ret );
|
||||
ret);
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
ret = mbedtls_rsa_pkcs1_encrypt(mbedtls_pk_rsa(*pkey), mbedtls_ctr_drbg_random,
|
||||
ctr_drbg, inlen, in, out);
|
||||
|
||||
if(ret != 0) {
|
||||
if (ret != 0) {
|
||||
wpa_printf(MSG_ERROR, " failed ! mbedtls_rsa_pkcs1_encrypt returned -0x%04x", -ret);
|
||||
goto cleanup;
|
||||
}
|
||||
*outlen = mbedtls_rsa_get_len(mbedtls_pk_rsa(*pkey));
|
||||
|
||||
cleanup:
|
||||
mbedtls_ctr_drbg_free( ctr_drbg );
|
||||
mbedtls_entropy_free( entropy );
|
||||
mbedtls_ctr_drbg_free(ctr_drbg);
|
||||
mbedtls_entropy_free(entropy);
|
||||
os_free(entropy);
|
||||
os_free(ctr_drbg);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
int crypto_private_key_decrypt_pkcs1_v15(struct crypto_private_key *key,
|
||||
const u8 *in, size_t inlen,
|
||||
u8 *out, size_t *outlen)
|
||||
|
|
@ -241,20 +247,23 @@ int crypto_private_key_decrypt_pkcs1_v15(struct crypto_private_key *key,
|
|||
mbedtls_ctr_drbg_context *ctr_drbg = os_malloc(sizeof(*ctr_drbg));
|
||||
|
||||
if (!pkey || !entropy || !ctr_drbg) {
|
||||
if (entropy)
|
||||
if (entropy) {
|
||||
os_free(entropy);
|
||||
if (ctr_drbg)
|
||||
}
|
||||
if (ctr_drbg) {
|
||||
os_free(ctr_drbg);
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
mbedtls_ctr_drbg_init( ctr_drbg );
|
||||
mbedtls_entropy_init( entropy );
|
||||
mbedtls_ctr_drbg_init(ctr_drbg);
|
||||
mbedtls_entropy_init(entropy);
|
||||
ret = mbedtls_ctr_drbg_seed(ctr_drbg, mbedtls_entropy_func,
|
||||
entropy, (const unsigned char *) pers,
|
||||
strlen(pers));
|
||||
|
||||
if (ret < 0)
|
||||
if (ret < 0) {
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
i = mbedtls_rsa_get_len(mbedtls_pk_rsa(*pkey));
|
||||
ret = mbedtls_rsa_rsaes_pkcs1_v15_decrypt(mbedtls_pk_rsa(*pkey), mbedtls_ctr_drbg_random,
|
||||
|
|
@ -263,15 +272,14 @@ int crypto_private_key_decrypt_pkcs1_v15(struct crypto_private_key *key,
|
|||
*outlen = i;
|
||||
|
||||
cleanup:
|
||||
mbedtls_ctr_drbg_free( ctr_drbg );
|
||||
mbedtls_entropy_free( entropy );
|
||||
mbedtls_ctr_drbg_free(ctr_drbg);
|
||||
mbedtls_entropy_free(entropy);
|
||||
os_free(entropy);
|
||||
os_free(ctr_drbg);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
int crypto_private_key_sign_pkcs1(struct crypto_private_key *key,
|
||||
const u8 *in, size_t inlen,
|
||||
u8 *out, size_t *outlen)
|
||||
|
|
@ -283,51 +291,53 @@ int crypto_private_key_sign_pkcs1(struct crypto_private_key *key,
|
|||
mbedtls_ctr_drbg_context *ctr_drbg = os_malloc(sizeof(*ctr_drbg));
|
||||
|
||||
if (!pkey || !entropy || !ctr_drbg) {
|
||||
if (entropy)
|
||||
if (entropy) {
|
||||
os_free(entropy);
|
||||
if (ctr_drbg)
|
||||
}
|
||||
if (ctr_drbg) {
|
||||
os_free(ctr_drbg);
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
mbedtls_ctr_drbg_init( ctr_drbg );
|
||||
mbedtls_entropy_init( entropy );
|
||||
mbedtls_ctr_drbg_init(ctr_drbg);
|
||||
mbedtls_entropy_init(entropy);
|
||||
ret = mbedtls_ctr_drbg_seed(ctr_drbg, mbedtls_entropy_func,
|
||||
entropy, (const unsigned char *) pers,
|
||||
strlen(pers));
|
||||
|
||||
if((ret = mbedtls_rsa_pkcs1_sign(mbedtls_pk_rsa(*pkey), mbedtls_ctr_drbg_random, ctr_drbg,
|
||||
if ((ret = mbedtls_rsa_pkcs1_sign(mbedtls_pk_rsa(*pkey), mbedtls_ctr_drbg_random, ctr_drbg,
|
||||
(mbedtls_pk_rsa(*pkey))->MBEDTLS_PRIVATE(hash_id),
|
||||
inlen, in, out)) != 0 ) {
|
||||
wpa_printf(MSG_ERROR, " failed ! mbedtls_rsa_pkcs1_sign returned %d", ret );
|
||||
inlen, in, out)) != 0) {
|
||||
wpa_printf(MSG_ERROR, " failed ! mbedtls_rsa_pkcs1_sign returned %d", ret);
|
||||
goto cleanup;
|
||||
}
|
||||
*outlen = mbedtls_rsa_get_len(mbedtls_pk_rsa(*pkey));
|
||||
|
||||
cleanup:
|
||||
mbedtls_ctr_drbg_free( ctr_drbg );
|
||||
mbedtls_entropy_free( entropy );
|
||||
mbedtls_ctr_drbg_free(ctr_drbg);
|
||||
mbedtls_entropy_free(entropy);
|
||||
os_free(entropy);
|
||||
os_free(ctr_drbg);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
void crypto_public_key_free(struct crypto_public_key *key)
|
||||
{
|
||||
mbedtls_pk_context *pkey = (mbedtls_pk_context *)key;
|
||||
if (!pkey)
|
||||
if (!pkey) {
|
||||
return;
|
||||
}
|
||||
|
||||
mbedtls_pk_free(pkey);
|
||||
os_free(pkey);
|
||||
}
|
||||
|
||||
|
||||
void crypto_private_key_free(struct crypto_private_key *key)
|
||||
{
|
||||
mbedtls_pk_context *pkey = (mbedtls_pk_context *)key;
|
||||
if (!pkey)
|
||||
if (!pkey) {
|
||||
return;
|
||||
}
|
||||
|
||||
mbedtls_pk_free(pkey);
|
||||
os_free(pkey);
|
||||
|
|
@ -345,8 +355,9 @@ int crypto_public_key_decrypt_pkcs1(struct crypto_public_key *key,
|
|||
return -1;
|
||||
}
|
||||
|
||||
if (mbedtls_rsa_public(mbedtls_pk_rsa(*pkey), crypt, plain) < 0)
|
||||
if (mbedtls_rsa_public(mbedtls_pk_rsa(*pkey), crypt, plain) < 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
/*
|
||||
* PKCS #1 v1.5, 8.1:
|
||||
|
|
@ -375,8 +386,9 @@ int crypto_public_key_decrypt_pkcs1(struct crypto_public_key *key,
|
|||
wpa_hexdump_key(MSG_DEBUG, "Signature EB", plain, len);
|
||||
return -1;
|
||||
}
|
||||
while (pos < plain + len && *pos == 0xff)
|
||||
while (pos < plain + len && *pos == 0xff) {
|
||||
pos++;
|
||||
}
|
||||
|
||||
if (pos - plain - 2 < 8) {
|
||||
/* PKCS #1 v1.5, 8.1: At least eight octets long PS */
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: 2020-2023 Espressif Systems (Shanghai) CO LTD
|
||||
* SPDX-FileCopyrightText: 2020-2024 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
|
@ -222,7 +222,7 @@ int crypto_hash_finish(struct crypto_hash *crypto_ctx, u8 *mac, size_t *len)
|
|||
}
|
||||
|
||||
md_type = mbedtls_md_get_type(mbedtls_md_info_from_ctx(ctx));
|
||||
switch(md_type) {
|
||||
switch (md_type) {
|
||||
case MBEDTLS_MD_MD5:
|
||||
if (*len < MD5_MAC_LEN) {
|
||||
*len = MD5_MAC_LEN;
|
||||
|
|
@ -300,18 +300,18 @@ static int hmac_vector(mbedtls_md_type_t md_type,
|
|||
|
||||
ret = mbedtls_md_setup(&md_ctx, md_info, 1);
|
||||
if (ret != 0) {
|
||||
return(ret);
|
||||
return (ret);
|
||||
}
|
||||
|
||||
ret = mbedtls_md_hmac_starts(&md_ctx, key, key_len);
|
||||
if (ret != 0) {
|
||||
return(ret);
|
||||
return (ret);
|
||||
}
|
||||
|
||||
for (i = 0; i < num_elem; i++) {
|
||||
ret = mbedtls_md_hmac_update(&md_ctx, addr[i], len[i]);
|
||||
if (ret != 0) {
|
||||
return(ret);
|
||||
return (ret);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -330,7 +330,6 @@ int hmac_sha384_vector(const u8 *key, size_t key_len, size_t num_elem,
|
|||
len, mac);
|
||||
}
|
||||
|
||||
|
||||
int hmac_sha384(const u8 *key, size_t key_len, const u8 *data,
|
||||
size_t data_len, u8 *mac)
|
||||
{
|
||||
|
|
@ -387,7 +386,7 @@ static void *aes_crypt_init(int mode, const u8 *key, size_t len)
|
|||
|
||||
if (mode == MBEDTLS_AES_ENCRYPT) {
|
||||
ret = mbedtls_aes_setkey_enc(aes, key, len * 8);
|
||||
} else if (mode == MBEDTLS_AES_DECRYPT){
|
||||
} else if (mode == MBEDTLS_AES_DECRYPT) {
|
||||
ret = mbedtls_aes_setkey_dec(aes, key, len * 8);
|
||||
}
|
||||
if (ret < 0) {
|
||||
|
|
@ -672,7 +671,6 @@ int aes_128_ctr_encrypt(const u8 *key, const u8 *nonce,
|
|||
return aes_ctr_encrypt(key, 16, nonce, data, data_len);
|
||||
}
|
||||
|
||||
|
||||
#ifdef MBEDTLS_NIST_KW_C
|
||||
int aes_wrap(const u8 *kek, size_t kek_len, int n, const u8 *plain, u8 *cipher)
|
||||
{
|
||||
|
|
@ -758,7 +756,7 @@ int pbkdf2_sha1(const char *passphrase, const u8 *ssid, size_t ssid_len,
|
|||
return 0;
|
||||
#else
|
||||
int ret = mbedtls_pkcs5_pbkdf2_hmac_ext(MBEDTLS_MD_SHA1, (const u8 *) passphrase,
|
||||
os_strlen(passphrase) , ssid,
|
||||
os_strlen(passphrase), ssid,
|
||||
ssid_len, iterations, buflen, buf);
|
||||
if (ret != 0) {
|
||||
ret = -1;
|
||||
|
|
@ -909,7 +907,7 @@ int omac1_aes_vector(const u8 *key, size_t key_len, size_t num_elem,
|
|||
ret = mbedtls_cipher_cmac_finish(&ctx, mac);
|
||||
cleanup:
|
||||
mbedtls_cipher_free(&ctx);
|
||||
return(ret);
|
||||
return (ret);
|
||||
}
|
||||
|
||||
int omac1_aes_128_vector(const u8 *key, size_t num_elem,
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ static inline void md_pad(uint8_t *block, size_t blocksz, size_t used, size_t ms
|
|||
memset(block + used, 0, blocksz - used - 4);
|
||||
block[used] = 0x80;
|
||||
block += blocksz - 4;
|
||||
write32_be((uint32_t) (msg * 8), block);
|
||||
write32_be((uint32_t)(msg * 8), block);
|
||||
}
|
||||
|
||||
/* Internal function/type names for hash-specific things. */
|
||||
|
|
|
|||
|
|
@ -46,15 +46,12 @@
|
|||
psa_generic_status_to_mbedtls)
|
||||
#endif /* CONFIG_TLSV13 */
|
||||
|
||||
|
||||
#define TLS_RANDOM_LEN 32
|
||||
#define TLS_HASH_MAX_SIZE 64
|
||||
#define TLS_MASTER_SECRET_LEN 48
|
||||
#define MAX_CIPHERSUITE 32
|
||||
#define MAX_EXPORTER_CONTEXT_LEN 65535
|
||||
|
||||
|
||||
|
||||
/* Throw a compilation error if basic requirements in mbedtls are not enabled */
|
||||
#if !defined(MBEDTLS_SSL_TLS_C)
|
||||
#error "TLS not enabled in mbedtls config"
|
||||
|
|
@ -126,8 +123,9 @@ static int tls_mbedtls_write(void *ctx, const unsigned char *buf, size_t len)
|
|||
struct tls_connection *conn = (struct tls_connection *)ctx;
|
||||
struct tls_data *data = &conn->tls_io_data;
|
||||
|
||||
if (wpabuf_resize(&data->out_data, len) < 0)
|
||||
if (wpabuf_resize(&data->out_data, len) < 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
wpabuf_put_data(data->out_data, buf, len);
|
||||
|
||||
|
|
@ -253,22 +251,21 @@ static uint16_t tls_sig_algs_for_suiteb[] = {
|
|||
|
||||
#if defined(MBEDTLS_SHA512_C)
|
||||
#if defined(MBEDTLS_ECDSA_C)
|
||||
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG( MBEDTLS_SSL_SIG_ECDSA, MBEDTLS_SSL_HASH_SHA512 ),
|
||||
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG( MBEDTLS_SSL_SIG_ECDSA, MBEDTLS_SSL_HASH_SHA384 ),
|
||||
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG(MBEDTLS_SSL_SIG_ECDSA, MBEDTLS_SSL_HASH_SHA512),
|
||||
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG(MBEDTLS_SSL_SIG_ECDSA, MBEDTLS_SSL_HASH_SHA384),
|
||||
#endif
|
||||
#if defined(MBEDTLS_RSA_C)
|
||||
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG( MBEDTLS_SSL_SIG_RSA, MBEDTLS_SSL_HASH_SHA512 ),
|
||||
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG( MBEDTLS_SSL_SIG_RSA, MBEDTLS_SSL_HASH_SHA384 ),
|
||||
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG(MBEDTLS_SSL_SIG_RSA, MBEDTLS_SSL_HASH_SHA512),
|
||||
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG(MBEDTLS_SSL_SIG_RSA, MBEDTLS_SSL_HASH_SHA384),
|
||||
#endif
|
||||
#endif /* MBEDTLS_SHA512_C */
|
||||
MBEDTLS_TLS_SIG_NONE
|
||||
};
|
||||
|
||||
const mbedtls_x509_crt_profile suiteb_mbedtls_x509_crt_profile =
|
||||
{
|
||||
const mbedtls_x509_crt_profile suiteb_mbedtls_x509_crt_profile = {
|
||||
#if defined(MBEDTLS_SHA512_C)
|
||||
MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA384 ) |
|
||||
MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA512 ) |
|
||||
MBEDTLS_X509_ID_FLAG(MBEDTLS_MD_SHA384) |
|
||||
MBEDTLS_X509_ID_FLAG(MBEDTLS_MD_SHA512) |
|
||||
#endif
|
||||
0,
|
||||
0xFFFFFFF, /* Any PK alg */
|
||||
|
|
@ -341,47 +338,46 @@ static uint16_t tls_sig_algs_for_eap[] = {
|
|||
|
||||
#if defined(MBEDTLS_SHA512_C)
|
||||
#if defined(MBEDTLS_ECDSA_C)
|
||||
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG( MBEDTLS_SSL_SIG_ECDSA, MBEDTLS_SSL_HASH_SHA512 ),
|
||||
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG( MBEDTLS_SSL_SIG_ECDSA, MBEDTLS_SSL_HASH_SHA384 ),
|
||||
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG(MBEDTLS_SSL_SIG_ECDSA, MBEDTLS_SSL_HASH_SHA512),
|
||||
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG(MBEDTLS_SSL_SIG_ECDSA, MBEDTLS_SSL_HASH_SHA384),
|
||||
#endif
|
||||
#if defined(MBEDTLS_RSA_C)
|
||||
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG( MBEDTLS_SSL_SIG_RSA, MBEDTLS_SSL_HASH_SHA512 ),
|
||||
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG( MBEDTLS_SSL_SIG_RSA, MBEDTLS_SSL_HASH_SHA384 ),
|
||||
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG(MBEDTLS_SSL_SIG_RSA, MBEDTLS_SSL_HASH_SHA512),
|
||||
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG(MBEDTLS_SSL_SIG_RSA, MBEDTLS_SSL_HASH_SHA384),
|
||||
#endif
|
||||
#endif /* MBEDTLS_SHA512_C */
|
||||
#if defined(MBEDTLS_SHA256_C)
|
||||
#if defined(MBEDTLS_ECDSA_C)
|
||||
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG( MBEDTLS_SSL_SIG_ECDSA, MBEDTLS_SSL_HASH_SHA256 ),
|
||||
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG( MBEDTLS_SSL_SIG_ECDSA, MBEDTLS_SSL_HASH_SHA224 ),
|
||||
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG(MBEDTLS_SSL_SIG_ECDSA, MBEDTLS_SSL_HASH_SHA256),
|
||||
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG(MBEDTLS_SSL_SIG_ECDSA, MBEDTLS_SSL_HASH_SHA224),
|
||||
#endif
|
||||
#if defined(MBEDTLS_RSA_C)
|
||||
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG( MBEDTLS_SSL_SIG_RSA, MBEDTLS_SSL_HASH_SHA256 ),
|
||||
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG( MBEDTLS_SSL_SIG_RSA, MBEDTLS_SSL_HASH_SHA224 ),
|
||||
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG(MBEDTLS_SSL_SIG_RSA, MBEDTLS_SSL_HASH_SHA256),
|
||||
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG(MBEDTLS_SSL_SIG_RSA, MBEDTLS_SSL_HASH_SHA224),
|
||||
#endif
|
||||
#endif /* MBEDTLS_SHA256_C */
|
||||
#if defined(MBEDTLS_SHA1_C)
|
||||
#if defined(MBEDTLS_ECDSA_C)
|
||||
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG( MBEDTLS_SSL_SIG_ECDSA, MBEDTLS_SSL_HASH_SHA1 ),
|
||||
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG(MBEDTLS_SSL_SIG_ECDSA, MBEDTLS_SSL_HASH_SHA1),
|
||||
#endif
|
||||
#if defined(MBEDTLS_RSA_C)
|
||||
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG( MBEDTLS_SSL_SIG_RSA, MBEDTLS_SSL_HASH_SHA1 ),
|
||||
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG(MBEDTLS_SSL_SIG_RSA, MBEDTLS_SSL_HASH_SHA1),
|
||||
#endif
|
||||
#endif /* MBEDTLS_SHA1_C */
|
||||
MBEDTLS_TLS_SIG_NONE
|
||||
};
|
||||
|
||||
const mbedtls_x509_crt_profile eap_mbedtls_x509_crt_profile =
|
||||
{
|
||||
const mbedtls_x509_crt_profile eap_mbedtls_x509_crt_profile = {
|
||||
#if defined(MBEDTLS_SHA1_C)
|
||||
MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA1 ) |
|
||||
MBEDTLS_X509_ID_FLAG(MBEDTLS_MD_SHA1) |
|
||||
#endif
|
||||
#if defined(MBEDTLS_SHA256_C)
|
||||
MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA224 ) |
|
||||
MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA256 ) |
|
||||
MBEDTLS_X509_ID_FLAG(MBEDTLS_MD_SHA224) |
|
||||
MBEDTLS_X509_ID_FLAG(MBEDTLS_MD_SHA256) |
|
||||
#endif
|
||||
#if defined(MBEDTLS_SHA512_C)
|
||||
MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA384 ) |
|
||||
MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA512 ) |
|
||||
MBEDTLS_X509_ID_FLAG(MBEDTLS_MD_SHA384) |
|
||||
MBEDTLS_X509_ID_FLAG(MBEDTLS_MD_SHA512) |
|
||||
#endif
|
||||
0,
|
||||
0xFFFFFFF, /* Any PK alg */
|
||||
|
|
@ -405,8 +401,7 @@ static int tls_disable_key_usages(void *data, mbedtls_x509_crt *cert, int depth,
|
|||
#endif /*CONFIG_ESP_WIFI_DISABLE_KEY_USAGE_CHECK*/
|
||||
|
||||
#ifdef CONFIG_SUITEB192
|
||||
static const int suiteb_rsa_ciphersuite_preference[] =
|
||||
{
|
||||
static const int suiteb_rsa_ciphersuite_preference[] = {
|
||||
#if defined(CONFIG_ESP_WIFI_EAP_TLS1_3)
|
||||
MBEDTLS_TLS1_3_AES_256_GCM_SHA384,
|
||||
#endif /* CONFIG_ESP_WIFI_EAP_TLS1_3 */
|
||||
|
|
@ -419,8 +414,7 @@ static const int suiteb_rsa_ciphersuite_preference[] =
|
|||
0
|
||||
};
|
||||
|
||||
static const int suiteb_ecc_ciphersuite_preference[] =
|
||||
{
|
||||
static const int suiteb_ecc_ciphersuite_preference[] = {
|
||||
#if defined(CONFIG_ESP_WIFI_EAP_TLS1_3)
|
||||
MBEDTLS_TLS1_3_AES_256_GCM_SHA384,
|
||||
#endif /* CONFIG_ESP_WIFI_EAP_TLS1_3 */
|
||||
|
|
@ -431,8 +425,7 @@ static const int suiteb_ecc_ciphersuite_preference[] =
|
|||
#endif
|
||||
0
|
||||
};
|
||||
static const int suiteb_ciphersuite_preference[] =
|
||||
{
|
||||
static const int suiteb_ciphersuite_preference[] = {
|
||||
#if defined(CONFIG_ESP_WIFI_EAP_TLS1_3)
|
||||
MBEDTLS_TLS1_3_AES_256_GCM_SHA384,
|
||||
#endif /* CONFIG_ESP_WIFI_EAP_TLS1_3 */
|
||||
|
|
@ -484,8 +477,9 @@ static int set_client_config(const struct tls_connection_params *cfg, tls_contex
|
|||
assert(tls != NULL);
|
||||
|
||||
#ifdef CONFIG_SUITEB192
|
||||
if (cfg->flags & TLS_CONN_SUITEB)
|
||||
if (cfg->flags & TLS_CONN_SUITEB) {
|
||||
preset = MBEDTLS_SSL_PRESET_SUITEB;
|
||||
}
|
||||
#endif
|
||||
ret = mbedtls_ssl_config_defaults(&tls->conf,
|
||||
MBEDTLS_SSL_IS_CLIENT,
|
||||
|
|
@ -528,7 +522,7 @@ static int set_client_config(const struct tls_connection_params *cfg, tls_contex
|
|||
tls_set_ciphersuite(cfg, tls);
|
||||
|
||||
#ifdef CONFIG_ESP_WIFI_DISABLE_KEY_USAGE_CHECK
|
||||
mbedtls_ssl_set_verify( &tls->ssl, tls_disable_key_usages, NULL );
|
||||
mbedtls_ssl_set_verify(&tls->ssl, tls_disable_key_usages, NULL);
|
||||
#endif /*CONFIG_ESP_WIFI_DISABLE_KEY_USAGE_CHECK*/
|
||||
|
||||
#ifdef CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
|
||||
|
|
@ -670,7 +664,6 @@ struct tls_connection * tls_connection_init(void *tls_ctx)
|
|||
return conn;
|
||||
}
|
||||
|
||||
|
||||
void tls_connection_deinit(void *tls_ctx, struct tls_connection *conn)
|
||||
{
|
||||
/* case: tls init failed */
|
||||
|
|
@ -723,7 +716,7 @@ static void esp_mbedtls_free_dhm(mbedtls_ssl_context *ssl)
|
|||
|
||||
static void esp_mbedtls_free_keycert(mbedtls_ssl_context *ssl)
|
||||
{
|
||||
mbedtls_ssl_config *conf = (mbedtls_ssl_config * )mbedtls_ssl_context_get_config(ssl);
|
||||
mbedtls_ssl_config *conf = (mbedtls_ssl_config *)mbedtls_ssl_context_get_config(ssl);
|
||||
mbedtls_ssl_key_cert *keycert = conf->MBEDTLS_PRIVATE(key_cert), *next;
|
||||
|
||||
while (keycert) {
|
||||
|
|
@ -756,7 +749,7 @@ static void esp_mbedtls_free_keycert_key(mbedtls_ssl_context *ssl)
|
|||
static void esp_mbedtls_free_cacert(mbedtls_ssl_context *ssl)
|
||||
{
|
||||
if (ssl->MBEDTLS_PRIVATE(conf)->MBEDTLS_PRIVATE(ca_chain)) {
|
||||
mbedtls_ssl_config *conf = (mbedtls_ssl_config * )mbedtls_ssl_context_get_config(ssl);
|
||||
mbedtls_ssl_config *conf = (mbedtls_ssl_config *)mbedtls_ssl_context_get_config(ssl);
|
||||
|
||||
mbedtls_x509_crt_free(conf->MBEDTLS_PRIVATE(ca_chain));
|
||||
conf->MBEDTLS_PRIVATE(ca_chain) = NULL;
|
||||
|
|
@ -847,7 +840,6 @@ struct wpabuf * tls_connection_server_handshake(void *tls_ctx,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
struct wpabuf * tls_connection_encrypt(void *tls_ctx,
|
||||
struct tls_connection *conn,
|
||||
const struct wpabuf *in_data)
|
||||
|
|
@ -870,7 +862,6 @@ struct wpabuf * tls_connection_encrypt(void *tls_ctx,
|
|||
return resp;
|
||||
}
|
||||
|
||||
|
||||
struct wpabuf *tls_connection_decrypt(void *tls_ctx,
|
||||
struct tls_connection *conn,
|
||||
const struct wpabuf *in_data)
|
||||
|
|
@ -911,7 +902,6 @@ cleanup:
|
|||
#undef MAX_PHASE2_BUFFER
|
||||
}
|
||||
|
||||
|
||||
int tls_connection_resumed(void *tls_ctx, struct tls_connection *conn)
|
||||
{
|
||||
if (conn && conn->tls && conn->tls->ssl.MBEDTLS_PRIVATE(handshake)) {
|
||||
|
|
@ -972,7 +962,6 @@ int tls_get_cipher(void *tls_ctx, struct tls_connection *conn,
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int tls_connection_enable_workaround(void *tls_ctx,
|
||||
struct tls_connection *conn)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -122,9 +122,10 @@ static void btm_rrm_task(void *pvParameters)
|
|||
supplicant_event_t *evt;
|
||||
bool task_del = false;
|
||||
|
||||
while(1) {
|
||||
if (os_queue_recv(s_supplicant_evt_queue, &evt, OS_BLOCK) != TRUE)
|
||||
while (1) {
|
||||
if (os_queue_recv(s_supplicant_evt_queue, &evt, OS_BLOCK) != TRUE) {
|
||||
continue;
|
||||
}
|
||||
|
||||
/* event validation failed */
|
||||
if (evt->id >= SIG_SUPPLICANT_MAX) {
|
||||
|
|
@ -133,8 +134,7 @@ static void btm_rrm_task(void *pvParameters)
|
|||
}
|
||||
|
||||
switch (evt->id) {
|
||||
case SIG_SUPPLICANT_RX_ACTION:
|
||||
{
|
||||
case SIG_SUPPLICANT_RX_ACTION: {
|
||||
struct ieee_mgmt_frame *frm = (struct ieee_mgmt_frame *)evt->data;
|
||||
mgmt_rx_action(frm->payload, frm->len, frm->sender, frm->rssi, frm->channel);
|
||||
os_free(frm);
|
||||
|
|
@ -153,9 +153,10 @@ static void btm_rrm_task(void *pvParameters)
|
|||
|
||||
os_free(evt);
|
||||
|
||||
if (task_del)
|
||||
if (task_del) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
os_queue_delete(s_supplicant_evt_queue);
|
||||
s_supplicant_evt_queue = NULL;
|
||||
|
|
@ -170,8 +171,9 @@ static void clear_bssid_flag_and_channel(struct wpa_supplicant *wpa_s)
|
|||
wifi_config_t *config;
|
||||
|
||||
/* Reset only if btm is enabled */
|
||||
if (esp_wifi_is_btm_enabled_internal(WIFI_IF_STA) == false)
|
||||
if (esp_wifi_is_btm_enabled_internal(WIFI_IF_STA) == false) {
|
||||
return;
|
||||
}
|
||||
|
||||
config = os_zalloc(sizeof(wifi_config_t));
|
||||
|
||||
|
|
@ -198,13 +200,16 @@ static void register_mgmt_frames(struct wpa_supplicant *wpa_s)
|
|||
|
||||
#ifdef CONFIG_IEEE80211KV
|
||||
/* current supported features in supplicant: rrm and btm */
|
||||
if (esp_wifi_is_rm_enabled_internal(WIFI_IF_STA))
|
||||
if (esp_wifi_is_rm_enabled_internal(WIFI_IF_STA)) {
|
||||
wpa_s->subtype = 1 << WLAN_ACTION_RADIO_MEASUREMENT;
|
||||
if (esp_wifi_is_btm_enabled_internal(WIFI_IF_STA))
|
||||
}
|
||||
if (esp_wifi_is_btm_enabled_internal(WIFI_IF_STA)) {
|
||||
wpa_s->subtype |= 1 << WLAN_ACTION_WNM;
|
||||
}
|
||||
|
||||
if (wpa_s->subtype)
|
||||
if (wpa_s->subtype) {
|
||||
wpa_s->type |= 1 << WLAN_FC_STYPE_ACTION;
|
||||
}
|
||||
#endif /* CONFIG_IEEE80211KV */
|
||||
|
||||
#ifdef CONFIG_IEEE80211R
|
||||
|
|
@ -517,8 +522,8 @@ int esp_rrm_send_neighbor_rep_request(neighbor_rep_request_cb cb,
|
|||
return wpas_rrm_send_neighbor_rep_request(wpa_s, &wpa_ssid, 0, 0, cb, cb_ctx);
|
||||
}
|
||||
|
||||
|
||||
void neighbor_report_recvd_cb(void *ctx, const uint8_t *report, size_t report_len) {
|
||||
void neighbor_report_recvd_cb(void *ctx, const uint8_t *report, size_t report_len)
|
||||
{
|
||||
if (report == NULL) {
|
||||
wpa_printf(MSG_DEBUG, "RRM: Notifying neighbor report - NONE");
|
||||
esp_event_post(WIFI_EVENT, WIFI_EVENT_STA_NEIGHBOR_REP, NULL, 0, 0);
|
||||
|
|
@ -811,7 +816,6 @@ static size_t add_mdie(uint8_t *bssid, uint8_t *ie, size_t len)
|
|||
}
|
||||
#endif /* CONFIG_IEEE80211R */
|
||||
|
||||
|
||||
#ifdef CONFIG_IEEE80211R
|
||||
int wpa_sm_update_ft_ies(struct wpa_sm *sm, const u8 *md,
|
||||
const u8 *ies, size_t ies_len, bool auth_ie)
|
||||
|
|
@ -843,7 +847,7 @@ void esp_get_tx_power(uint8_t *tx_power)
|
|||
*tx_power = DEFAULT_MAX_TX_POWER;
|
||||
return;
|
||||
}
|
||||
*tx_power = power/4;
|
||||
*tx_power = power / 4;
|
||||
#undef DEFAULT_MAX_TX_POWER
|
||||
}
|
||||
|
||||
|
|
@ -855,8 +859,9 @@ int wpa_drv_send_action(struct wpa_supplicant *wpa_s,
|
|||
{
|
||||
int ret = 0;
|
||||
wifi_mgmt_frm_req_t *req = os_zalloc(sizeof(*req) + data_len);;
|
||||
if (!req)
|
||||
if (!req) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!wpa_s->current_bss) {
|
||||
wpa_printf(MSG_ERROR, "STA not associated, return");
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: 2020-2023 Espressif Systems (Shanghai) CO LTD
|
||||
* SPDX-FileCopyrightText: 2020-2024 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -64,14 +64,14 @@ esp_err_t esp_dpp_post_evt(uint32_t evt_id, uint32_t data)
|
|||
if (evt_id != SIG_DPP_DEL_TASK) {
|
||||
DPP_API_UNLOCK();
|
||||
}
|
||||
wpa_printf(MSG_DEBUG,"DPP: Sent event %d to DPP task", evt_id);
|
||||
wpa_printf(MSG_DEBUG, "DPP: Sent event %d to DPP task", evt_id);
|
||||
|
||||
return ret;
|
||||
end:
|
||||
if (evt) {
|
||||
os_free(evt);
|
||||
}
|
||||
wpa_printf(MSG_ERROR,"DPP: Failed to send event %d to DPP task", evt_id);
|
||||
wpa_printf(MSG_ERROR, "DPP: Failed to send event %d to DPP task", evt_id);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -87,7 +87,7 @@ static uint8_t esp_dpp_deinit_auth(void)
|
|||
|
||||
static void esp_dpp_call_cb(esp_supp_dpp_event_t evt, void *data)
|
||||
{
|
||||
if ( evt == ESP_SUPP_DPP_FAIL && s_dpp_ctx.dpp_auth) {
|
||||
if (evt == ESP_SUPP_DPP_FAIL && s_dpp_ctx.dpp_auth) {
|
||||
esp_dpp_deinit_auth();
|
||||
}
|
||||
s_dpp_ctx.dpp_event_cb(evt, data);
|
||||
|
|
@ -95,8 +95,9 @@ static void esp_dpp_call_cb(esp_supp_dpp_event_t evt, void *data)
|
|||
|
||||
static void esp_dpp_auth_conf_wait_timeout(void *eloop_ctx, void *timeout_ctx)
|
||||
{
|
||||
if (!s_dpp_ctx.dpp_auth || !s_dpp_ctx.dpp_auth->waiting_auth_conf)
|
||||
if (!s_dpp_ctx.dpp_auth || !s_dpp_ctx.dpp_auth->waiting_auth_conf) {
|
||||
return;
|
||||
}
|
||||
|
||||
wpa_printf(MSG_DEBUG,
|
||||
"DPP: Terminate authentication exchange due to Auth Confirm timeout");
|
||||
|
|
@ -181,8 +182,8 @@ static void esp_dpp_rx_auth_req(struct action_rx_param *rx_param, uint8_t *dpp_d
|
|||
esp_dpp_send_action_frame(rx_param->sa, wpabuf_head(s_dpp_ctx.dpp_auth->resp_msg),
|
||||
wpabuf_len(s_dpp_ctx.dpp_auth->resp_msg),
|
||||
rx_param->channel, OFFCHAN_TX_WAIT_TIME);
|
||||
eloop_cancel_timeout(esp_dpp_auth_conf_wait_timeout, NULL,NULL);
|
||||
eloop_register_timeout(ESP_DPP_AUTH_TIMEOUT_SECS, 0, esp_dpp_auth_conf_wait_timeout,NULL, NULL);
|
||||
eloop_cancel_timeout(esp_dpp_auth_conf_wait_timeout, NULL, NULL);
|
||||
eloop_register_timeout(ESP_DPP_AUTH_TIMEOUT_SECS, 0, esp_dpp_auth_conf_wait_timeout, NULL, NULL);
|
||||
|
||||
return;
|
||||
fail:
|
||||
|
|
@ -363,8 +364,9 @@ static esp_err_t esp_dpp_rx_peer_disc_resp(struct action_rx_param *rx_param)
|
|||
|
||||
if (res == DPP_STATUS_OK) {
|
||||
entry = os_zalloc(sizeof(*entry));
|
||||
if (!entry)
|
||||
if (!entry) {
|
||||
goto fail;
|
||||
}
|
||||
os_memcpy(entry->aa, rx_param->sa, ETH_ALEN);
|
||||
os_memcpy(entry->pmkid, intro.pmkid, PMKID_LEN);
|
||||
os_memcpy(entry->pmk, intro.pmk, intro.pmk_len);
|
||||
|
|
@ -469,8 +471,9 @@ static esp_err_t esp_dpp_rx_action(struct action_rx_param *rx_param)
|
|||
|
||||
int ret = ESP_OK;
|
||||
|
||||
if (!rx_param)
|
||||
if (!rx_param) {
|
||||
return ESP_ERR_INVALID_ARG;
|
||||
}
|
||||
|
||||
if (rx_param->action_frm->category == WLAN_ACTION_PUBLIC) {
|
||||
struct ieee80211_public_action *public_action =
|
||||
|
|
@ -511,7 +514,7 @@ static esp_err_t esp_dpp_rx_action(struct action_rx_param *rx_param)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static void esp_dpp_task(void *pvParameters )
|
||||
static void esp_dpp_task(void *pvParameters)
|
||||
{
|
||||
dpp_event_t *evt;
|
||||
bool task_del = false;
|
||||
|
|
|
|||
|
|
@ -165,7 +165,7 @@ static void wpa2_rxq_init(void)
|
|||
static void wpa2_rxq_enqueue(struct wpa2_rx_param *param)
|
||||
{
|
||||
DATA_MUTEX_TAKE();
|
||||
STAILQ_INSERT_TAIL(&s_wpa2_rxq,param, bqentry);
|
||||
STAILQ_INSERT_TAIL(&s_wpa2_rxq, param, bqentry);
|
||||
DATA_MUTEX_GIVE();
|
||||
}
|
||||
|
||||
|
|
@ -175,7 +175,7 @@ static struct wpa2_rx_param * wpa2_rxq_dequeue(void)
|
|||
DATA_MUTEX_TAKE();
|
||||
if ((param = STAILQ_FIRST(&s_wpa2_rxq)) != NULL) {
|
||||
STAILQ_REMOVE_HEAD(&s_wpa2_rxq, bqentry);
|
||||
STAILQ_NEXT(param,bqentry) = NULL;
|
||||
STAILQ_NEXT(param, bqentry) = NULL;
|
||||
}
|
||||
DATA_MUTEX_GIVE();
|
||||
return param;
|
||||
|
|
@ -187,14 +187,14 @@ static void wpa2_rxq_deinit(void)
|
|||
DATA_MUTEX_TAKE();
|
||||
while ((param = STAILQ_FIRST(&s_wpa2_rxq)) != NULL) {
|
||||
STAILQ_REMOVE_HEAD(&s_wpa2_rxq, bqentry);
|
||||
STAILQ_NEXT(param,bqentry) = NULL;
|
||||
STAILQ_NEXT(param, bqentry) = NULL;
|
||||
os_free(param->buf);
|
||||
os_free(param);
|
||||
}
|
||||
DATA_MUTEX_GIVE();
|
||||
}
|
||||
|
||||
void wpa2_task(void *pvParameters )
|
||||
void wpa2_task(void *pvParameters)
|
||||
{
|
||||
ETSEvent *e;
|
||||
struct eap_sm *sm = gEapSm;
|
||||
|
|
@ -205,10 +205,10 @@ void wpa2_task(void *pvParameters )
|
|||
}
|
||||
|
||||
for (;;) {
|
||||
if ( TRUE == os_queue_recv(s_wpa2_queue, &e, OS_BLOCK) ) {
|
||||
if (TRUE == os_queue_recv(s_wpa2_queue, &e, OS_BLOCK)) {
|
||||
if (e->sig < SIG_WPA2_MAX) {
|
||||
DATA_MUTEX_TAKE();
|
||||
if(sm->wpa2_sig_cnt[e->sig]) {
|
||||
if (sm->wpa2_sig_cnt[e->sig]) {
|
||||
sm->wpa2_sig_cnt[e->sig]--;
|
||||
} else {
|
||||
wpa_printf(MSG_ERROR, "wpa2_task: invalid sig cnt, sig=%" PRId32 " cnt=%d", e->sig, sm->wpa2_sig_cnt[e->sig]);
|
||||
|
|
@ -225,7 +225,7 @@ void wpa2_task(void *pvParameters )
|
|||
case SIG_WPA2_RX: {
|
||||
struct wpa2_rx_param *param = NULL;
|
||||
|
||||
while ((param = wpa2_rxq_dequeue()) != NULL){
|
||||
while ((param = wpa2_rxq_dequeue()) != NULL) {
|
||||
eap_sm_rx_eapol_internal(param->sa, param->buf, param->len, param->bssid);
|
||||
os_free(param->buf);
|
||||
os_free(param);
|
||||
|
|
@ -543,7 +543,7 @@ static int eap_sm_rx_eapol_internal(u8 *src_addr, u8 *buf, u32 len, uint8_t *bss
|
|||
tmp = buf;
|
||||
|
||||
hdr = (struct ieee802_1x_hdr *) tmp;
|
||||
ehdr = (struct eap_hdr *) (hdr + 1);
|
||||
ehdr = (struct eap_hdr *)(hdr + 1);
|
||||
plen = be_to_host16(hdr->length);
|
||||
data_len = plen + sizeof(*hdr);
|
||||
|
||||
|
|
|
|||
|
|
@ -82,8 +82,7 @@ void *hostap_init(void)
|
|||
pairwise_cipher = esp_wifi_ap_get_prof_pairwise_cipher_internal();
|
||||
|
||||
#ifdef CONFIG_IEEE80211W
|
||||
if((auth_conf->wpa & WPA_PROTO_RSN) == WPA_PROTO_RSN)
|
||||
{
|
||||
if ((auth_conf->wpa & WPA_PROTO_RSN) == WPA_PROTO_RSN) {
|
||||
esp_wifi_get_pmf_config_internal(&pmf_cfg, WIFI_IF_AP);
|
||||
if (pmf_cfg.required) {
|
||||
pairwise_cipher = WIFI_CIPHER_TYPE_CCMP;
|
||||
|
|
@ -191,7 +190,7 @@ void hostapd_cleanup(struct hostapd_data *hapd)
|
|||
if (hapd == NULL) {
|
||||
return;
|
||||
}
|
||||
if(hapd->wpa_auth) {
|
||||
if (hapd->wpa_auth) {
|
||||
wpa_deinit(hapd->wpa_auth);
|
||||
hapd->wpa_auth = NULL;
|
||||
}
|
||||
|
|
@ -217,7 +216,7 @@ void hostapd_cleanup(struct hostapd_data *hapd)
|
|||
|
||||
#endif /* CONFIG_SAE */
|
||||
#ifdef CONFIG_WPS_REGISTRAR
|
||||
if (esp_wifi_get_wps_type_internal () != WPS_TYPE_DISABLE ||
|
||||
if (esp_wifi_get_wps_type_internal() != WPS_TYPE_DISABLE ||
|
||||
esp_wifi_get_wps_status_internal() != WPS_STATUS_DISABLE) {
|
||||
esp_wifi_ap_wps_disable();
|
||||
}
|
||||
|
|
@ -227,7 +226,6 @@ void hostapd_cleanup(struct hostapd_data *hapd)
|
|||
|
||||
}
|
||||
|
||||
|
||||
bool hostap_deinit(void *data)
|
||||
{
|
||||
struct hostapd_data *hapd = (struct hostapd_data *)data;
|
||||
|
|
|
|||
|
|
@ -186,7 +186,6 @@ static int wifi_ap_wps_enable_internal(const esp_wps_config_t *config)
|
|||
return ESP_FAIL;
|
||||
}
|
||||
|
||||
|
||||
if (wps_set_type(config->wps_type) != ESP_OK) {
|
||||
goto _err;
|
||||
}
|
||||
|
|
@ -247,7 +246,6 @@ static int wifi_ap_wps_disable_internal(void)
|
|||
goto _err;
|
||||
}
|
||||
|
||||
|
||||
s_wps_enabled = false;
|
||||
return ESP_OK;
|
||||
|
||||
|
|
@ -275,7 +273,6 @@ static int wifi_ap_wps_start_internal(const unsigned char *pin)
|
|||
return ESP_ERR_WIFI_MODE;
|
||||
}
|
||||
|
||||
|
||||
if (!s_wps_enabled) {
|
||||
wpa_printf(MSG_ERROR, "wps start: wps not enabled");
|
||||
API_MUTEX_GIVE();
|
||||
|
|
@ -332,7 +329,7 @@ static void wps_reg_eloop_handler(void *eloop_ctx, void *user_ctx)
|
|||
enum wps_reg_sig_type *sig = (enum wps_reg_sig_type *) eloop_ctx;
|
||||
wps_ioctl_param_t *param = (wps_ioctl_param_t *) user_ctx;
|
||||
|
||||
switch(*sig) {
|
||||
switch (*sig) {
|
||||
case SIG_WPS_REG_ENABLE:
|
||||
esp_wps_config_t *config = (esp_wps_config_t *)param->arg;
|
||||
ret = wifi_ap_wps_enable_internal(config);
|
||||
|
|
|
|||
|
|
@ -168,7 +168,8 @@ int esp_handle_beacon_probe(u8 type, u8 *frame, size_t len, u8 *sender,
|
|||
return 0;
|
||||
}
|
||||
#ifdef CONFIG_WNM
|
||||
void get_scan_channel_bitmap(struct wpa_supplicant *wpa_s, wifi_scan_config_t *params) {
|
||||
void get_scan_channel_bitmap(struct wpa_supplicant *wpa_s, wifi_scan_config_t *params)
|
||||
{
|
||||
if (!wpa_s->wnm_num_neighbor_report) {
|
||||
wpa_printf(MSG_DEBUG, "No Neighbor Report to gather scan channel list");
|
||||
return;
|
||||
|
|
@ -265,10 +266,12 @@ static int issue_scan(struct wpa_supplicant *wpa_s,
|
|||
|
||||
cleanup:
|
||||
if (params) {
|
||||
if (params->ssid)
|
||||
if (params->ssid) {
|
||||
os_free(params->ssid);
|
||||
if (params->bssid)
|
||||
}
|
||||
if (params->bssid) {
|
||||
os_free(params->bssid);
|
||||
}
|
||||
os_free(params);
|
||||
}
|
||||
|
||||
|
|
@ -291,11 +294,13 @@ void wpa_scan_results_free(struct wpa_scan_results *res)
|
|||
{
|
||||
size_t i;
|
||||
|
||||
if (res == NULL)
|
||||
if (res == NULL) {
|
||||
return;
|
||||
}
|
||||
|
||||
for (i = 0; i < res->num; i++)
|
||||
for (i = 0; i < res->num; i++) {
|
||||
os_free(res->res[i]);
|
||||
}
|
||||
os_free(res->res);
|
||||
os_free(res);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: 2019-2023 Espressif Systems (Shanghai) CO LTD
|
||||
* SPDX-FileCopyrightText: 2019-2024 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
#define WPA2_TASK_STACK_SIZE (6144 + TASK_STACK_SIZE_ADD)
|
||||
#define WPS_TASK_STACK_SIZE (12288 + TASK_STACK_SIZE_ADD)
|
||||
|
||||
enum wpa_alg{
|
||||
enum wpa_alg {
|
||||
WIFI_WPA_ALG_NONE = 0,
|
||||
WIFI_WPA_ALG_WEP40 = 1,
|
||||
WIFI_WPA_ALG_TKIP = 2,
|
||||
|
|
@ -64,9 +64,9 @@ enum {
|
|||
WPA2_AUTH_PSK = 0x05,
|
||||
WPA_AUTH_CCKM = 0x06,
|
||||
WPA2_AUTH_CCKM = 0x07,
|
||||
WPA2_AUTH_PSK_SHA256= 0x08,
|
||||
WPA2_AUTH_PSK_SHA256 = 0x08,
|
||||
WPA3_AUTH_PSK = 0x09,
|
||||
WPA2_AUTH_ENT_SHA256= 0x0a,
|
||||
WPA2_AUTH_ENT_SHA256 = 0x0a,
|
||||
WAPI_AUTH_PSK = 0x0b,
|
||||
WAPI_AUTH_CERT = 0x0c,
|
||||
WPA2_AUTH_ENT_SHA384_SUITE_B = 0x0d,
|
||||
|
|
@ -148,7 +148,7 @@ struct wpa_funcs {
|
|||
struct wpa2_funcs {
|
||||
int (*wpa2_sm_rx_eapol)(u8 *src_addr, u8 *buf, u32 len, u8 *bssid);
|
||||
int (*wpa2_start)(void);
|
||||
u8 (*wpa2_get_state)(void);
|
||||
u8(*wpa2_get_state)(void);
|
||||
int (*wpa2_init)(void);
|
||||
void (*wpa2_deinit)(void);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
#include "esp_hostap.h"
|
||||
#include <inttypes.h>
|
||||
|
||||
|
||||
static struct sae_pt *g_sae_pt;
|
||||
static struct sae_data g_sae_data;
|
||||
static struct wpabuf *g_sae_token = NULL;
|
||||
|
|
@ -34,7 +33,7 @@ static esp_err_t wpa3_build_sae_commit(u8 *bssid, size_t *sae_msg_len)
|
|||
const u8 *pw = (const u8 *)esp_wifi_sta_get_prof_password_internal();
|
||||
struct wifi_ssid *ssid = esp_wifi_sta_get_prof_ssid_internal();
|
||||
uint8_t sae_pwe = esp_wifi_get_config_sae_pwe_h2e_internal(WIFI_IF_STA);
|
||||
char sae_pwd_id[SAE_H2E_IDENTIFIER_LEN+1] = {0};
|
||||
char sae_pwd_id[SAE_H2E_IDENTIFIER_LEN + 1] = {0};
|
||||
bool valid_pwd_id = false;
|
||||
const u8 *rsnxe;
|
||||
u8 rsnxe_capa = 0;
|
||||
|
|
@ -53,7 +52,7 @@ static esp_err_t wpa3_build_sae_commit(u8 *bssid, size_t *sae_msg_len)
|
|||
uint8_t sae_pk_mode = esp_wifi_sta_get_config_sae_pk_internal();
|
||||
if ((rsnxe_capa & BIT(WLAN_RSNX_CAPAB_SAE_PK)) &&
|
||||
sae_pk_mode != WPA3_SAE_PK_MODE_DISABLED &&
|
||||
((pw && sae_pk_valid_password((const char*)pw)))) {
|
||||
((pw && sae_pk_valid_password((const char *)pw)))) {
|
||||
use_pt = 1;
|
||||
use_pk = true;
|
||||
}
|
||||
|
|
@ -138,9 +137,9 @@ static esp_err_t wpa3_build_sae_commit(u8 *bssid, size_t *sae_msg_len)
|
|||
#ifdef CONFIG_SAE_PK
|
||||
if (g_sae_data.tmp && use_pt && use_pk) {
|
||||
g_sae_data.pk = 1;
|
||||
os_memcpy(g_sae_data.tmp->own_addr,own_addr, ETH_ALEN );
|
||||
os_memcpy(g_sae_data.tmp->own_addr, own_addr, ETH_ALEN);
|
||||
os_memcpy(g_sae_data.tmp->peer_addr, bssid, ETH_ALEN);
|
||||
sae_pk_set_password(&g_sae_data,(const char*) pw);
|
||||
sae_pk_set_password(&g_sae_data, (const char*) pw);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -170,8 +169,9 @@ reuse_data:
|
|||
|
||||
static esp_err_t wpa3_build_sae_confirm(void)
|
||||
{
|
||||
if (g_sae_data.state != SAE_COMMITTED)
|
||||
if (g_sae_data.state != SAE_COMMITTED) {
|
||||
return ESP_FAIL;
|
||||
}
|
||||
|
||||
if (g_sae_confirm) {
|
||||
wpabuf_free(g_sae_confirm);
|
||||
|
|
@ -224,14 +224,16 @@ static u8 *wpa3_build_sae_msg(u8 *bssid, u32 sae_msg_type, size_t *sae_msg_len)
|
|||
*sae_msg_len = 0;
|
||||
return NULL;
|
||||
}
|
||||
if (ESP_OK != wpa3_build_sae_commit(bssid, sae_msg_len))
|
||||
if (ESP_OK != wpa3_build_sae_commit(bssid, sae_msg_len)) {
|
||||
return NULL;
|
||||
}
|
||||
*sae_msg_len = wpabuf_len(g_sae_commit);
|
||||
buf = wpabuf_mhead_u8(g_sae_commit);
|
||||
break;
|
||||
case SAE_MSG_CONFIRM:
|
||||
if (ESP_OK != wpa3_build_sae_confirm())
|
||||
if (ESP_OK != wpa3_build_sae_confirm()) {
|
||||
return NULL;
|
||||
}
|
||||
*sae_msg_len = wpabuf_len(g_sae_confirm);
|
||||
buf = wpabuf_mhead_u8(g_sae_confirm);
|
||||
break;
|
||||
|
|
@ -252,8 +254,9 @@ static int wpa3_parse_sae_commit(u8 *buf, u32 len, u16 status)
|
|||
}
|
||||
|
||||
if (status == WLAN_STATUS_ANTI_CLOGGING_TOKEN_REQ) {
|
||||
if (g_sae_token)
|
||||
if (g_sae_token) {
|
||||
wpabuf_free(g_sae_token);
|
||||
}
|
||||
if (g_sae_data.h2e) {
|
||||
if ((buf[2] != WLAN_EID_EXTENSION) ||
|
||||
(buf[3] == 0) ||
|
||||
|
|
@ -516,7 +519,7 @@ static void esp_wpa3_hostap_task(void *pvParameters)
|
|||
}
|
||||
}
|
||||
uint32_t items_in_queue = os_queue_msg_waiting(g_wpa3_hostap_evt_queue);
|
||||
while(items_in_queue--) {
|
||||
while (items_in_queue--) {
|
||||
/* Free events posted to queue */
|
||||
os_queue_recv(g_wpa3_hostap_evt_queue, &evt, portMAX_DELAY);
|
||||
if (evt->id == SIG_WPA3_RX_CONFIRM) {
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ bool wpa_attach(void)
|
|||
{
|
||||
bool ret = true;
|
||||
ret = wpa_sm_init();
|
||||
if(ret) {
|
||||
if (ret) {
|
||||
ret = (esp_wifi_register_eapol_txdonecb_internal(eapol_txcb) == ESP_OK);
|
||||
}
|
||||
esp_set_scan_ie();
|
||||
|
|
@ -346,7 +346,7 @@ static int check_n_add_wps_sta(struct hostapd_data *hapd, struct sta_info *sta_i
|
|||
}
|
||||
#endif
|
||||
|
||||
static bool hostap_sta_join(void **sta, u8 *bssid, u8 *wpa_ie, u8 wpa_ie_len,u8 *rsnxe, u8 rsnxe_len, bool *pmf_enable, int subtype)
|
||||
static bool hostap_sta_join(void **sta, u8 *bssid, u8 *wpa_ie, u8 wpa_ie_len, u8 *rsnxe, u8 rsnxe_len, bool *pmf_enable, int subtype)
|
||||
{
|
||||
struct sta_info *sta_info = NULL;
|
||||
struct hostapd_data *hapd = hostapd_get_hapd_data();
|
||||
|
|
@ -379,7 +379,7 @@ static bool hostap_sta_join(void **sta, u8 *bssid, u8 *wpa_ie, u8 wpa_ie_len,u8
|
|||
|
||||
sta_info = ap_get_sta(hapd, bssid);
|
||||
if (!sta_info) {
|
||||
sta_info = ap_sta_add(hapd,bssid);
|
||||
sta_info = ap_sta_add(hapd, bssid);
|
||||
if (!sta_info) {
|
||||
wpa_printf(MSG_ERROR, "failed to add station " MACSTR, MAC2STR(bssid));
|
||||
goto fail;
|
||||
|
|
@ -397,7 +397,6 @@ static bool hostap_sta_join(void **sta, u8 *bssid, u8 *wpa_ie, u8 wpa_ie_len,u8
|
|||
process_old_sta:
|
||||
#endif /* CONFIG_SAE */
|
||||
|
||||
|
||||
#ifdef CONFIG_WPS_REGISTRAR
|
||||
if (check_n_add_wps_sta(hapd, sta_info, wpa_ie, wpa_ie_len, pmf_enable, subtype) == 0) {
|
||||
if (sta_info->eapol_sm) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: 2019-2023 Espressif Systems (Shanghai) CO LTD
|
||||
* SPDX-FileCopyrightText: 2019-2024 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
|
@ -77,8 +77,8 @@ int hostapd_send_eapol(const u8 *source, const u8 *sta_addr,
|
|||
void *buffer = os_malloc(data_len + sizeof(struct l2_ethhdr));
|
||||
struct l2_ethhdr *eth = buffer;
|
||||
|
||||
if (!buffer){
|
||||
wpa_printf( MSG_DEBUG, "send_eapol, buffer=%p", buffer);
|
||||
if (!buffer) {
|
||||
wpa_printf(MSG_DEBUG, "send_eapol, buffer=%p", buffer);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ struct wps_rx_param {
|
|||
int len;
|
||||
STAILQ_ENTRY(wps_rx_param) bqentry;
|
||||
};
|
||||
static STAILQ_HEAD(,wps_rx_param) s_wps_rxq;
|
||||
static STAILQ_HEAD(, wps_rx_param) s_wps_rxq;
|
||||
|
||||
static void *s_wps_task_hdl = NULL;
|
||||
static void *s_wps_queue = NULL;
|
||||
|
|
@ -85,7 +85,7 @@ static void wps_rxq_init(void)
|
|||
static void wps_rxq_enqueue(struct wps_rx_param *param)
|
||||
{
|
||||
DATA_MUTEX_TAKE();
|
||||
STAILQ_INSERT_TAIL(&s_wps_rxq,param, bqentry);
|
||||
STAILQ_INSERT_TAIL(&s_wps_rxq, param, bqentry);
|
||||
DATA_MUTEX_GIVE();
|
||||
}
|
||||
|
||||
|
|
@ -95,7 +95,7 @@ static struct wps_rx_param * wps_rxq_dequeue(void)
|
|||
DATA_MUTEX_TAKE();
|
||||
if ((param = STAILQ_FIRST(&s_wps_rxq)) != NULL) {
|
||||
STAILQ_REMOVE_HEAD(&s_wps_rxq, bqentry);
|
||||
STAILQ_NEXT(param,bqentry) = NULL;
|
||||
STAILQ_NEXT(param, bqentry) = NULL;
|
||||
}
|
||||
DATA_MUTEX_GIVE();
|
||||
return param;
|
||||
|
|
@ -107,7 +107,7 @@ static void wps_rxq_deinit(void)
|
|||
DATA_MUTEX_TAKE();
|
||||
while ((param = STAILQ_FIRST(&s_wps_rxq)) != NULL) {
|
||||
STAILQ_REMOVE_HEAD(&s_wps_rxq, bqentry);
|
||||
STAILQ_NEXT(param,bqentry) = NULL;
|
||||
STAILQ_NEXT(param, bqentry) = NULL;
|
||||
os_free(param->buf);
|
||||
os_free(param);
|
||||
}
|
||||
|
|
@ -115,7 +115,7 @@ static void wps_rxq_deinit(void)
|
|||
}
|
||||
|
||||
#ifdef USE_WPS_TASK
|
||||
void wps_task(void *pvParameters )
|
||||
void wps_task(void *pvParameters)
|
||||
{
|
||||
ETSEvent *e;
|
||||
wps_ioctl_param_t *param;
|
||||
|
|
@ -125,9 +125,9 @@ void wps_task(void *pvParameters )
|
|||
|
||||
wpa_printf(MSG_DEBUG, "wps_Task enter");
|
||||
for (;;) {
|
||||
if ( TRUE == os_queue_recv(s_wps_queue, &e, OS_BLOCK) ) {
|
||||
if (TRUE == os_queue_recv(s_wps_queue, &e, OS_BLOCK)) {
|
||||
|
||||
if ( (e->sig >= SIG_WPS_ENABLE) && (e->sig < SIG_WPS_NUM) ) {
|
||||
if ((e->sig >= SIG_WPS_ENABLE) && (e->sig < SIG_WPS_NUM)) {
|
||||
DATA_MUTEX_TAKE();
|
||||
if (s_wps_sig_cnt[e->sig]) {
|
||||
s_wps_sig_cnt[e->sig]--;
|
||||
|
|
@ -276,7 +276,6 @@ static inline int wps_sm_ether_send(struct wps_sm *sm, u16 proto,
|
|||
return wpa_ether_send(sm, bssid, proto, data, data_len);
|
||||
}
|
||||
|
||||
|
||||
u8 *wps_sm_alloc_eapol(struct wps_sm *sm, u8 type,
|
||||
const void *data, u16 data_len,
|
||||
size_t *msg_len, void **data_pos)
|
||||
|
|
@ -284,7 +283,6 @@ u8 *wps_sm_alloc_eapol(struct wps_sm *sm, u8 type,
|
|||
return wpa_alloc_eapol(sm, type, data, data_len, msg_len, data_pos);
|
||||
}
|
||||
|
||||
|
||||
void wps_sm_free_eapol(u8 *buffer)
|
||||
{
|
||||
return wpa_free_eapol(buffer);
|
||||
|
|
@ -463,7 +461,6 @@ int wps_send_eap_identity_rsp(u8 id)
|
|||
goto _err;
|
||||
}
|
||||
|
||||
|
||||
wpabuf_put_data(eap_buf, sm->identity, sm->identity_len);
|
||||
|
||||
buf = wps_sm_alloc_eapol(sm, IEEE802_1X_TYPE_EAP_PACKET, wpabuf_head_u8(eap_buf), wpabuf_len(eap_buf), (size_t *)&len, NULL);
|
||||
|
|
@ -595,7 +592,7 @@ int wps_process_wps_mX_req(u8 *ubuf, int len, enum wps_process_res *res)
|
|||
}
|
||||
wpa_printf(MSG_DEBUG, "EAP-WSC: Received start");
|
||||
sm->state = WPA_MESG;
|
||||
} else if (expd->opcode == WSC_Start){
|
||||
} else if (expd->opcode == WSC_Start) {
|
||||
wpa_printf(MSG_DEBUG, "EAP-WSC: Unexpected Op-Code %d",
|
||||
expd->opcode);
|
||||
return ESP_FAIL;
|
||||
|
|
@ -710,8 +707,6 @@ _err:
|
|||
return ret;
|
||||
}
|
||||
|
||||
|
||||
|
||||
int wps_tx_start(void)
|
||||
{
|
||||
struct wps_sm *sm = gWpsSm;
|
||||
|
|
@ -1021,7 +1016,7 @@ int wps_sm_rx_eapol_internal(u8 *src_addr, u8 *buf, u32 len)
|
|||
wpa_printf(MSG_DEBUG, "error: receive eapol response frame!");
|
||||
ret = 0;
|
||||
break;
|
||||
case EAP_CODE_REQUEST: {
|
||||
case EAP_CODE_REQUEST:
|
||||
eap_type = ((u8 *)ehdr)[sizeof(*ehdr)];
|
||||
switch (eap_type) {
|
||||
case EAP_TYPE_IDENTITY:
|
||||
|
|
@ -1058,7 +1053,6 @@ int wps_sm_rx_eapol_internal(u8 *src_addr, u8 *buf, u32 len)
|
|||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
|
@ -1658,7 +1652,7 @@ int wifi_station_wps_start(void)
|
|||
eloop_register_timeout(120, 0, wifi_station_wps_timeout, NULL, NULL);
|
||||
|
||||
switch (wps_get_status()) {
|
||||
case WPS_STATUS_DISABLE: {
|
||||
case WPS_STATUS_DISABLE:
|
||||
sm->is_wps_scan = true;
|
||||
|
||||
wps_build_public_key(sm->wps, NULL);
|
||||
|
|
@ -1672,7 +1666,6 @@ int wifi_station_wps_start(void)
|
|||
sm->wps->dh_privkey = NULL;
|
||||
wifi_wps_scan(NULL, NULL);
|
||||
break;
|
||||
}
|
||||
case WPS_STATUS_SCANNING:
|
||||
sm->scan_cnt = 0;
|
||||
eloop_cancel_timeout(wifi_station_wps_timeout, NULL, NULL);
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ typedef struct {
|
|||
} wps_ioctl_param_t;
|
||||
|
||||
#ifdef ESP_SUPPLICANT
|
||||
enum wps_sm_state{
|
||||
enum wps_sm_state {
|
||||
WAIT_START,
|
||||
WPA_MESG,
|
||||
WPA_FAIL
|
||||
|
|
@ -53,7 +53,7 @@ enum wps_sm_state{
|
|||
#define WPS_MAX_DIS_AP_NUM 10
|
||||
|
||||
/* Bssid of the discard AP which is discarded for not select reg or other reason */
|
||||
struct discard_ap_list_t{
|
||||
struct discard_ap_list_t {
|
||||
u8 bssid[6];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -65,7 +65,6 @@ components_not_formatted_temporary:
|
|||
- "/components/esp_phy/"
|
||||
- "/components/esp_pm/"
|
||||
- "/components/esp_rom/"
|
||||
- "/components/esp_wifi/"
|
||||
- "/components/esp-tls/"
|
||||
- "/components/esptool_py/"
|
||||
- "/components/fatfs/"
|
||||
|
|
@ -95,7 +94,6 @@ components_not_formatted_temporary:
|
|||
- "/components/vfs/"
|
||||
- "/components/wear_levelling/"
|
||||
- "/components/wifi_provisioning/"
|
||||
- "/components/wpa_supplicant/"
|
||||
- "/components/xtensa/"
|
||||
- "/examples/bluetooth/"
|
||||
- "/examples/build_system/"
|
||||
|
|
@ -133,6 +131,8 @@ components_not_formatted_permanent:
|
|||
- "/components/xtensa/include/xtensa/"
|
||||
# FAT FS (upstream source code)
|
||||
- "/components/fatfs/src/"
|
||||
# wpa_supplicant upstream code
|
||||
- "/components/wpa_supplicant/src/"
|
||||
# Nginx HTTP parser (upstream source code)
|
||||
- "/components/http_parser/"
|
||||
# Argtable (upstream source code)
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue