mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-28 06:39:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

mesh: extract mesh_access_key_refresh_revoke_keys(subnet)

Browse Source
This commit is contained in:
Matthias Ringwald 2019-07-04 14:49:31 +02:00
parent 48cef04012
commit b8e8e52c28
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/mesh/mesh_access.c
View File

@ -1356,6 +1356,12 @@ void mesh_access_netkey_finalize(mesh_network_key_t * network_key){
btstack_memory_mesh_network_key_free(network_key);
}
void mesh_access_key_refresh_revoke_keys(mesh_subnet_t * subnet){
mesh_access_netkey_finalize(subnet->old_key);
subnet->old_key = subnet->new_key;
subnet->new_key = NULL;
}
static void mesh_access_secure_network_beacon_handler(uint8_t packet_type, uint16_t channel, uint8_t * packet, uint16_t size){
UNUSED(channel);
if (packet_type != MESH_BEACON_PACKET) return;
@ -1391,11 +1397,7 @@ static void mesh_access_secure_network_beacon_handler(uint8_t packet_type, uint1
switch (subnet->key_refresh){
case MESH_KEY_REFRESH_FIRST_PHASE:
case MESH_KEY_REFRESH_SECOND_PHASE:
// -- revoke old key
mesh_access_netkey_finalize(subnet->old_key);
subnet->old_key = subnet->new_key;
subnet->new_key = NULL;
// -- update state
mesh_access_key_refresh_revoke_keys(subnet);
subnet->key_refresh = MESH_KEY_REFRESH_NOT_ACTIVE;
break;
default:

3
test/mesh/mesh_access.h
View File

@ -302,6 +302,9 @@ void mesh_access_transitions_add(mesh_transition_t * transition);
void mesh_access_transitions_remove(mesh_transition_t * transition);
uint8_t mesh_access_transactions_get_next_transaction_id(void);
// Key Refresh
void mesh_access_key_refresh_revoke_keys(mesh_subnet_t * subnet);
// Mesh Model Publicaation
/**

6
test/mesh/mesh_configuration_server.c
View File

@ -2123,11 +2123,7 @@ static void config_key_refresh_phase_set_handler(mesh_model_t *mesh_model, mesh_
case MESH_KEY_REFRESH_FIRST_PHASE:
case MESH_KEY_REFRESH_SECOND_PHASE:
// key refresh phase 3 entered
// -- revoke old key
mesh_access_netkey_finalize(subnet->old_key);
subnet->old_key = subnet->new_key;
subnet->new_key = NULL;
// -- update state
mesh_access_key_refresh_revoke_keys(subnet);
subnet->key_refresh = MESH_KEY_REFRESH_NOT_ACTIVE;
break;
default: