michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: refactor mesh to use both tinycrypt and psa based crypto

Browse source 
A mesh key type has been added to be able to choose the different
key representation for different security libraries.
The type as well as some functionality related to Mesh key
management has been added as a public API.
If tynicrypt is chosen then keys have representation
as 16 bytes array. If mbedTLS with PSA is used then keys are
the PSA key id. Raw value is not kept within BLE Mesh stack
for mbedTLS. Keys are imported into the security library
and key ids are gotten back. This refactoring has been done
for the network(including all derivated keys), application,
device, and session keys.

Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
This commit is contained in:
Aleksandr Khromykh 2023-04-21 12:49:14 +02:00 • committed by Anas Nashif
commit 29895d8275
46 changed files with 1386 additions and 521 deletions
Download patch file Download diff file Expand all files Collapse all files

29
samples/bluetooth/mesh_provisioner/src/main.c
View file

@ -72,6 +72,8 @@ static const struct bt_mesh_comp comp = {
static void setup_cdb(void)
{
struct bt_mesh_cdb_app_key *key;
uint8_t app_key[16];
int err;
key = bt_mesh_cdb_app_key_alloc(net_idx, app_idx);
if (key == NULL) {
@ -79,7 +81,13 @@ static void setup_cdb(void)
return;
}
bt_rand(key->keys[0].app_key, 16);
bt_rand(app_key, 16);
err = bt_mesh_cdb_app_key_import(key, 0, app_key);
if (err) {
printk("Failed to import appkey into cdb. Err:%d\n", err);
return;
}
if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
bt_mesh_cdb_app_key_store(key);
@ -89,6 +97,7 @@ static void setup_cdb(void)
static void configure_self(struct bt_mesh_cdb_node *self)
{
struct bt_mesh_cdb_app_key *key;
uint8_t app_key[16];
uint8_t status = 0;
int err;
@ -100,9 +109,15 @@ static void configure_self(struct bt_mesh_cdb_node *self)
return;
}
err = bt_mesh_cdb_app_key_export(key, 0, app_key);
if (err) {
printk("Failed to export appkey from cdb. Err:%d\n", err);
return;
}
/* Add Application Key */
err = bt_mesh_cfg_cli_app_key_add(self->net_idx, self->addr, self->net_idx, app_idx,
key->keys[0].app_key, &status);
app_key, &status);
if (err || status) {
printk("Failed to add app-key (err %d, status %d)\n", err,
status);
@ -131,6 +146,7 @@ static void configure_node(struct bt_mesh_cdb_node *node)
NET_BUF_SIMPLE_DEFINE(buf, BT_MESH_RX_SDU_MAX);
struct bt_mesh_comp_p0_elem elem;
struct bt_mesh_cdb_app_key *key;
uint8_t app_key[16];
struct bt_mesh_comp_p0 comp;
uint8_t status;
int err, elem_addr;
@ -143,9 +159,14 @@ static void configure_node(struct bt_mesh_cdb_node *node)
return;
}
err = bt_mesh_cdb_app_key_export(key, 0, app_key);
if (err) {
printk("Failed to export appkey from cdb. Err:%d\n", err);
return;
}
/* Add Application Key */
err = bt_mesh_cfg_cli_app_key_add(net_idx, node->addr, net_idx, app_idx,
key->keys[0].app_key, &status);
err = bt_mesh_cfg_cli_app_key_add(net_idx, node->addr, net_idx, app_idx, app_key, &status);
if (err || status) {
printk("Failed to add app-key (err %d status %d)\n", err, status);
return;