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

sm: move SM_RESPONDER_PH0_RECEIVED_LTK_REQUEST code into sm_run

Browse Source 
remove SM_RESPONDER_PH4_Y_GET_ENC
This commit is contained in:
Matthias Ringwald 2020-10-29 11:53:37 +01:00
parent b26f445ff2
commit dd12a62b2e
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ble/sm.c
View File

@ -1911,8 +1911,6 @@ static void sm_start_calculating_ltk_from_ediv_and_rand(sm_connection_t * sm_con
sm_connection->sm_connection_sc = 0;
log_info("sm: received ltk request with key size %u, authenticated %u",
sm_connection->sm_actual_encryption_key_size, sm_connection->sm_connection_authenticated);
sm_connection->sm_engine_state = SM_RESPONDER_PH4_Y_GET_ENC;
sm_trigger_run();
}
#endif
@ -2171,8 +2169,7 @@ static void sm_run_activate_connection(void){
sm_connection->sm_engine_state = SM_RESPONDER_PH1_SEND_PAIRING_RESPONSE;
break;
case SM_RESPONDER_PH0_RECEIVED_LTK_REQUEST:
sm_reset_setup();
sm_start_calculating_ltk_from_ediv_and_rand(sm_connection);
// just lock context
break;
#ifdef ENABLE_LE_SECURE_CONNECTIONS
@ -2578,6 +2575,7 @@ static void sm_run(void){
#endif
#ifdef ENABLE_LE_PERIPHERAL
case SM_RESPONDER_PH1_SEND_PAIRING_RESPONSE:
sm_pairing_packet_set_code(setup->sm_s_pres,SM_CODE_PAIRING_RESPONSE);
@ -2706,11 +2704,15 @@ static void sm_run(void){
sm_done_for_handle(connection->sm_handle);
return;
}
case SM_RESPONDER_PH4_Y_GET_ENC:
case SM_RESPONDER_PH0_RECEIVED_LTK_REQUEST:
// already busy?
if (sm_aes128_state == SM_AES128_ACTIVE) break;
log_info("LTK Request: recalculating with ediv 0x%04x", setup->sm_local_ediv);
sm_reset_setup();
sm_start_calculating_ltk_from_ediv_and_rand(connection);
// dm helper (was sm_dm_r_prime)
// r' = padding || r
// r - 64 bit value

1
src/hci.h
View File

@ -333,7 +333,6 @@ typedef enum {
SM_RESPONDER_PH2_SEND_LTK_REPLY,
// Phase 4: re-establish previously distributed LTK
SM_RESPONDER_PH4_Y_GET_ENC,
SM_RESPONDER_PH4_Y_W4_ENC,
SM_RESPONDER_PH4_SEND_LTK_REPLY,