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

btstack_crypto: use extracted btstack_crypto_ccm_handle_sn for btstack_crypto_ccm_calc_sn

Browse Source
This commit is contained in:
Matthias Ringwald 2020-07-03 15:59:31 +02:00
parent 064b9c7f16
commit 6fb5f0b5d6
1 changed files with 18 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/btstack_crypto.c
View File

@ -684,6 +684,23 @@ static void btstack_crypto_ccm_handle_x1(btstack_crypto_ccm_t * btstack_crypto_c
} }
} }
static void btstack_crypto_ccm_handle_xn(btstack_crypto_ccm_t * btstack_crypto_ccm) {
#ifdef DEBUG_CCM
printf("%16s: ", "Xn+1");
printf_hexdump(btstack_crypto_ccm->x_i, 16);
#endif
switch (btstack_crypto_ccm->btstack_crypto.operation){
case BTSTACK_CRYPTO_CCM_DECRYPT_BLOCK:
btstack_crypto_ccm_next_block(btstack_crypto_ccm, CCM_CALCULATE_SN);
break;
case BTSTACK_CRYPTO_CCM_ENCRYPT_BLOCK:
btstack_crypto_ccm->state = CCM_CALCULATE_SN;
break;
default:
btstack_assert(false);
break;
}
}
static void btstack_crypto_ccm_calc_s0(btstack_crypto_ccm_t * btstack_crypto_ccm){ static void btstack_crypto_ccm_calc_s0(btstack_crypto_ccm_t * btstack_crypto_ccm){
#ifdef DEBUG_CCM #ifdef DEBUG_CCM
@ -694,10 +711,6 @@ static void btstack_crypto_ccm_calc_s0(btstack_crypto_ccm_t * btstack_crypto_ccm
#ifdef USE_BTSTACK_AES128 #ifdef USE_BTSTACK_AES128
uint8_t data[16]; uint8_t data[16];
btstack_aes128_calc(btstack_crypto_ccm->key, btstack_crypto_ccm_s, data); btstack_aes128_calc(btstack_crypto_ccm->key, btstack_crypto_ccm_s, data);
#ifdef DEBUG_CCM
printf("%16s: ", "S0");
printf_hexdump(data, 16);
#endif
btstack_crypto_ccm_handle_s0(btstack_crypto_ccm, data); btstack_crypto_ccm_handle_s0(btstack_crypto_ccm, data);
#else #else
btstack_crypto_aes128_start(btstack_crypto_ccm->key, btstack_crypto_ccm_s); btstack_crypto_aes128_start(btstack_crypto_ccm->key, btstack_crypto_ccm_s);
@ -713,21 +726,7 @@ static void btstack_crypto_ccm_calc_sn(btstack_crypto_ccm_t * btstack_crypto_ccm
#ifdef USE_BTSTACK_AES128 #ifdef USE_BTSTACK_AES128
uint8_t data[16]; uint8_t data[16];
btstack_aes128_calc(btstack_crypto_ccm->key, btstack_crypto_ccm_s, data); btstack_aes128_calc(btstack_crypto_ccm->key, btstack_crypto_ccm_s, data);
#ifdef DEBUG_CCM btstack_crypto_ccm_handle_sn(btstack_crypto_ccm, data);
printf("%16s: ", "Sn");
printf_hexdump(data, 16);
#endif
switch (btstack_crypto_ccm->btstack_crypto.operation){
case BTSTACK_CRYPTO_CCM_DECRYPT_BLOCK:
btstack_crypto_ccm->state = CCM_CALCULATE_XN;
break;
case BTSTACK_CRYPTO_CCM_ENCRYPT_BLOCK:
btstack_crypto_ccm_next_block(btstack_crypto_ccm, CCM_CALCULATE_XN);
break;
default:
btstack_assert(false);
break;
}
#else #else
btstack_crypto_aes128_start(btstack_crypto_ccm->key, btstack_crypto_ccm_s); btstack_crypto_aes128_start(btstack_crypto_ccm->key, btstack_crypto_ccm_s);
#endif #endif
@ -745,24 +744,6 @@ static void btstack_crypto_ccm_calc_x1(btstack_crypto_ccm_t * btstack_crypto_ccm
#endif #endif
} }
static void btstack_crypto_ccm_handle_xn(btstack_crypto_ccm_t * btstack_crypto_ccm) {
#ifdef DEBUG_CCM
printf("%16s: ", "Xn+1");
printf_hexdump(btstack_crypto_ccm->x_i, 16);
#endif
switch (btstack_crypto_ccm->btstack_crypto.operation){
case BTSTACK_CRYPTO_CCM_DECRYPT_BLOCK:
btstack_crypto_ccm_next_block(btstack_crypto_ccm, CCM_CALCULATE_SN);
break;
case BTSTACK_CRYPTO_CCM_ENCRYPT_BLOCK:
btstack_crypto_ccm->state = CCM_CALCULATE_SN;
break;
default:
btstack_assert(false);
break;
}
}
static void btstack_crypto_ccm_calc_xn(btstack_crypto_ccm_t * btstack_crypto_ccm, const uint8_t * plaintext){ static void btstack_crypto_ccm_calc_xn(btstack_crypto_ccm_t * btstack_crypto_ccm, const uint8_t * plaintext){
uint8_t btstack_crypto_ccm_buffer[16]; uint8_t btstack_crypto_ccm_buffer[16];
btstack_crypto_ccm->state = CCM_W4_XN; btstack_crypto_ccm->state = CCM_W4_XN;