espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-06-06 05:14:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(nimble) Clear our and peer security records during unpair

Browse Source
This commit is contained in:
Rahul Tank
2025-01-06 12:02:13 +05:30
parent 3b34b570d1
commit fbdb118f90
1 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/host/src/ble_gap.c
+21 -24
View File
@@ -7311,9 +7311,7 @@ int
ble_gap_unpair(const ble_addr_t *peer_addr)
{
#if NIMBLE_BLE_SM
int rc;
int ltk_rc = 0;
int irk_rc = 0;
int rc, err = 0;
struct ble_hs_conn *conn;
union ble_store_value value;
union ble_store_key key;
@@ -7356,31 +7354,26 @@ ble_gap_unpair(const ble_addr_t *peer_addr)
// Checking if the device is in ble_store
if (!rc) {
if (value.sec.irk_present) {
// Delete the IRK as it is Distributed
irk_rc = ble_hs_pvcy_remove_entry(key.sec.peer_addr.type,
key.sec.peer_addr.val);
if (irk_rc != 0) {
BLE_HS_LOG(ERROR, "Error while removing IRK , rc = %x\n",irk_rc);
// Delete the IRK as it is Distributed
rc = ble_hs_pvcy_remove_entry(key.sec.peer_addr.type,key.sec.peer_addr.val);
if (rc != 0) {
BLE_HS_LOG(ERROR, "Error while removing IRK , rc = %x\n",rc);
}
}
if (value.sec.ltk_present || value.sec.irk_present || value.sec.csrk_present) {
// Delete the Peer record from store as LTK is present
ltk_rc = ble_store_util_delete_peer(&key.sec.peer_addr);
if (ltk_rc != 0) {
BLE_HS_LOG(ERROR, "Error while removing LTK , rc = %x\n",ltk_rc);
}
// Delete the Peer record from store as LTK is present
rc = ble_store_util_delete_peer(&key.sec.peer_addr);
if (rc != 0) {
BLE_HS_LOG(ERROR, "Error while removing LTK , rc = %x\n",rc);
}
} else {
rc = ble_store_read(BLE_STORE_OBJ_TYPE_OUR_SEC, &key, &value);
if (!rc) {
ble_store_util_delete_peer(&key.sec.peer_addr);
} else {
BLE_HS_LOG(ERROR,"No record found for the given address in ble store , rc = %x\n",rc);
err = rc ;
}
}
else {
rc = ble_store_read(BLE_STORE_OBJ_TYPE_OUR_SEC, &key, &value);
if (!rc) {
ble_store_util_delete_peer(&key.sec.peer_addr);
}
else {
BLE_HS_LOG(ERROR,"No record found for the given address in ble store , rc = %x\n",rc);
return rc;
}
}
#if MYNEWT_VAL(BLE_SMP_ID_RESET)
@@ -7391,6 +7384,10 @@ ble_gap_unpair(const ble_addr_t *peer_addr)
ble_gap_reset_irk();
#endif
if (err) {
return err;
}
return 0;
#else
return BLE_HS_ENOTSUP;