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

mesh: appkey management - update code to use add appkey instead of mesh_application_key_set

Browse Source
This commit is contained in:
Matthias Ringwald 2019-04-25 22:39:51 +02:00
parent 48dbbdaabd
commit 1e891ec87b
5 changed files with 42 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
test/mesh/mesh.c
View File

@ -125,6 +125,17 @@ static void mesh_setup_from_provisioning_data(const mesh_provisioning_data_t * p
mesh_provisioning_dump(provisioning_data);
}
static mesh_transport_key_t test_application_key;
static void mesh_application_key_set(uint16_t netkey_index, uint16_t appkey_index, uint8_t aid, const uint8_t *application_key) {
test_application_key.netkey_index = netkey_index;
test_application_key.appkey_index = appkey_index;
test_application_key.aid = aid;
test_application_key.akf = 1;
memcpy(test_application_key.key, application_key, 16);
mesh_transport_key_add(&test_application_key);
}
static void mesh_load_app_keys(void){
uint8_t data[2+1+16];
int app_key_len = btstack_tlv_singleton_impl->get_tag(btstack_tlv_singleton_context, 'APPK', (uint8_t *) &data, sizeof(data));
@ -1493,39 +1504,49 @@ static void config_appkey_status(mesh_model_t * mesh_model, uint16_t netkey_inde
}
static void config_appkey_add_aid(void * arg){
UNUSED(arg);
mesh_transport_key_t * transport_key = (mesh_transport_key_t *) arg;
printf("Config Appkey Add: NetKey Index 0x%06x, AppKey Index 0x%06x, AID %02x: ", new_netkey_index, new_appkey_index, new_aid);
printf("Config Appkey Add: NetKey Index 0x%06x, AppKey Index 0x%06x, AID %02x: ", transport_key->netkey_index, transport_key->appkey_index, transport_key->aid);
printf_hexdump(new_app_key.key, 16);
// store in TLV
mesh_store_app_key(new_appkey_index, new_aid, new_app_key.key);
mesh_store_app_key(transport_key->appkey_index, transport_key->aid, transport_key->key);
// TODO: find a way to get netkey_index
// TODO: find a way to get netkey_index from request
uint16_t netkey_index = 0;
// set as main app key
mesh_application_key_set(netkey_index, new_appkey_index, new_aid, new_app_key.key);
// add app key
mesh_transport_key_add(transport_key);
config_appkey_status(NULL, netkey_index, mesh_pdu_src(access_pdu_in_process), netkey_and_appkey_index, 0);
uint16_t netkey_and_app_index = (transport_key->appkey_index << 12) | transport_key->netkey_index;
config_appkey_status(NULL, netkey_index, mesh_pdu_src(access_pdu_in_process), netkey_and_appkey_index, MESH_FOUNDATION_STATUS_SUCCESS);
mesh_access_message_processed(access_pdu_in_process);
}
static void config_appkey_add_handler(mesh_model_t *mesh_model, mesh_pdu_t * pdu) {
// get app key
mesh_transport_key_t * transport_key = btstack_memory_mesh_transport_key_get();
if (transport_key == NULL) {
config_appkey_status(mesh_model, mesh_pdu_netkey_index(pdu), mesh_pdu_src(access_pdu_in_process), netkey_and_appkey_index, MESH_FOUNDATION_STATUS_INSUFFICIENT_RESOURCES);
mesh_access_message_processed(access_pdu_in_process);
return;
}
mesh_access_parser_state_t parser;
mesh_access_parser_init(&parser, (mesh_pdu_t*) pdu);
// 01-03: netkey and appkey index
netkey_and_appkey_index = mesh_access_parser_get_u24(&parser);
new_netkey_index = netkey_and_appkey_index & 0xfff;
new_appkey_index = netkey_and_appkey_index >> 12;
transport_key->netkey_index = netkey_and_appkey_index & 0xfff;
transport_key->appkey_index = netkey_and_appkey_index >> 12;
// actual key
mesh_access_parser_get_key(&parser, new_app_key.key);
mesh_access_parser_get_key(&parser, transport_key->key);
// calculate AID
access_pdu_in_process = pdu;
mesh_transport_key_calc_aid(&mesh_cmac_request, &new_app_key, config_appkey_add_aid, NULL);
mesh_transport_key_calc_aid(&mesh_cmac_request, transport_key, config_appkey_add_aid, transport_key);
}
static void config_model_subscription_status(mesh_model_t * mesh_model, uint16_t netkey_index, uint16_t dest, uint8_t status, uint16_t element_address, uint16_t address, uint32_t model_identifier){

10
test/mesh/mesh_keys.c
View File

@ -151,7 +151,6 @@ void mesh_network_key_list_add_from_provisioning_data(const mesh_provisioning_da
// application key list
// key management
static mesh_transport_key_t test_application_key;
static mesh_transport_key_t mesh_transport_device_key;
static btstack_linked_list_t application_keys;
@ -163,15 +162,6 @@ void mesh_transport_set_device_key(const uint8_t * device_key){
memcpy(mesh_transport_device_key.key, device_key, 16);
}
void mesh_application_key_set(uint16_t netkey_index, uint16_t appkey_index, uint8_t aid, const uint8_t *application_key) {
test_application_key.netkey_index = netkey_index;
test_application_key.appkey_index = appkey_index;
test_application_key.aid = aid;
test_application_key.akf = 1;
memcpy(test_application_key.key, application_key, 16);
mesh_transport_key_add(&test_application_key);
}
void mesh_transport_key_add(mesh_transport_key_t * transport_key){
btstack_linked_list_add(&application_keys, (btstack_linked_item_t *) transport_key);
}

8
test/mesh/mesh_keys.h
View File

@ -211,14 +211,6 @@ void mesh_transport_key_add(mesh_transport_key_t * transport_key);
*/
int mesh_transport_key_remove(mesh_transport_key_t * transport_key);
/**
* Add Application Key
* @param appkey_index
* @param aid
* @param application_key
*/
void mesh_application_key_set(uint16_t netkey_index, uint16_t appkey_index, uint8_t aid, const uint8_t *application_key);
/**
* Get transport key for appkey_index
* @param appkey_index

10
test/mesh/mesh_message_test.c
View File

@ -104,6 +104,16 @@ static void btstack_print_hex(const uint8_t * data, uint16_t len, char separator
printf("\n");
}
static mesh_transport_key_t test_application_key;
static void mesh_application_key_set(uint16_t netkey_index, uint16_t appkey_index, uint8_t aid, const uint8_t *application_key) {
test_application_key.netkey_index = netkey_index;
test_application_key.appkey_index = appkey_index;
test_application_key.aid = aid;
test_application_key.akf = 1;
memcpy(test_application_key.key, application_key, 16);
mesh_transport_key_add(&test_application_key);
}
static void load_network_key_nid_68(void){
mesh_provisioning_data_t provisioning_data;
provisioning_data.nid = 0x68;

5
test/mesh/mesh_transport.h
View File

@ -53,11 +53,6 @@ void mesh_transport_init();
void mesh_upper_transport_set_primary_element_address(uint16_t primary_element_address);
void mesh_transport_set_device_key(const uint8_t * device_key);
void
mesh_application_key_set(uint16_t netkey_index, uint16_t appkey_index, uint8_t aid, const uint8_t *application_key);
void mesh_upper_transport_message_processed_by_higher_layer(mesh_pdu_t * pdu);
// Control PDUs