mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-29 22:20:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

reuse SM_STATE_PH2_GET_RANDOM_TK for initiator, too

Browse Source
This commit is contained in:
matthias.ringwald 2014-06-13 10:36:03 +00:00
parent 9b1377736e
commit 814aa0b0d5
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ble/sm.c
View File

@ -56,6 +56,10 @@ typedef enum {
SM_STATE_SEND_LTK_REQUESTED_NEGATIVE_REPLY,
SM_STATE_TIMEOUT, // no other security messages are exchanged
// get random number for TK if we show it
SM_STATE_PH2_GET_RANDOM_TK,
SM_STATE_PH2_W4_RANDOM_TK,
// SLAVE ROLE
SM_STATE_SEND_SECURITY_REQUEST,
@ -71,10 +75,6 @@ typedef enum {
// Phase 2: Authenticating and Encrypting
// get random number for TK if we show it
SM_STATE_PH2_GET_RANDOM_TK,
SM_STATE_PH2_W4_RANDOM_TK,
// calculate confirm values for local and remote connection
SM_STATE_PH2_C1_GET_RANDOM_A,
SM_STATE_PH2_C1_W4_RANDOM_A,
@ -127,12 +127,10 @@ typedef enum {
// PH1
SM_STATE_INITIATOR_SEND_PAIRING_REQUEST,
SM_STATE_INITIATOR_W4_PAIRING_RESPONSE,
SM_STATE_INITIATOR_PH1_SEND_PAIRING_CONFIRM,
// PH2
SM_STATE_INITIATOR_PH2_GET_RANDOM_TK,
SM_STATE_INITIATOR_PH2_W4_RANDOM_TK,
SM_STATE_INITIATOR_PH2_C1_GET_RANDOM_A,
SM_STATE_INITIATOR_PH1_SEND_PAIRING_CONFIRM,
} security_manager_state_t;
@ -1357,8 +1355,11 @@ static void sm_handle_random_result(uint8_t * data){
}
sm_reset_tk();
net_store_32(setup->sm_tk, 12, tk);
// continue with phase 1
connection->sm_state_responding = SM_STATE_PH1_SEND_PAIRING_RESPONSE;
if (connection->sm_role){
connection->sm_state_responding = SM_STATE_PH1_SEND_PAIRING_RESPONSE;
} else {
connection->sm_state_responding = SM_STATE_INITIATOR_PH2_C1_GET_RANDOM_A;
}
return;
}
case SM_STATE_PH2_C1_W4_RANDOM_A:
@ -1645,7 +1646,7 @@ static void sm_packet_handler(uint8_t packet_type, uint16_t handle, uint8_t *pac
// generate random number first, if we need to show passkey
if (setup->sm_stk_generation_method == PK_RESP_INPUT){
connection->sm_state_responding = SM_STATE_INITIATOR_PH2_GET_RANDOM_TK;
connection->sm_state_responding = SM_STATE_PH2_GET_RANDOM_TK;
break;
}