Skip to content

Commit 5facb50

Browse files
ludvigsjkartben
authored andcommitted
Bluetooth: Mesh: add missing device key candidate PSA support
Commit adds PSA key support for device key candidate. Signed-off-by: Ludvig Jordet <[email protected]>
1 parent 8e53592 commit 5facb50

File tree

1 file changed

+11
-5
lines changed
  • subsys/bluetooth/mesh

1 file changed

+11
-5
lines changed

subsys/bluetooth/mesh/net.c

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1109,17 +1109,23 @@ BT_MESH_SETTINGS_DEFINE(seq, "Seq", seq_set);
11091109
#if defined(CONFIG_BT_MESH_RPR_SRV)
11101110
static int dev_key_cand_set(const char *name, size_t len_rd, settings_read_cb read_cb,
11111111
void *cb_arg)
1112-
{ int err;
1112+
{
1113+
int err;
1114+
struct bt_mesh_key key;
11131115

1114-
if (len_rd < 16) {
1115-
return -EINVAL;
1116+
if (len_rd == 0) {
1117+
LOG_DBG("val (null)");
1118+
1119+
bt_mesh_key_destroy(&bt_mesh.dev_key_cand);
1120+
memset(&bt_mesh.dev_key_cand, 0, sizeof(struct bt_mesh_key));
1121+
return 0;
11161122
}
11171123

1118-
err = bt_mesh_settings_set(read_cb, cb_arg, &bt_mesh.dev_key_cand,
1119-
sizeof(struct bt_mesh_key));
1124+
err = bt_mesh_settings_set(read_cb, cb_arg, &key, sizeof(struct bt_mesh_key));
11201125
if (!err) {
11211126
LOG_DBG("DevKey candidate recovered from storage");
11221127
atomic_set_bit(bt_mesh.flags, BT_MESH_DEVKEY_CAND);
1128+
bt_mesh_key_assign(&bt_mesh.dev_key_cand, &key);
11231129
}
11241130

11251131
return err;

0 commit comments

Comments
 (0)