michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: ieee802154: nrf5: refactor storing mac keys

Browse source 
This commit makes nrf5_config_mac_keys function more generic.
Is uses lookup table for storing keys to override. It removes old keys
before storing new ones.

Signed-off-by: Lukasz Maciejonczyk <lukasz.maciejonczyk@nordicsemi.no>
This commit is contained in:
Lukasz Maciejonczyk 2021-11-04 13:58:08 +01:00 • committed by Carles Cufí
commit c930262fd8
1 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

46
drivers/ieee802154/ieee802154_nrf5.c
View file

@ -702,36 +702,36 @@ static void nrf5_iface_init(struct net_if *iface)
#if defined(CONFIG_NRF_802154_ENCRYPTION) #if defined(CONFIG_NRF_802154_ENCRYPTION)
static void nrf5_config_mac_keys(struct ieee802154_key *mac_keys) static void nrf5_config_mac_keys(struct ieee802154_key *mac_keys)
{ {
nrf_802154_security_error_t err; static nrf_802154_key_id_t stored_key_ids[NRF_802154_SECURITY_KEY_STORAGE_SIZE];
nrf_802154_key_t key; static uint8_t stored_ids[NRF_802154_SECURITY_KEY_STORAGE_SIZE];
uint8_t key_id_to_remove; uint8_t i;
__ASSERT(mac_keys, "Invalid argument."); for (i = 0; i < NRF_802154_SECURITY_KEY_STORAGE_SIZE && stored_key_ids[i].p_key_id; i++) {
nrf_802154_security_key_remove(&stored_key_ids[i]);
/* Remove old invalid key assuming that its index is first_valid_key_id - 1. stored_key_ids[i].p_key_id = NULL;
* TODO: This is Thread specific assumption, need to be changed when RD will provided }
* API for removing all keys or handling this internally.
*/
key_id_to_remove = mac_keys->key_index == 1 ? 0x80 : mac_keys->key_index - 1;
key.id.mode = mac_keys->key_id_mode;
key.id.p_key_id = &key_id_to_remove;
nrf_802154_security_key_remove(&key.id);
i = 0;
for (struct ieee802154_key *keys = mac_keys; keys->key_value; keys++) { for (struct ieee802154_key *keys = mac_keys; keys->key_value; keys++) {
key.value.p_cleartext_key = keys->key_value; nrf_802154_key_t key = {
key.id.mode = keys->key_id_mode; .value.p_cleartext_key = keys->key_value,
key.id.p_key_id = &(keys->key_index); .id.mode = keys->key_id_mode,
key.type = NRF_802154_KEY_CLEARTEXT; .id.p_key_id = &(keys->key_index),
key.frame_counter = 0; .type = NRF_802154_KEY_CLEARTEXT,
key.use_global_frame_counter = !(keys->frame_counter_per_key); .frame_counter = 0,
.use_global_frame_counter = !(keys->frame_counter_per_key),
};
nrf_802154_security_key_remove(&key.id); nrf_802154_security_error_t err = nrf_802154_security_key_store(&key);
err = nrf_802154_security_key_store(&key);
__ASSERT(err == NRF_802154_SECURITY_ERROR_NONE || __ASSERT(err == NRF_802154_SECURITY_ERROR_NONE ||
err == NRF_802154_SECURITY_ERROR_ALREADY_PRESENT, err == NRF_802154_SECURITY_ERROR_ALREADY_PRESENT,
"Storing key failed, err: %d", err); "Storing key failed, err: %d", err);
__ASSERT(i < NRF_802154_SECURITY_KEY_STORAGE_SIZE, "Store buffer is full");
stored_ids[i] = *key.id.p_key_id;
stored_key_ids[i].mode = key.id.mode;
stored_key_ids[i].p_key_id = &stored_ids[i];
i++;
}; };
} }
#endif /* CONFIG_NRF_802154_ENCRYPTION */ #endif /* CONFIG_NRF_802154_ENCRYPTION */