espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-11-11 23:10:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

MYNEWT-383 BLE Host - Allow programmatic unbonding

Browse Source 
X-Original-Commit: 71503c55a9f0e41ec8ba18c35be71c7a73aaded3
This commit is contained in:
Christopher Collins
2016-12-08 16:21:13 -06:00
parent fc88453f25
commit cba839a9e1
5 changed files with 129 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/host/include/host/ble_sm.h
+1
View File
@@ -97,6 +97,7 @@ struct ble_sm_io {
#if NIMBLE_BLE_SM
int ble_sm_inject_io(uint16_t conn_handle, struct ble_sm_io *pkey);
int ble_sm_unbond(uint8_t peer_id_addr_type, const uint8_t *peer_id_addr);
#else
#define ble_sm_inject_io(conn_handle, pkey) \
((void)(conn_handle), BLE_HS_ENOTSUP)
nimble/host/src/ble_sm.c
+36
View File
@@ -2155,6 +2155,42 @@ ble_sm_enc_initiate(uint16_t conn_handle, const uint8_t *ltk, uint16_t ediv,
return res.app_status;
}
/**
* Deletes the bonding association with the specified peer. That is, this
* function erases the security material that was persisted when we paired with
* the specified peer.
*
* @param peer_id_addr_type The identity address type of the peer.
* @param peer_id_addr The peer's identity address.
*
* @return 0 on success;
* BLE_HS_ENOENT if there is no bond to the
* specified peer.
*/
int
ble_sm_unbond(uint8_t peer_id_addr_type, const uint8_t *peer_id_addr)
{
struct ble_store_key_sec key_sec = { 0 };
int peer_rc;
int our_rc;
int rc;
key_sec.peer_addr_type = peer_id_addr_type;
memcpy(key_sec.peer_addr, peer_id_addr, sizeof key_sec.peer_addr);
our_rc = ble_store_delete_our_sec(&key_sec);
peer_rc = ble_store_delete_peer_sec(&key_sec);
if (our_rc == BLE_HS_ENOENT && peer_rc == BLE_HS_ENOENT) {
rc = BLE_HS_ENOENT;
} else if (our_rc == 0) {
rc = peer_rc;
} else {
rc = our_rc;
}
return rc;
}
static int
ble_sm_rx(uint16_t conn_handle, struct os_mbuf **om)
{
nimble/host/test/src/ble_hs_test_util.c
+46
View File
@@ -2070,6 +2070,52 @@ ble_hs_test_util_num_cccds(void)
}
}
int
ble_hs_test_util_num_our_secs(void)
{
struct ble_store_value_sec val;
struct ble_store_key_sec key = { 0 };
int rc;
key.peer_addr_type = BLE_STORE_ADDR_TYPE_NONE;
for (key.idx = 0; ; key.idx++) {
rc = ble_store_read_our_sec(&key, &val);
switch (rc) {
case 0:
break;
case BLE_HS_ENOENT:
return key.idx;
default:
TEST_ASSERT_FATAL(0);
}
}
}
int
ble_hs_test_util_num_peer_secs(void)
{
struct ble_store_value_sec val;
struct ble_store_key_sec key = { 0 };
int rc;
key.peer_addr_type = BLE_STORE_ADDR_TYPE_NONE;
for (key.idx = 0; ; key.idx++) {
rc = ble_store_read_peer_sec(&key, &val);
switch (rc) {
case 0:
break;
case BLE_HS_ENOENT:
return key.idx;
default:
TEST_ASSERT_FATAL(0);
}
}
}
static int
ble_hs_test_util_store_read(int obj_type, union ble_store_key *key,
union ble_store_value *value)
nimble/host/test/src/ble_hs_test_util.h
+2
View File
@@ -273,6 +273,8 @@ void ble_hs_test_util_assert_mbufs_freed(
const struct ble_hs_test_util_mbuf_params *params);
void ble_hs_test_util_post_test(void *arg);
int ble_hs_test_util_num_cccds(void);
int ble_hs_test_util_num_our_secs(void);
int ble_hs_test_util_num_peer_secs(void);
void ble_hs_test_util_init_no_start(void);
void ble_hs_test_util_init(void);
nimble/host/test/src/ble_sm_test_util.c
+44
View File
@@ -1797,6 +1797,9 @@ ble_sm_test_util_us_lgcy_good_once(struct ble_sm_test_params *params)
void
ble_sm_test_util_us_lgcy_good(struct ble_sm_test_params *params)
{
uint8_t id_addr_type;
int rc;
/*** We are master. */
/* We initiate pairing. */
@@ -1809,6 +1812,14 @@ ble_sm_test_util_us_lgcy_good(struct ble_sm_test_params *params)
/* Verify link can be restored via the encryption procedure. */
ble_sm_test_util_bonding_all(params, 1);
/* Verify programmatic unbonding. */
id_addr_type = ble_hs_misc_addr_type_to_id(params->resp_addr_type);
rc = ble_sm_unbond(id_addr_type, params->resp_id_addr);
TEST_ASSERT(rc == 0);
TEST_ASSERT(ble_hs_test_util_num_our_secs() == 0);
TEST_ASSERT(ble_hs_test_util_num_peer_secs() == 0);
}
static void
@@ -1924,6 +1935,9 @@ ble_sm_test_util_peer_lgcy_good_once(struct ble_sm_test_params *params)
void
ble_sm_test_util_peer_lgcy_good(struct ble_sm_test_params *params)
{
uint8_t id_addr_type;
int rc;
/*** Peer is master. */
/* Peer performs IO first; peer initiates pairing. */
@@ -1948,6 +1962,14 @@ ble_sm_test_util_peer_lgcy_good(struct ble_sm_test_params *params)
/* Verify link can be restored via the encryption procedure. */
ble_sm_test_util_bonding_all(params, 0);
/* Verify programmatic unbonding. */
id_addr_type = ble_hs_misc_addr_type_to_id(params->init_addr_type);
rc = ble_sm_unbond(id_addr_type, params->init_id_addr);
TEST_ASSERT(rc == 0);
TEST_ASSERT(ble_hs_test_util_num_our_secs() == 0);
TEST_ASSERT(ble_hs_test_util_num_peer_secs() == 0);
}
static void
@@ -2110,6 +2132,9 @@ ble_sm_test_util_us_sc_good_once(struct ble_sm_test_params *params)
void
ble_sm_test_util_us_sc_good(struct ble_sm_test_params *params)
{
uint8_t id_addr_type;
int rc;
/*** We are master. */
/* We initiate pairing. */
@@ -2124,6 +2149,14 @@ ble_sm_test_util_us_sc_good(struct ble_sm_test_params *params)
/* Verify link can be restored via the encryption procedure. */
ble_sm_test_util_bonding_all(params, 1);
/* Verify programmatic unbonding. */
id_addr_type = ble_hs_misc_addr_type_to_id(params->resp_addr_type);
rc = ble_sm_unbond(id_addr_type, params->resp_id_addr);
TEST_ASSERT(rc == 0);
TEST_ASSERT(ble_hs_test_util_num_our_secs() == 0);
TEST_ASSERT(ble_hs_test_util_num_peer_secs() == 0);
}
static void
@@ -2298,6 +2331,9 @@ ble_sm_test_util_peer_sc_good_once(struct ble_sm_test_params *params)
void
ble_sm_test_util_peer_sc_good(struct ble_sm_test_params *params)
{
uint8_t id_addr_type;
int rc;
/*** Peer is master. */
/* Peer performs IO first; peer initiates pairing. */
@@ -2322,6 +2358,14 @@ ble_sm_test_util_peer_sc_good(struct ble_sm_test_params *params)
/* Verify link can be restored via the encryption procedure. */
ble_sm_test_util_bonding_all(params, 0);
/* Verify programmatic unbonding. */
id_addr_type = ble_hs_misc_addr_type_to_id(params->init_addr_type);
rc = ble_sm_unbond(id_addr_type, params->init_id_addr);
TEST_ASSERT(rc == 0);
TEST_ASSERT(ble_hs_test_util_num_our_secs() == 0);
TEST_ASSERT(ble_hs_test_util_num_peer_secs() == 0);
}
void