Skip to content

Commit 5c72228

Browse files
esp-zhpespressif-bot
authored andcommitted
fix(bt/ble): Update esp32 libbtdm_app.a (17db8bd)
- Added a verification step for the Access Address within the CONNECT_IND PDU
1 parent f4f1d20 commit 5c72228

File tree

3 files changed

+19
-2
lines changed

3 files changed

+19
-2
lines changed

components/bt/controller/esp32/Kconfig.in

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,15 @@ config BTDM_CTRL_SCAN_BACKOFF_UPPERLIMITMAX
444444
minimize collision of scan request PDUs from nultiple scanners. If scan backoff is disabled, in active
445445
scanning, scan request PDU will be sent every time when HW receives scannable ADV PDU.
446446

447+
config BTDM_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS
448+
bool "Enable enhanced Access Address check in CONNECT_IND"
449+
default n
450+
help
451+
Enabling this option will add stricter verification of the Access Address in the CONNECT_IND PDU.
452+
This improves security by ensuring that only connection requests with valid Access Addresses are accepted.
453+
If disabled, only basic checks are applied, improving compatibility.
454+
455+
447456
config BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP
448457
bool "BLE adv report flow control supported"
449458
depends on (BTDM_CTRL_MODE_BTDM || BTDM_CTRL_MODE_BLE_ONLY)

components/bt/controller/lib_esp32

components/bt/include/esp32/include/esp_bt.h

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ extern "C" {
5555
*
5656
* @note Please do not modify this value
5757
*/
58-
#define ESP_BT_CONTROLLER_CONFIG_MAGIC_VAL 0x20240926
58+
#define ESP_BT_CONTROLLER_CONFIG_MAGIC_VAL 0x20241015
5959

6060
/**
6161
* @brief Bluetooth Controller mode
@@ -193,6 +193,12 @@ the advertising packet will be discarded until the memory is restored. */
193193

194194
#define BTDM_BLE_LLCP_DISC_FLAG (BTDM_BLE_LLCP_CONN_UPDATE | BTDM_BLE_LLCP_CHAN_MAP_UPDATE)
195195

196+
#ifdef CONFIG_BTDM_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS
197+
#define BTDM_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS_ENABLED CONFIG_BTDM_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS
198+
#else
199+
#define BTDM_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS_ENABLED 0
200+
#endif
201+
196202
/**
197203
* @brief Default Bluetooth Controller configuration
198204
*/
@@ -222,6 +228,7 @@ the advertising packet will be discarded until the memory is restored. */
222228
.dup_list_refresh_period = SCAN_DUPL_CACHE_REFRESH_PERIOD, \
223229
.ble_scan_backoff = BTDM_CTRL_SCAN_BACKOFF_UPPERLIMITMAX, \
224230
.ble_llcp_disc_flag = BTDM_BLE_LLCP_DISC_FLAG, \
231+
.ble_aa_check = BTDM_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS_ENABLED, \
225232
.magic = ESP_BT_CONTROLLER_CONFIG_MAGIC_VAL, \
226233
}
227234

@@ -275,6 +282,7 @@ typedef struct {
275282
uint16_t dup_list_refresh_period; /*!< Scan duplicate filtering list refresh period in seconds. Configurable in menuconfig */
276283
bool ble_scan_backoff; /*!< True if BLE scan backoff is enabled; false otherwise. Configurable in menuconfig */
277284
uint8_t ble_llcp_disc_flag; /*!< BLE disconnect flag when instant passed. Configurable in menuconfig */
285+
bool ble_aa_check; /*!< True if adds a verification step for the Access Address within the CONNECT_IND PDU; false otherwise. Configurable in menuconfig */
278286
uint32_t magic; /*!< Magic number */
279287
} esp_bt_controller_config_t;
280288

0 commit comments

Comments
 (0)