mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-18 14:42:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

btstack_crypto: fix encrypt/decrypt with block_len > 16

Browse Source
This commit is contained in:
Matthias Ringwald 2018-10-29 21:45:21 +01:00
parent e5b6c4e973
commit 89be578cb9
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/btstack_crypto.c
View File

@ -567,9 +567,6 @@ static void btstack_crypto_ccm_handle_sn(btstack_crypto_ccm_t * btstack_crypto_c
} }
static void btstack_crypto_ccm_next_block(btstack_crypto_ccm_t * btstack_crypto_ccm, btstack_crypto_ccm_state_t state_when_done){ static void btstack_crypto_ccm_next_block(btstack_crypto_ccm_t * btstack_crypto_ccm, btstack_crypto_ccm_state_t state_when_done){
#ifdef DEBUG_CCM
printf("btstack_crypto_ccm_next_block\n");
#endif
uint16_t bytes_to_process = btstack_min(btstack_crypto_ccm->block_len, 16); uint16_t bytes_to_process = btstack_min(btstack_crypto_ccm->block_len, 16);
// next block // next block
btstack_crypto_ccm->counter++; btstack_crypto_ccm->counter++;
@ -577,11 +574,16 @@ static void btstack_crypto_ccm_next_block(btstack_crypto_ccm_t * btstack_crypto_
btstack_crypto_ccm->output += bytes_to_process; btstack_crypto_ccm->output += bytes_to_process;
btstack_crypto_ccm->block_len -= bytes_to_process; btstack_crypto_ccm->block_len -= bytes_to_process;
btstack_crypto_ccm->message_len -= bytes_to_process; btstack_crypto_ccm->message_len -= bytes_to_process;
#ifdef DEBUG_CCM
printf("btstack_crypto_ccm_next_block (message len %u, blockk_len %u)\n", btstack_crypto_ccm->message_len, btstack_crypto_ccm->block_len);
#endif
if (btstack_crypto_ccm->message_len == 0){ if (btstack_crypto_ccm->message_len == 0){
btstack_crypto_ccm->state = CCM_CALCULATE_S0; btstack_crypto_ccm->state = CCM_CALCULATE_S0;
} else { } else {
btstack_crypto_ccm->state = state_when_done; btstack_crypto_ccm->state = state_when_done;
btstack_crypto_done(&btstack_crypto_ccm->btstack_crypto); if (btstack_crypto_ccm->block_len == 0){
btstack_crypto_done(&btstack_crypto_ccm->btstack_crypto);
}
} }
} }