mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-04 04:20:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

mesh: store iv + sequence number together

Browse Source
This commit is contained in:
Matthias Ringwald 2019-07-10 11:40:52 +02:00
parent 7f01082ee5
commit 2e60b5d9a3
3 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/mesh/mesh.c
View File

@ -297,7 +297,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
if (prov_len){ if (prov_len){
mesh_setup_from_provisioning_data(&provisioning_data); mesh_setup_from_provisioning_data(&provisioning_data);
// load iv index // load iv index
mesh_load_iv_index(); mesh_load_iv_index_and_sequence_number();
// load network keys // load network keys
mesh_load_network_keys(); mesh_load_network_keys();
// load app keys // load app keys
@ -416,8 +416,8 @@ static void mesh_provisioning_message_handler (uint8_t packet_type, uint16_t cha
btstack_tlv_singleton_impl->store_tag(btstack_tlv_singleton_context, 'PROV', (uint8_t *) &provisioning_data, sizeof(mesh_provisioning_data_t)); btstack_tlv_singleton_impl->store_tag(btstack_tlv_singleton_context, 'PROV', (uint8_t *) &provisioning_data, sizeof(mesh_provisioning_data_t));
mesh_store_network_key(primary_network_key); mesh_store_network_key(primary_network_key);
// store IV Index // store IV Index and sequence number
mesh_store_iv_index(); mesh_store_iv_index_and_sequence_number();
// setup after provisioned // setup after provisioned
mesh_setup_from_provisioning_data(&provisioning_data); mesh_setup_from_provisioning_data(&provisioning_data);

37
test/mesh/mesh_access.c
View File

@ -1364,21 +1364,30 @@ int mesh_model_contains_appkey(mesh_model_t * mesh_model, uint16_t appkey_index)
} }
// Mesh IV Index // Mesh IV Index
static uint32_t mesh_tag_for_iv_index(void){ static uint32_t mesh_tag_for_iv_index_and_seq_number(void){
return ((uint32_t) 'I' << 24) | ((uint32_t) 'V' << 16) | ((uint32_t) 'I' << 9) | ((uint32_t) 'D'); return ((uint32_t) 'M' << 24) | ((uint32_t) 'F' << 16) | ((uint32_t) 'I' << 9) | ((uint32_t) 'S');
} }
void mesh_store_iv_index(void){
typedef struct {
uint32_t iv_index;
uint32_t seq_number;
} iv_index_and_sequence_number_t;
void mesh_store_iv_index_and_sequence_number(void){
iv_index_and_sequence_number_t data;
mesh_access_setup_tlv(); mesh_access_setup_tlv();
uint32_t tag = mesh_tag_for_iv_index(); uint32_t tag = mesh_tag_for_iv_index_and_seq_number();
uint32_t iv_index = mesh_get_iv_index(); data.iv_index = mesh_get_iv_index();
btstack_tlv_singleton_impl->get_tag(btstack_tlv_singleton_context, tag, (uint8_t *) &iv_index, 4); data.seq_number = mesh_lower_transport_peek_seq();
btstack_tlv_singleton_impl->get_tag(btstack_tlv_singleton_context, tag, (uint8_t *) &data, sizeof(data));
} }
void mesh_load_iv_index(void){ void mesh_load_iv_index_and_sequence_number(void){
iv_index_and_sequence_number_t data;
mesh_access_setup_tlv(); mesh_access_setup_tlv();
uint32_t tag = mesh_tag_for_iv_index(); uint32_t tag = mesh_tag_for_iv_index_and_seq_number();
uint32_t iv_index = 0; btstack_tlv_singleton_impl->store_tag(btstack_tlv_singleton_context, tag, (uint8_t *) &data, sizeof(data));
btstack_tlv_singleton_impl->store_tag(btstack_tlv_singleton_context, tag, (uint8_t *) &iv_index, 4); mesh_set_iv_index(data.iv_index);
mesh_set_iv_index(iv_index); mesh_lower_transport_set_seq(data.seq_number);
} }
@ -1669,7 +1678,7 @@ static void mesh_access_secure_network_beacon_handler(uint8_t packet_type, uint1
// instant iv update // instant iv update
mesh_set_iv_index( beacon_iv_index ); mesh_set_iv_index( beacon_iv_index );
// store updated iv index // store updated iv index
mesh_store_iv_index(); mesh_store_iv_index_and_sequence_number();
return; return;
} }
@ -1692,7 +1701,7 @@ static void mesh_access_secure_network_beacon_handler(uint8_t packet_type, uint1
mesh_iv_index_recovered(beacon_iv_update_active, beacon_iv_index); mesh_iv_index_recovered(beacon_iv_update_active, beacon_iv_index);
// store updated iv index if in normal mode // store updated iv index if in normal mode
if (beacon_iv_update_active == 0){ if (beacon_iv_update_active == 0){
mesh_store_iv_index(); mesh_store_iv_index_and_sequence_number();
} }
return; return;
} }
@ -1707,7 +1716,7 @@ static void mesh_access_secure_network_beacon_handler(uint8_t packet_type, uint1
mesh_lower_transport_set_seq(0); mesh_lower_transport_set_seq(0);
mesh_iv_update_completed(); mesh_iv_update_completed();
// store updated iv index // store updated iv index
mesh_store_iv_index(); mesh_store_iv_index_and_sequence_number();
} }
} }
} }

6
test/mesh/mesh_access.h
View File

@ -443,9 +443,9 @@ uint8_t mesh_model_bind_appkey(mesh_model_t * mesh_model, uint16_t appkey_index)
void mesh_model_unbind_appkey(mesh_model_t * mesh_model, uint16_t appkey_index); void mesh_model_unbind_appkey(mesh_model_t * mesh_model, uint16_t appkey_index);
int mesh_model_contains_appkey(mesh_model_t * mesh_model, uint16_t appkey_index); int mesh_model_contains_appkey(mesh_model_t * mesh_model, uint16_t appkey_index);
// Mesh IV Index // Mesh IV Index and sequence number
void mesh_store_iv_index(void); void mesh_store_iv_index_and_sequence_number(void);
void mesh_load_iv_index(void); void mesh_load_iv_index_and_sequence_number(void);
// Mesh Access Parser // Mesh Access Parser
int mesh_access_pdu_get_opcode(mesh_pdu_t * pdu, uint32_t * opcode, uint16_t * opcode_size); int mesh_access_pdu_get_opcode(mesh_pdu_t * pdu, uint32_t * opcode, uint16_t * opcode_size);