mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-10 15:44:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

reuse SM_STATE_PH2_C1_GET_RANDOM_A for Initiator

Browse Source
This commit is contained in:
matthias.ringwald 2014-06-13 10:45:29 +00:00
parent 814aa0b0d5
commit 8d6bb42426
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ble/sm.c
View File

@ -60,6 +60,12 @@ typedef enum {
SM_STATE_PH2_GET_RANDOM_TK, SM_STATE_PH2_GET_RANDOM_TK,
SM_STATE_PH2_W4_RANDOM_TK, SM_STATE_PH2_W4_RANDOM_TK,
// get local random number for confirm
SM_STATE_PH2_C1_GET_RANDOM_A,
SM_STATE_PH2_C1_W4_RANDOM_A,
SM_STATE_PH2_C1_GET_RANDOM_B,
SM_STATE_PH2_C1_W4_RANDOM_B,
// SLAVE ROLE // SLAVE ROLE
SM_STATE_SEND_SECURITY_REQUEST, SM_STATE_SEND_SECURITY_REQUEST,
@ -76,10 +82,6 @@ typedef enum {
// Phase 2: Authenticating and Encrypting // Phase 2: Authenticating and Encrypting
// calculate confirm values for local and remote connection // calculate confirm values for local and remote connection
SM_STATE_PH2_C1_GET_RANDOM_A,
SM_STATE_PH2_C1_W4_RANDOM_A,
SM_STATE_PH2_C1_GET_RANDOM_B,
SM_STATE_PH2_C1_W4_RANDOM_B,
SM_STATE_PH2_C1_GET_ENC_A, SM_STATE_PH2_C1_GET_ENC_A,
SM_STATE_PH2_C1_W4_ENC_A, SM_STATE_PH2_C1_W4_ENC_A,
SM_STATE_PH2_C1_GET_ENC_B, SM_STATE_PH2_C1_GET_ENC_B,
@ -130,6 +132,8 @@ typedef enum {
// PH2 // PH2
SM_STATE_INITIATOR_PH2_C1_GET_RANDOM_A, SM_STATE_INITIATOR_PH2_C1_GET_RANDOM_A,
SM_STATE_INITIATOR_PH2_C1_GET_ENC_A,
SM_STATE_INITIATOR_PH1_SEND_PAIRING_CONFIRM, SM_STATE_INITIATOR_PH1_SEND_PAIRING_CONFIRM,
} security_manager_state_t; } security_manager_state_t;
@ -1363,12 +1367,21 @@ static void sm_handle_random_result(uint8_t * data){
return; return;
} }
case SM_STATE_PH2_C1_W4_RANDOM_A: case SM_STATE_PH2_C1_W4_RANDOM_A:
memcpy(&setup->sm_s_random[0], data, 8); // random endinaness if (connection->sm_role){
memcpy(&setup->sm_s_random[0], data, 8); // random endinaness
} else {
memcpy(&setup->sm_m_random[0], data, 8); // random endinaness
}
connection->sm_state_responding = SM_STATE_PH2_C1_GET_RANDOM_B; connection->sm_state_responding = SM_STATE_PH2_C1_GET_RANDOM_B;
return; return;
case SM_STATE_PH2_C1_W4_RANDOM_B: case SM_STATE_PH2_C1_W4_RANDOM_B:
memcpy(&setup->sm_s_random[8], data, 8); // random endinaness if (connection->sm_role){
connection->sm_state_responding = SM_STATE_PH2_C1_GET_ENC_A; memcpy(&setup->sm_s_random[8], data, 8); // random endinaness
connection->sm_state_responding = SM_STATE_PH2_C1_GET_ENC_A;
} else {
memcpy(&setup->sm_m_random[8], data, 8); // random endinaness
connection->sm_state_responding = SM_STATE_INITIATOR_PH2_C1_GET_ENC_A;
}
return; return;
case SM_STATE_PH3_W4_RANDOM: case SM_STATE_PH3_W4_RANDOM:
swap64(data, setup->sm_s_rand); swap64(data, setup->sm_s_rand);