Merge branch 'bugfix/fix_ble_pair_fail_v5.4' into 'release/v5.4'

fix(bt/bluedroid): fix BLE SMP pairing failure on BLE-only devices when using defalut param (5.4)

See merge request espressif/esp-idf!47399
This commit is contained in:
Jiang Jiang Jian
2026-04-22 15:41:09 +08:00
3 changed files with 17 additions and 11 deletions
@@ -1586,8 +1586,13 @@ typedef UINT8 tBTM_IO_CAP;
#define BTM_BLE_CSR_KEY_MASK (1 << 2)
#define BTM_BLE_LINK_KEY_MASK (1 << 3)
#define BTM_BLE_INITIATOR_KEY_SIZE 15
#define BTM_BLE_RESPONDER_KEY_SIZE 15
#if (CLASSIC_BT_INCLUDED == TRUE)
#define BTM_BLE_INITIATOR_KEY_MASK (BTM_BLE_ENC_KEY_MASK | BTM_BLE_ID_KEY_MASK | BTM_BLE_CSR_KEY_MASK | BTM_BLE_LINK_KEY_MASK)
#define BTM_BLE_RESPONDER_KEY_MASK (BTM_BLE_ENC_KEY_MASK | BTM_BLE_ID_KEY_MASK | BTM_BLE_CSR_KEY_MASK | BTM_BLE_LINK_KEY_MASK)
#else
#define BTM_BLE_INITIATOR_KEY_MASK (BTM_BLE_ENC_KEY_MASK | BTM_BLE_ID_KEY_MASK | BTM_BLE_CSR_KEY_MASK)
#define BTM_BLE_RESPONDER_KEY_MASK (BTM_BLE_ENC_KEY_MASK | BTM_BLE_ID_KEY_MASK | BTM_BLE_CSR_KEY_MASK)
#endif
#define BTM_BLE_MAX_KEY_SIZE 16
#define BTM_BLE_MIN_KEY_SIZE 7