* [PATCH BlueZ 0/5] mesh: Save/restore network keys
@ 2019-02-06 7:31 Inga Stotland
2019-02-06 7:31 ` [PATCH BlueZ 1/5] mesh: Separate functions for net key add and update Inga Stotland
0 siblings, 1 reply; 3+ messages in thread
From: Inga Stotland @ 2019-02-06 7:31 UTC (permalink / raw)
To: linux-bluetooth; +Cc: brian.gix, johan.hedberg, luiz.dentz, Inga Stotland
This set of patches fixes the network key add/update processing.
Network keys need to be saved to a local node configuration file
when:
- a new node is provisioned
- new network key are added by a configuration client
- existing network key is updated by a configuration client
during key refresh procedure.
Also, each saved network key is accompanied by a proper key
refresh phase setting.
Inga Stotland (5):
mesh: Separate functions for net key add and update
mesh: Add function to restore net key state from storage
mesh: Declare internal functions as static
mesh: Save key refresh phase state to node config file
mesh: Save newly added or updated net key to config file
mesh/cfgmod-server.c | 8 +-
mesh/mesh-db.c | 178 +++++++++++++++++------------
mesh/mesh-db.h | 6 +-
mesh/net.c | 262 ++++++++++++++++++++++++++-----------------
mesh/net.h | 12 +-
mesh/node.c | 19 +++-
mesh/storage.c | 22 ++--
mesh/storage.h | 7 +-
8 files changed, 319 insertions(+), 195 deletions(-)
--
2.17.2
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH BlueZ 1/5] mesh: Separate functions for net key add and update 2019-02-06 7:31 [PATCH BlueZ 0/5] mesh: Save/restore network keys Inga Stotland @ 2019-02-06 7:31 ` Inga Stotland 2019-02-06 17:46 ` Gix, Brian 0 siblings, 1 reply; 3+ messages in thread From: Inga Stotland @ 2019-02-06 7:31 UTC (permalink / raw) To: linux-bluetooth; +Cc: brian.gix, johan.hedberg, luiz.dentz, Inga Stotland This splits mesh_net_key_add() into two separate functions: mesh_net_key_add() and mesh_net_key_update(). mesh_net_key_update() essentially replaces mesh_net_kr_phase_one() since switching to Key Refresh phase one can only be triggered by successful network key update. --- mesh/cfgmod-server.c | 8 ++++++-- mesh/net.c | 24 +++++++----------------- mesh/net.h | 8 ++++---- mesh/node.c | 4 ++-- mesh/storage.c | 2 +- 5 files changed, 20 insertions(+), 26 deletions(-) diff --git a/mesh/cfgmod-server.c b/mesh/cfgmod-server.c index 062bdaaf2..899bdde2e 100644 --- a/mesh/cfgmod-server.c +++ b/mesh/cfgmod-server.c @@ -981,8 +981,12 @@ static bool cfg_srv_pkt(uint16_t src, uint32_t dst, if (size != 18) return true; - b_res = mesh_net_add_key(net, opcode == OP_NETKEY_UPDATE, - l_get_le16(pkt), pkt + 2); + net_idx = l_get_le16(pkt); + + if (opcode == OP_NETKEY_ADD) + b_res = mesh_net_add_key(net, net_idx, pkt + 2); + else + b_res = mesh_net_update_key(net, net_idx, pkt + 2); l_debug("NetKey Add/Update %s", (b_res == MESH_STATUS_SUCCESS) ? "success" : "fail"); diff --git a/mesh/net.c b/mesh/net.c index 9e509a8ea..bfc1a01bb 100644 --- a/mesh/net.c +++ b/mesh/net.c @@ -970,27 +970,13 @@ int mesh_net_del_key(struct mesh_net *net, uint16_t idx) return MESH_STATUS_SUCCESS; } -int mesh_net_add_key(struct mesh_net *net, bool update, uint16_t idx, - const void *value) +int mesh_net_add_key(struct mesh_net *net, uint16_t idx, const uint8_t *value) { - int status; struct mesh_subnet *subnet; subnet = l_queue_find(net->subnets, match_key_index, L_UINT_TO_PTR(idx)); - if (update) { - if (subnet && subnet->kr_phase == KEY_REFRESH_PHASE_NONE) { - l_info("Start key refresh"); - status = mesh_net_kr_phase_one(net, idx, value); - if (status == MESH_STATUS_SUCCESS && - !storage_net_key_add(net, idx, - value, KEY_REFRESH_PHASE_ONE)) - return MESH_STATUS_STORAGE_FAIL; - } else - return MESH_STATUS_CANNOT_UPDATE; - } - if (subnet) { if (net_key_confirm(subnet->net_key_cur, value)) return MESH_STATUS_SUCCESS; @@ -3570,7 +3556,7 @@ uint8_t mesh_net_key_refresh_phase_get(struct mesh_net *net, uint16_t idx, return MESH_STATUS_SUCCESS; } -int mesh_net_kr_phase_one(struct mesh_net *net, uint16_t idx, +int mesh_net_update_key(struct mesh_net *net, uint16_t idx, const uint8_t *value) { struct mesh_subnet *subnet; @@ -3580,7 +3566,8 @@ int mesh_net_kr_phase_one(struct mesh_net *net, uint16_t idx, subnet = l_queue_find(net->subnets, match_key_index, L_UINT_TO_PTR(idx)); - if (!subnet) + + if (!subnet || !subnet->kr_phase == KEY_REFRESH_PHASE_NONE) return MESH_STATUS_CANNOT_UPDATE; if (subnet->net_key_upd) { @@ -3606,6 +3593,9 @@ int mesh_net_kr_phase_one(struct mesh_net *net, uint16_t idx, l_info("key refresh phase 1: Key ID %d", subnet->net_key_upd); + if (!storage_net_key_add(net, idx, value, KEY_REFRESH_PHASE_ONE)) + return MESH_STATUS_STORAGE_FAIL; + subnet->kr_phase = KEY_REFRESH_PHASE_ONE; return MESH_STATUS_SUCCESS; diff --git a/mesh/net.h b/mesh/net.h index 0ef01b63e..b27a4e614 100644 --- a/mesh/net.h +++ b/mesh/net.h @@ -280,8 +280,10 @@ bool mesh_net_set_relay_mode(struct mesh_net *net, bool enable, uint8_t cnt, uint8_t interval); bool mesh_net_set_friend_mode(struct mesh_net *net, bool enable); int mesh_net_del_key(struct mesh_net *net, uint16_t net_idx); -int mesh_net_add_key(struct mesh_net *net, bool update, - uint16_t net_idx, const void *key); +int mesh_net_add_key(struct mesh_net *net, uint16_t net_idx, + const uint8_t *key); +int mesh_net_update_key(struct mesh_net *net, uint16_t net_idx, + const uint8_t *key); uint32_t mesh_net_get_iv_index(struct mesh_net *net); void mesh_net_get_snb_state(struct mesh_net *net, uint8_t *flags, uint32_t *iv_index); @@ -335,8 +337,6 @@ uint8_t mesh_net_key_refresh_phase_set(struct mesh_net *net, uint16_t net_idx, uint8_t transition); uint8_t mesh_net_key_refresh_phase_get(struct mesh_net *net, uint16_t net_idx, uint8_t *phase); -int mesh_net_kr_phase_one(struct mesh_net *net, uint16_t net_idx, - const uint8_t *key); int mesh_net_key_refresh_phase_two(struct mesh_net *net, uint16_t net_idx); int mesh_net_key_refresh_finish(struct mesh_net *net, uint16_t net_idx); void mesh_net_send_seg(struct mesh_net *net, uint32_t key_id, diff --git a/mesh/node.c b/mesh/node.c index e921b72b7..1845f9a32 100644 --- a/mesh/node.c +++ b/mesh/node.c @@ -1726,8 +1726,8 @@ bool node_add_pending_local(struct mesh_node *node, void *prov_node_info, if (!mesh_db_write_device_key(node->jconfig, info->device_key)) return false; - if (mesh_net_add_key(node->net, kr, info->net_index, - info->net_key) != MESH_STATUS_SUCCESS) + if (mesh_net_add_key(node->net, info->net_index, info->net_key) != + MESH_STATUS_SUCCESS) return false; if (!storage_net_key_add(node->net, info->net_index, info->net_key, diff --git a/mesh/storage.c b/mesh/storage.c index 3a6614eb2..1b52000b0 100644 --- a/mesh/storage.c +++ b/mesh/storage.c @@ -120,7 +120,7 @@ static bool read_net_keys_cb(uint16_t idx, uint8_t *key, uint8_t *new_key, if (!net) return false; - if (mesh_net_add_key(net, false, idx, key) != MESH_STATUS_SUCCESS) + if (mesh_net_add_key(net, idx, key) != MESH_STATUS_SUCCESS) return false; /* TODO: handle restoring key refresh phase and new keys */ -- 2.17.2 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH BlueZ 1/5] mesh: Separate functions for net key add and update 2019-02-06 7:31 ` [PATCH BlueZ 1/5] mesh: Separate functions for net key add and update Inga Stotland @ 2019-02-06 17:46 ` Gix, Brian 0 siblings, 0 replies; 3+ messages in thread From: Gix, Brian @ 2019-02-06 17:46 UTC (permalink / raw) To: linux-bluetooth, Stotland, Inga; +Cc: luiz.dentz, johan.hedberg Hi Inga, One adjustment needed here... On Tue, 2019-02-05 at 23:31 -0800, Inga Stotland wrote: > This splits mesh_net_key_add() into two separate functions: > mesh_net_key_add() and mesh_net_key_update(). > mesh_net_key_update() essentially replaces mesh_net_kr_phase_one() > since switching to Key Refresh phase one can only be triggered > by successful network key update. > --- > mesh/cfgmod-server.c | 8 ++++++-- > mesh/net.c | 24 +++++++----------------- > mesh/net.h | 8 ++++---- > mesh/node.c | 4 ++-- > mesh/storage.c | 2 +- > 5 files changed, 20 insertions(+), 26 deletions(-) > > diff --git a/mesh/cfgmod-server.c b/mesh/cfgmod-server.c > index 062bdaaf2..899bdde2e 100644 > --- a/mesh/cfgmod-server.c > +++ b/mesh/cfgmod-server.c > @@ -981,8 +981,12 @@ static bool cfg_srv_pkt(uint16_t src, uint32_t dst, > if (size != 18) > return true; > > - b_res = mesh_net_add_key(net, opcode == OP_NETKEY_UPDATE, > - l_get_le16(pkt), pkt + 2); > + net_idx = l_get_le16(pkt); > + > + if (opcode == OP_NETKEY_ADD) > + b_res = mesh_net_add_key(net, net_idx, pkt + 2); > + else > + b_res = mesh_net_update_key(net, net_idx, pkt + 2); > > l_debug("NetKey Add/Update %s", > (b_res == MESH_STATUS_SUCCESS) ? "success" : "fail"); > diff --git a/mesh/net.c b/mesh/net.c > index 9e509a8ea..bfc1a01bb 100644 > --- a/mesh/net.c > +++ b/mesh/net.c > @@ -970,27 +970,13 @@ int mesh_net_del_key(struct mesh_net *net, uint16_t idx) > return MESH_STATUS_SUCCESS; > } > > -int mesh_net_add_key(struct mesh_net *net, bool update, uint16_t idx, > - const void *value) > +int mesh_net_add_key(struct mesh_net *net, uint16_t idx, const uint8_t *value) > { > - int status; > struct mesh_subnet *subnet; > > subnet = l_queue_find(net->subnets, match_key_index, > L_UINT_TO_PTR(idx)); > > - if (update) { > - if (subnet && subnet->kr_phase == KEY_REFRESH_PHASE_NONE) { > - l_info("Start key refresh"); > - status = mesh_net_kr_phase_one(net, idx, value); > - if (status == MESH_STATUS_SUCCESS && > - !storage_net_key_add(net, idx, > - value, KEY_REFRESH_PHASE_ONE)) > - return MESH_STATUS_STORAGE_FAIL; > - } else > - return MESH_STATUS_CANNOT_UPDATE; > - } > - > if (subnet) { > if (net_key_confirm(subnet->net_key_cur, value)) > return MESH_STATUS_SUCCESS; > @@ -3570,7 +3556,7 @@ uint8_t mesh_net_key_refresh_phase_get(struct mesh_net *net, uint16_t idx, > return MESH_STATUS_SUCCESS; > } > > -int mesh_net_kr_phase_one(struct mesh_net *net, uint16_t idx, > +int mesh_net_update_key(struct mesh_net *net, uint16_t idx, > const uint8_t *value) > { > struct mesh_subnet *subnet; > @@ -3580,7 +3566,8 @@ int mesh_net_kr_phase_one(struct mesh_net *net, uint16_t idx, > > subnet = l_queue_find(net->subnets, match_key_index, > L_UINT_TO_PTR(idx)); > - if (!subnet) > + > + if (!subnet || !subnet->kr_phase == KEY_REFRESH_PHASE_NONE) > return MESH_STATUS_CANNOT_UPDATE; We need to allow for "Update" calls where we have already entered Phase 1, but the Config Client did not recieve our Net Key Status (response) message. We have a function we use in Net Key Add net_key_confirm() that checks to see if this is a valid but redundandt call, so that we can accept it (and respond) without changing state. > > if (subnet->net_key_upd) { > @@ -3606,6 +3593,9 @@ int mesh_net_kr_phase_one(struct mesh_net *net, uint16_t idx, > > l_info("key refresh phase 1: Key ID %d", subnet->net_key_upd); > > + if (!storage_net_key_add(net, idx, value, KEY_REFRESH_PHASE_ONE)) > + return MESH_STATUS_STORAGE_FAIL; > + > subnet->kr_phase = KEY_REFRESH_PHASE_ONE; > > return MESH_STATUS_SUCCESS; > diff --git a/mesh/net.h b/mesh/net.h > index 0ef01b63e..b27a4e614 100644 > --- a/mesh/net.h > +++ b/mesh/net.h > @@ -280,8 +280,10 @@ bool mesh_net_set_relay_mode(struct mesh_net *net, bool enable, uint8_t cnt, > uint8_t interval); > bool mesh_net_set_friend_mode(struct mesh_net *net, bool enable); > int mesh_net_del_key(struct mesh_net *net, uint16_t net_idx); > -int mesh_net_add_key(struct mesh_net *net, bool update, > - uint16_t net_idx, const void *key); > +int mesh_net_add_key(struct mesh_net *net, uint16_t net_idx, > + const uint8_t *key); > +int mesh_net_update_key(struct mesh_net *net, uint16_t net_idx, > + const uint8_t *key); > uint32_t mesh_net_get_iv_index(struct mesh_net *net); > void mesh_net_get_snb_state(struct mesh_net *net, > uint8_t *flags, uint32_t *iv_index); > @@ -335,8 +337,6 @@ uint8_t mesh_net_key_refresh_phase_set(struct mesh_net *net, uint16_t net_idx, > uint8_t transition); > uint8_t mesh_net_key_refresh_phase_get(struct mesh_net *net, uint16_t net_idx, > uint8_t *phase); > -int mesh_net_kr_phase_one(struct mesh_net *net, uint16_t net_idx, > - const uint8_t *key); > int mesh_net_key_refresh_phase_two(struct mesh_net *net, uint16_t net_idx); > int mesh_net_key_refresh_finish(struct mesh_net *net, uint16_t net_idx); > void mesh_net_send_seg(struct mesh_net *net, uint32_t key_id, > diff --git a/mesh/node.c b/mesh/node.c > index e921b72b7..1845f9a32 100644 > --- a/mesh/node.c > +++ b/mesh/node.c > @@ -1726,8 +1726,8 @@ bool node_add_pending_local(struct mesh_node *node, void *prov_node_info, > if (!mesh_db_write_device_key(node->jconfig, info->device_key)) > return false; > > - if (mesh_net_add_key(node->net, kr, info->net_index, > - info->net_key) != MESH_STATUS_SUCCESS) > + if (mesh_net_add_key(node->net, info->net_index, info->net_key) != > + MESH_STATUS_SUCCESS) > return false; > > if (!storage_net_key_add(node->net, info->net_index, info->net_key, > diff --git a/mesh/storage.c b/mesh/storage.c > index 3a6614eb2..1b52000b0 100644 > --- a/mesh/storage.c > +++ b/mesh/storage.c > @@ -120,7 +120,7 @@ static bool read_net_keys_cb(uint16_t idx, uint8_t *key, uint8_t *new_key, > if (!net) > return false; > > - if (mesh_net_add_key(net, false, idx, key) != MESH_STATUS_SUCCESS) > + if (mesh_net_add_key(net, idx, key) != MESH_STATUS_SUCCESS) > return false; > /* TODO: handle restoring key refresh phase and new keys */ > ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-02-06 17:46 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-02-06 7:31 [PATCH BlueZ 0/5] mesh: Save/restore network keys Inga Stotland 2019-02-06 7:31 ` [PATCH BlueZ 1/5] mesh: Separate functions for net key add and update Inga Stotland 2019-02-06 17:46 ` Gix, Brian
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).