michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: Generate new public key for each provisioning session

Browse source 
Mesh Profile Spec v1.0.1 Section 5.4.2.3: "If the public key was not
available using an OOB technology, then the public keys are exchanged
between the Provisioner and the unprovisioned device. For each
exchange, a new key pair shall be generated by the Provisioner and the
unprovisioned device."

This allows passing MESH/NODE/PROV/BV-12-C.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2019-06-25 16:15:56 +03:00 • committed by Johan Hedberg
commit 10274718bb
1 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
subsys/bluetooth/host/mesh/prov.c
View file

@ -193,8 +193,15 @@ static struct prov_link link;
static const struct bt_mesh_prov *prov;
static void reset_state(void)
static void pub_key_ready(const u8_t *pkey);
static int reset_state(void)
{
static struct bt_pub_key_cb pub_key_cb = {
.func = pub_key_ready,
};
int err;
k_delayed_work_cancel(&link.prot_timer);
/* Disable Attention Timer if it was set */
@ -226,6 +233,14 @@ static void reset_state(void)
/* Clear everything except the protocol timer (k_delayed_work) */
(void)memset(&link, 0, offsetof(struct prov_link, prot_timer));
#endif /* PB_ADV */
err = bt_pub_key_gen(&pub_key_cb);
if (err) {
BT_ERR("Failed to generate public key (%d)", err);
return err;
}
return 0;
}
#if defined(CONFIG_BT_MESH_PB_ADV)
@ -1541,9 +1556,7 @@ int bt_mesh_pb_gatt_close(struct bt_conn *conn)
prov->link_close(BT_MESH_PROV_GATT);
}
reset_state();
return 0;
return reset_state();
}
#endif /* CONFIG_BT_MESH_PB_GATT */
@ -1580,11 +1593,6 @@ static void protocol_timeout(struct k_work *work)
int bt_mesh_prov_init(const struct bt_mesh_prov *prov_info)
{
static struct bt_pub_key_cb pub_key_cb = {
.func = pub_key_ready,
};
int err;
if (!prov_info) {
BT_ERR("No provisioning context provided");
return -EINVAL;
@ -1592,21 +1600,13 @@ int bt_mesh_prov_init(const struct bt_mesh_prov *prov_info)
k_delayed_work_init(&link.prot_timer, protocol_timeout);
err = bt_pub_key_gen(&pub_key_cb);
if (err) {
BT_ERR("Failed to generate public key (%d)", err);
return err;
}
prov = prov_info;
#if defined(CONFIG_BT_MESH_PB_ADV)
k_delayed_work_init(&link.tx.retransmit, prov_retransmit);
#endif
reset_state();
return 0;
return reset_state();
}
void bt_mesh_prov_complete(u16_t net_idx, u16_t addr)