Skip to content

Commit bfc86f6

Browse files
committed
fix(esp_wifi): Removal of task posting code and use pptask instead
1 parent a96d680 commit bfc86f6

File tree

7 files changed

+369
-414
lines changed

7 files changed

+369
-414
lines changed

components/esp_common/src/esp_err_to_name.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -474,6 +474,9 @@ static const esp_err_msg_t esp_err_msg_table[] = {
474474
ERR_TBL_IT(ESP_ERR_DPP_INVALID_LIST), /* 12443 0x309b Channel list given in
475475
esp_supp_dpp_bootstrap_gen() is not
476476
valid or too big */
477+
# endif
478+
# ifdef ESP_ERR_DPP_CONF_TIMEOUT
479+
ERR_TBL_IT(ESP_ERR_DPP_CONF_TIMEOUT), /* 12444 0x309c DPP Configuration was not received in time */
477480
# endif
478481
// components/esp_common/include/esp_err.h
479482
# ifdef ESP_ERR_MESH_BASE

components/wpa_supplicant/esp_supplicant/include/esp_dpp.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@
1616
extern "C" {
1717
#endif
1818

19-
#define ESP_DPP_AUTH_TIMEOUT_SECS 2
2019
#define ESP_DPP_MAX_CHAN_COUNT 5
2120

2221
#define ESP_ERR_DPP_FAILURE (ESP_ERR_WIFI_BASE + 151) /*!< Generic failure during DPP Operation */
2322
#define ESP_ERR_DPP_TX_FAILURE (ESP_ERR_WIFI_BASE + 152) /*!< DPP Frame Tx failed OR not Acked */
2423
#define ESP_ERR_DPP_INVALID_ATTR (ESP_ERR_WIFI_BASE + 153) /*!< Encountered invalid DPP Attribute */
2524
#define ESP_ERR_DPP_AUTH_TIMEOUT (ESP_ERR_WIFI_BASE + 154) /*!< DPP Auth response was not received in time */
2625
#define ESP_ERR_DPP_INVALID_LIST (ESP_ERR_WIFI_BASE + 155) /*!< Channel list given in esp_supp_dpp_bootstrap_gen() is not valid or too big */
27-
#define ESP_ERR_DPP_CONF_TIMEOUT (ESP_ERR_WIFI_BASE + 155) /*!< DPP Configuration was not recieved in time */
26+
#define ESP_ERR_DPP_CONF_TIMEOUT (ESP_ERR_WIFI_BASE + 156) /*!< DPP Configuration was not received in time */
2827

2928
/** @brief Types of Bootstrap Methods for DPP. */
3029
typedef enum dpp_bootstrap_type {

components/wpa_supplicant/esp_supplicant/src/crypto/crypto_mbedtls-ec.c

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -844,21 +844,23 @@ int crypto_ec_key_verify_signature_r_s(struct crypto_ec_key *csign,
844844

845845
void crypto_ec_key_debug_print(struct crypto_ec_key *key, const char *title)
846846
{
847-
#ifdef DEBUG_PRINT
847+
#if defined(CONFIG_LOG_DEFAULT_LEVEL_DEBUG) || defined(CONFIG_LOG_DEFAULT_LEVEL_VERBOSE)
848+
#if defined(DEBUG_PRINT)
848849
mbedtls_pk_context *pkey = (mbedtls_pk_context *)key;
849850
mbedtls_ecp_keypair *ecp = mbedtls_pk_ec(*pkey);
850851
u8 x[32], y[32], d[32];
851-
wpa_printf(MSG_DEBUG, "curve: %s",
852+
wpa_printf(MSG_EXCESSIVE, "curve: %s",
852853
mbedtls_ecp_curve_info_from_grp_id(ecp->MBEDTLS_PRIVATE(grp).id)->name);
853854
int len = mbedtls_mpi_size((mbedtls_mpi *)crypto_ec_get_prime((struct crypto_ec *)crypto_ec_get_group_from_key(key)));
854855

855-
wpa_printf(MSG_DEBUG, "prime len is %d", len);
856+
wpa_printf(MSG_EXCESSIVE, "prime len is %d", len);
856857
crypto_ec_point_to_bin((struct crypto_ec *)crypto_ec_get_group_from_key(key), crypto_ec_key_get_public_key(key), x, y);
857858
crypto_bignum_to_bin(crypto_ec_key_get_private_key(key),
858859
d, len, len);
859-
wpa_hexdump(MSG_DEBUG, "Q_x:", x, 32);
860-
wpa_hexdump(MSG_DEBUG, "Q_y:", y, 32);
861-
wpa_hexdump(MSG_DEBUG, "d: ", d, 32);
860+
wpa_hexdump(MSG_EXCESSIVE, "Q_x:", x, 32);
861+
wpa_hexdump(MSG_EXCESSIVE, "Q_y:", y, 32);
862+
wpa_hexdump(MSG_EXCESSIVE, "d: ", d, 32);
863+
#endif
862864
#endif
863865
}
864866

0 commit comments

Comments
 (0)