feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'feat/add_sdkconfig_for_secure_connection' into 'master'

Browse Source 
feat(bt): add sdkconfig for secure connection host support feature

See merge request espressif/esp-idf!38895
This commit is contained in:
Wang Meng Yang
2025-05-08 14:33:10 +08:00
parent b4303c3513 fc6f5cf71d
commit ee9c524bb6
8 changed files with 47 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/bt/controller/lib_esp32

Submodule components/bt/controller/lib_esp32 updated: 492b6043bb...6d007b7167

21
components/bt/host/bluedroid/api/esp_bt_main.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -128,6 +128,21 @@ esp_err_t esp_bluedroid_init_with_cfg(esp_bluedroid_config_t *cfg)
return ESP_ERR_INVALID_ARG; return ESP_ERR_INVALID_ARG;
} }
if (cfg->sc_en) {
#if (SC_MODE_INCLUDED == FALSE)
LOG_ERROR("Secure Connections should not be enabled when target controller is ESP32.\n");
LOG_ERROR("It may trigger unresolved bugs in the controller.\n");
return ESP_ERR_INVALID_ARG;
#endif // SC_MODE_INCLUDED
if (!cfg->ssp_en) {
LOG_ERROR("secure simple pairing should be enabled when secure connection host support is enabled\n");
return ESP_ERR_INVALID_ARG;
}
LOG_WARN("Please make sure to clear the bond list before enabling the secure connection host support\n");
}
#if (BT_CONTROLLER_INCLUDED == TRUE) #if (BT_CONTROLLER_INCLUDED == TRUE)
if (esp_bt_controller_get_status() != ESP_BT_CONTROLLER_STATUS_ENABLED) { if (esp_bt_controller_get_status() != ESP_BT_CONTROLLER_STATUS_ENABLED) {
LOG_ERROR("Controller not initialised\n"); LOG_ERROR("Controller not initialised\n");
@@ -144,7 +159,7 @@ esp_err_t esp_bluedroid_init_with_cfg(esp_bluedroid_config_t *cfg)
osi_mem_dbg_init(); osi_mem_dbg_init();
#endif #endif
ret = bluedriod_config_init(cfg); ret = bluedroid_config_init(cfg);
if (ret != BT_STATUS_SUCCESS) { if (ret != BT_STATUS_SUCCESS) {
LOG_ERROR("Bluedroid stack initialize fail, ret:%d", ret); LOG_ERROR("Bluedroid stack initialize fail, ret:%d", ret);
return ESP_FAIL; return ESP_FAIL;
@@ -228,7 +243,7 @@ esp_err_t esp_bluedroid_deinit(void)
btc_deinit(); btc_deinit();
bluedriod_config_deinit(); bluedroid_config_deinit();
#if (BT_HCI_LOG_INCLUDED == TRUE) #if (BT_HCI_LOG_INCLUDED == TRUE)
bt_hci_log_deinit(); bt_hci_log_deinit();

6
components/bt/host/bluedroid/api/esp_gap_bt_api.c
View File

@@ -322,7 +322,7 @@ esp_err_t esp_bt_gap_set_security_param(esp_bt_sp_param_t param_type,
return ESP_ERR_INVALID_STATE; return ESP_ERR_INVALID_STATE;
} }
if (!(bluedriod_config_get()->get_ssp_enabled())) { if (!(bluedroid_config_get()->get_ssp_enabled())) {
ESP_LOGE(TAG, "%s is not supported when `ssp_en` in `esp_bluedroid_config_t` is disabled!", __func__); ESP_LOGE(TAG, "%s is not supported when `ssp_en` in `esp_bluedroid_config_t` is disabled!", __func__);
return ESP_ERR_NOT_SUPPORTED; return ESP_ERR_NOT_SUPPORTED;
} }
@@ -347,7 +347,7 @@ esp_err_t esp_bt_gap_ssp_passkey_reply(esp_bd_addr_t bd_addr, bool accept, uint3
return ESP_ERR_INVALID_STATE; return ESP_ERR_INVALID_STATE;
} }
if (!(bluedriod_config_get()->get_ssp_enabled())) { if (!(bluedroid_config_get()->get_ssp_enabled())) {
ESP_LOGE(TAG, "%s is not supported when `ssp_en` in `esp_bluedroid_config_t` is disabled!", __func__); ESP_LOGE(TAG, "%s is not supported when `ssp_en` in `esp_bluedroid_config_t` is disabled!", __func__);
return ESP_ERR_NOT_SUPPORTED; return ESP_ERR_NOT_SUPPORTED;
} }
@@ -371,7 +371,7 @@ esp_err_t esp_bt_gap_ssp_confirm_reply(esp_bd_addr_t bd_addr, bool accept)
return ESP_ERR_INVALID_STATE; return ESP_ERR_INVALID_STATE;
} }
if (!(bluedriod_config_get()->get_ssp_enabled())) { if (!(bluedroid_config_get()->get_ssp_enabled())) {
ESP_LOGE(TAG, "%s is not supported when `ssp_en` in `esp_bluedroid_config_t` is disabled!", __func__); ESP_LOGE(TAG, "%s is not supported when `ssp_en` in `esp_bluedroid_config_t` is disabled!", __func__);
return ESP_ERR_NOT_SUPPORTED; return ESP_ERR_NOT_SUPPORTED;
} }

2
components/bt/host/bluedroid/api/include/api/esp_bt_main.h
View File

@@ -30,11 +30,13 @@ typedef enum {
*/ */
typedef struct { typedef struct {
bool ssp_en; /*!< Whether SSP(secure simple pairing) or legacy pairing is used for Classic Bluetooth */ bool ssp_en; /*!< Whether SSP(secure simple pairing) or legacy pairing is used for Classic Bluetooth */
bool sc_en; /*!< Whether secure connection host support is enabled or disabled for Classic Bluetooth */
} esp_bluedroid_config_t; } esp_bluedroid_config_t;
#define BT_BLUEDROID_INIT_CONFIG_DEFAULT() \ #define BT_BLUEDROID_INIT_CONFIG_DEFAULT() \
{ \ { \
.ssp_en = true, \ .ssp_en = true, \
.sc_en = false, \
} }
/** /**

8
components/bt/host/bluedroid/common/include/common/bt_target.h
View File

@@ -1339,10 +1339,12 @@
**************************/ **************************/
/* 4.1/4.2 secure connections feature */ /* 4.1/4.2 secure connections feature */
#ifndef SC_MODE_INCLUDED #if defined(CONFIG_IDF_TARGET_ESP32) && (BT_CONTROLLER_INCLUDED == TRUE)
// Disable AES-CCM (BT 4.1) for BT Classic to workaround controller AES issue. E0 encryption (BT 4.0) will be used. // Disable AES-CCM (BT 4.1) for BT Classic to workaround controller AES issue on ESP32 controller. E0 encryption (BT 4.0) will be used.
#define SC_MODE_INCLUDED FALSE #define SC_MODE_INCLUDED FALSE
#endif #else
#define SC_MODE_INCLUDED TRUE
#endif // CONFIG_IDF_TARGET_ESP32
/* Used for conformance testing ONLY */ /* Used for conformance testing ONLY */
#ifndef BTM_BLE_CONFORMANCE_TESTING #ifndef BTM_BLE_CONFORMANCE_TESTING

7
components/bt/host/bluedroid/config/include/config/stack_config.h
View File

@@ -12,10 +12,11 @@
struct bluedroid_config { struct bluedroid_config {
bool (*get_ssp_enabled)(void); bool (*get_ssp_enabled)(void);
bool (*get_sc_enabled) (void);
}; };
bt_status_t bluedriod_config_init(esp_bluedroid_config_t *cfg); bt_status_t bluedroid_config_init(esp_bluedroid_config_t *cfg);
void bluedriod_config_deinit(void); void bluedroid_config_deinit(void);
const struct bluedroid_config *bluedriod_config_get(void); const struct bluedroid_config *bluedroid_config_get(void);

14
components/bt/host/bluedroid/config/stack_config.c
View File

@@ -25,7 +25,14 @@ static bool get_ssp_enabled(void)
return cfg->ssp_en; return cfg->ssp_en;
} }
bt_status_t bluedriod_config_init(esp_bluedroid_config_t *cfg) static bool get_sc_enabled(void)
{
assert(s_stack_config_env);
esp_bluedroid_config_t *cfg = &s_stack_config_env->cfg;
return cfg->sc_en;
}
bt_status_t bluedroid_config_init(esp_bluedroid_config_t *cfg)
{ {
s_stack_config_env = osi_calloc(sizeof(struct stack_config_env_tag)); s_stack_config_env = osi_calloc(sizeof(struct stack_config_env_tag));
if (!s_stack_config_env) { if (!s_stack_config_env) {
@@ -36,11 +43,12 @@ bt_status_t bluedriod_config_init(esp_bluedroid_config_t *cfg)
struct bluedroid_config *interface = &s_stack_config_env->interface; struct bluedroid_config *interface = &s_stack_config_env->interface;
interface->get_ssp_enabled = get_ssp_enabled; interface->get_ssp_enabled = get_ssp_enabled;
interface->get_sc_enabled = get_sc_enabled;
return BT_STATUS_SUCCESS; return BT_STATUS_SUCCESS;
} }
void bluedriod_config_deinit(void) void bluedroid_config_deinit(void)
{ {
if (s_stack_config_env) { if (s_stack_config_env) {
osi_free(s_stack_config_env); osi_free(s_stack_config_env);
@@ -48,7 +56,7 @@ void bluedriod_config_deinit(void)
} }
} }
const struct bluedroid_config *bluedriod_config_get(void) const struct bluedroid_config *bluedroid_config_get(void)
{ {
assert(s_stack_config_env); assert(s_stack_config_env);
return &s_stack_config_env->interface; return &s_stack_config_env->interface;

6
components/bt/host/bluedroid/device/controller.c
View File

@@ -188,7 +188,7 @@ static void start_up(void)
// dependent on what we configure from page 0 and host SSP configuration // dependent on what we configure from page 0 and host SSP configuration
controller_param.simple_pairing_supported = HCI_SIMPLE_PAIRING_SUPPORTED( controller_param.simple_pairing_supported = HCI_SIMPLE_PAIRING_SUPPORTED(
controller_param.features_classic[0].as_array) && controller_param.features_classic[0].as_array) &&
(bluedriod_config_get()->get_ssp_enabled()); (bluedroid_config_get()->get_ssp_enabled());
if (controller_param.simple_pairing_supported) { if (controller_param.simple_pairing_supported) {
response = AWAIT_COMMAND(controller_param.packet_factory->make_write_simple_pairing_mode(HCI_SP_MODE_ENABLED)); response = AWAIT_COMMAND(controller_param.packet_factory->make_write_simple_pairing_mode(HCI_SP_MODE_ENABLED));
controller_param.packet_parser->parse_generic_command_complete(response); controller_param.packet_parser->parse_generic_command_complete(response);
@@ -223,13 +223,13 @@ static void start_up(void)
} }
#endif #endif
#if (SC_MODE_INCLUDED == TRUE) if ((bluedroid_config_get()->get_sc_enabled())) {
controller_param.secure_connections_supported = HCI_SC_CTRLR_SUPPORTED(controller_param.features_classic[2].as_array); controller_param.secure_connections_supported = HCI_SC_CTRLR_SUPPORTED(controller_param.features_classic[2].as_array);
if (controller_param.secure_connections_supported) { if (controller_param.secure_connections_supported) {
response = AWAIT_COMMAND(controller_param.packet_factory->make_write_secure_connections_host_support(HCI_SC_MODE_ENABLED)); response = AWAIT_COMMAND(controller_param.packet_factory->make_write_secure_connections_host_support(HCI_SC_MODE_ENABLED));
controller_param.packet_parser->parse_generic_command_complete(response); controller_param.packet_parser->parse_generic_command_complete(response);
} }
#endif }
#if (BLE_INCLUDED == TRUE) #if (BLE_INCLUDED == TRUE)
#if (CLASSIC_BT_INCLUDED) #if (CLASSIC_BT_INCLUDED)