espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-09-13 12:40:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

nimble/ll: Use simply memcpy for copying in resolv

Browse Source 
Copying data by words requires both src and dst to be word aligned, but
fc4497b78 modified ble_ll_resolv_entry struct so neither rl_local_irk
nor rl_peer_irk are aligned properly so copying does not work on nRF51
(Cortex-M0).

Let's use memcpy() here which is a bit slower, but since this code is
not used very often it does not really matter.
This commit is contained in:
Andrzej Kaczmarek
2018-05-18 01:45:55 +02:00
parent 1490ed4a11
commit 17cf119f05
1 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/controller/src/ble_ll_resolv.c
+2 -15
View File
@@ -84,9 +84,6 @@ ble_ll_resolv_gen_priv_addr(struct ble_ll_resolv_entry *rl, int local)
{
uint8_t *irk;
uint8_t *prand;
uint32_t *irk32;
uint32_t *key32;
uint32_t *pt32;
struct ble_encryption_block ecb;
uint8_t *addr;
@@ -105,18 +102,8 @@ ble_ll_resolv_gen_priv_addr(struct ble_ll_resolv_entry *rl, int local)
ble_ll_rand_prand_get(prand);
/* Calculate hash, hash = ah(local IRK, prand) */
irk32 = (uint32_t *)irk;
key32 = (uint32_t *)&ecb.key[0];
key32[0] = irk32[0];
key32[1] = irk32[1];
key32[2] = irk32[2];
key32[3] = irk32[3];
pt32 = (uint32_t *)&ecb.plain_text[0];
pt32[0] = 0;
pt32[1] = 0;
pt32[2] = 0;
ecb.plain_text[12] = 0;
memcpy(ecb.key, irk, 16);
memset(ecb.plain_text, 0, 13);
ecb.plain_text[13] = prand[2];
ecb.plain_text[14] = prand[1];
ecb.plain_text[15] = prand[0];