ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #12490 from DavidLin1577/patch-3 

Fixed  error of structure mlme_key_descriptor_t
pull/12507/head
Martin Kojtal 2020-02-24 15:45:35 +00:00 committed by GitHub
parent 1e24c00232 20f6a83f67
commit 9205bdf890
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_security_mib.c
View File

@ -90,7 +90,7 @@ static int mac_sec_mib_frame_counter_key_buffer_allocate(protocol_interface_rf_m
mlme_key_descriptor_t *key_descriptor_list = rf_mac_setup->key_description_table; mlme_key_descriptor_t *key_descriptor_list = rf_mac_setup->key_description_table;
uint32_t *frame_counter_pointer = rf_mac_setup->key_device_frame_counter_list_buffer; uint32_t *frame_counter_pointer = rf_mac_setup->key_device_frame_counter_list_buffer;
for (uint8_t i = 0; i < rf_mac_setup->key_description_table_size; i++) { for (uint8_t i = 0; i < rf_mac_setup->key_description_table_size; i++) {
key_descriptor_list->KeyDeviceFrameCouterList = frame_counter_pointer; key_descriptor_list->KeyDeviceFrameCounterList = frame_counter_pointer;
key_descriptor_list->KeyFrameCounterPerKey = true; key_descriptor_list->KeyFrameCounterPerKey = true;
key_descriptor_list->KeyFrameCounter = 0; key_descriptor_list->KeyFrameCounter = 0;
//Update Pointers //Update Pointers
@ -105,7 +105,7 @@ static void mac_sec_mib_frame_counter_key_buffer_free(protocol_interface_rf_mac_
{ {
mlme_key_descriptor_t *key_descriptor_list = rf_mac_setup->key_description_table; mlme_key_descriptor_t *key_descriptor_list = rf_mac_setup->key_description_table;
for (uint8_t i = 0; i < rf_mac_setup->key_description_table_size; i++) { for (uint8_t i = 0; i < rf_mac_setup->key_description_table_size; i++) {
key_descriptor_list->KeyDeviceFrameCouterList = NULL; key_descriptor_list->KeyDeviceFrameCounterList = NULL;
key_descriptor_list->KeyFrameCounterPerKey = false; key_descriptor_list->KeyFrameCounterPerKey = false;
//Update Pointers //Update Pointers
key_descriptor_list++; key_descriptor_list++;
@ -349,7 +349,7 @@ int8_t mac_sec_mib_key_description_set(uint8_t atribute_index, mlme_key_descript
key_ptr->KeyFrameCounter = 0; key_ptr->KeyFrameCounter = 0;
if (key_ptr->KeyDeviceListEntries == 0) { if (key_ptr->KeyDeviceListEntries == 0) {
//Clear all frame counters from old possible user's //Clear all frame counters from old possible user's
uint32_t *counter_ptr = key_ptr->KeyDeviceFrameCouterList; uint32_t *counter_ptr = key_ptr->KeyDeviceFrameCounterList;
for (int i = 0; i < rf_mac_setup->device_description_table_size; i++) { for (int i = 0; i < rf_mac_setup->device_description_table_size; i++) {
*counter_ptr++ = 0; *counter_ptr++ = 0;
} }
@ -594,7 +594,7 @@ void mac_sec_mib_key_outgoing_frame_counter_decrement(struct protocol_interface_
void mac_sec_mib_key_device_frame_counter_set(mlme_key_descriptor_t *key_descpription_table, mlme_device_descriptor_t *device_info, uint32_t frame_counter, uint8_t attribute_index) void mac_sec_mib_key_device_frame_counter_set(mlme_key_descriptor_t *key_descpription_table, mlme_device_descriptor_t *device_info, uint32_t frame_counter, uint8_t attribute_index)
{ {
if (key_descpription_table->KeyFrameCounterPerKey) { if (key_descpription_table->KeyFrameCounterPerKey) {
uint32_t *counter_ptr = key_descpription_table->KeyDeviceFrameCouterList + attribute_index; uint32_t *counter_ptr = key_descpription_table->KeyDeviceFrameCounterList + attribute_index;
*counter_ptr = frame_counter; *counter_ptr = frame_counter;
} else { } else {
device_info->FrameCounter = frame_counter; device_info->FrameCounter = frame_counter;
@ -604,7 +604,7 @@ void mac_sec_mib_key_device_frame_counter_set(mlme_key_descriptor_t *key_descpri
uint32_t mac_mib_key_device_frame_counter_get(mlme_key_descriptor_t *key_descpription_table, mlme_device_descriptor_t *device_info, uint8_t attribute_index) uint32_t mac_mib_key_device_frame_counter_get(mlme_key_descriptor_t *key_descpription_table, mlme_device_descriptor_t *device_info, uint8_t attribute_index)
{ {
if (key_descpription_table->KeyFrameCounterPerKey) { if (key_descpription_table->KeyFrameCounterPerKey) {
uint32_t *counter_ptr = key_descpription_table->KeyDeviceFrameCouterList + attribute_index; uint32_t *counter_ptr = key_descpription_table->KeyDeviceFrameCounterList + attribute_index;
return *counter_ptr; return *counter_ptr;
} }
return device_info->FrameCounter; return device_info->FrameCounter;

2
features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_security_mib.h
View File

@ -27,7 +27,7 @@ typedef struct mlme_key_descriptor_s {
mlme_key_id_lookup_descriptor_t *KeyIdLookupList; mlme_key_id_lookup_descriptor_t *KeyIdLookupList;
mlme_key_device_descriptor_t *KeyDeviceList; mlme_key_device_descriptor_t *KeyDeviceList;
mlme_key_usage_descriptor_t *KeyUsageList; mlme_key_usage_descriptor_t *KeyUsageList;
uint32_t *KeyDeviceFrameCouterList; uint32_t *KeyDeviceFrameCounterList;
uint32_t KeyFrameCounter; uint32_t KeyFrameCounter;
uint8_t Key[16]; uint8_t Key[16];
uint8_t KeyDeviceListSize; uint8_t KeyDeviceListSize;