Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-03 03:31:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/support_bluedroid_dual_identify' into 'master'

Browse Source 
feat(ble/bluedroid): Support bluedroid dual indentify

See merge request espressif/esp-idf!49640
This commit is contained in:
Zhi Wei Jian
2026-07-13 10:03:39 +08:00
parent 25fe69f946 1de0d2fef7
commit 2e6cbccd55
36 changed files with 2389 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/bt/host/bluedroid/stack/smp/smp_act.c
+25
View File
@@ -20,6 +20,9 @@
#include "device/interop.h"
#include "common/bt_target.h"
#include "btm_int.h"
#if (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE && BLE_PERIPH_PSEUDO_ADDR_BOND == TRUE)
#include "btm_ble_pseudo.h"
#endif
#include "stack/l2c_api.h"
#include "smp_int.h"
#if (SMP_CRYPTO_MBEDTLS == TRUE)
@@ -1195,6 +1198,28 @@ void smp_proc_id_addr(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
}
#endif ///BLE_INCLUDED == TRUE
#if (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE && BLE_PERIPH_PSEUDO_ADDR_BOND == TRUE)
/* Dual-identity bond isolation: the link may have been keyed earlier from a
* transient RPA. Now that the peer's stable Identity Address is known,
* re-derive the pseudo from (local, Identity) and re-key the link so the
* stored bond is reproducible across the peer's future RPA rotations. Keep
* smp_cb.pairing_bda consistent so the in-flight pairing continues. */
{
tACL_CONN *p_acl = btm_bda_to_acl(p_cb->pairing_bda, BT_TRANSPORT_LE);
BLE_PSEUDO_DBG("smp PID: pairing_bda=" BLE_PSEUDO_BDA_FMT " acl=%p id_addr=" BLE_PSEUDO_BDA_FMT,
BLE_PSEUDO_BDA(p_cb->pairing_bda), p_acl, BLE_PSEUDO_BDA(pid_key.static_addr));
if (p_acl != NULL) {
BD_ADDR new_pseudo;
if (btm_ble_pseudo_apply_identity(p_acl->hci_handle, pid_key.static_addr,
pid_key.addr_type, new_pseudo)) {
memcpy(p_cb->pairing_bda, new_pseudo, BD_ADDR_LEN);
BLE_PSEUDO_DBG("smp PID: pairing_bda updated -> " BLE_PSEUDO_BDA_FMT,
BLE_PSEUDO_BDA(p_cb->pairing_bda));
}
}
}
#endif
smp_key_distribution_by_transport(p_cb, NULL);
}
components/bt/host/bluedroid/stack/smp/smp_utils.c
+11
View File
@@ -36,6 +36,9 @@
#include "smp_int.h"
#include "device/controller.h"
#include "btm_int.h"
#if (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE && BLE_PERIPH_PSEUDO_ADDR_BOND == TRUE)
#include "btm_ble_pseudo.h"
#endif
#include "common/bte_appl.h"
#define SMP_PAIRING_REQ_SIZE 7
@@ -1530,6 +1533,10 @@ void smp_collect_local_ble_address(UINT8 *le_addr, tSMP_CB *p_cb)
BTM_ReadConnectionAddr( p_cb->pairing_bda, bda, &addr_type);
BDADDR_TO_STREAM(p, bda);
UINT8_TO_STREAM(p, addr_type);
#if (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE && BLE_PERIPH_PSEUDO_ADDR_BOND == TRUE)
BLE_PSEUDO_DBG("smp local addr for f5/f6 = " BLE_PSEUDO_BDA_FMT " type %u (pairing_bda " BLE_PSEUDO_BDA_FMT ")",
BLE_PSEUDO_BDA(bda), addr_type, BLE_PSEUDO_BDA(p_cb->pairing_bda));
#endif
}
/*******************************************************************************
@@ -1557,6 +1564,10 @@ void smp_collect_peer_ble_address(UINT8 *le_addr, tSMP_CB *p_cb)
BDADDR_TO_STREAM(p, bda);
UINT8_TO_STREAM(p, addr_type);
#if (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE && BLE_PERIPH_PSEUDO_ADDR_BOND == TRUE)
BLE_PSEUDO_DBG("smp peer addr for f5/f6 = " BLE_PSEUDO_BDA_FMT " type %u (pairing_bda " BLE_PSEUDO_BDA_FMT ")",
BLE_PSEUDO_BDA(bda), addr_type, BLE_PSEUDO_BDA(p_cb->pairing_bda));
#endif
}
/*******************************************************************************