mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-28 00:35:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

sm: use LK from LE Device DB for SC in initiator role

Browse Source
This commit is contained in:
Matthias Ringwald 2016-05-31 22:31:20 +02:00
parent 7dbe5dcf89
commit 3764b5516a
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/ble/sm.c
View File

@ -369,14 +369,22 @@ static void log_info_hex16(const char * name, uint16_t value){
} }
// @returns 1 if all bytes are 0 // @returns 1 if all bytes are 0
static int sm_is_null_random(uint8_t random[8]){ static int sm_is_null(uint8_t * data, int size){
int i; int i;
for (i=0; i < 8 ; i++){ for (i=0; i < size ; i++){
if (random[i]) return 0; if (data[i]) return 0;
} }
return 1; return 1;
} }
static int sm_is_null_random(uint8_t random[8]){
return sm_is_null(random, 8);
}
static int sm_is_null_key(uint8_t * key){
return sm_is_null(key, 16);
}
// Key utils // Key utils
static void sm_reset_tk(void){ static void sm_reset_tk(void){
int i; int i;
@ -2999,8 +3007,9 @@ static void sm_pdu_handler(uint8_t packet_type, hci_con_handle_t con_handle, uin
} }
if (sm_conn->sm_irk_lookup_state == IRK_LOOKUP_SUCCEEDED){ if (sm_conn->sm_irk_lookup_state == IRK_LOOKUP_SUCCEEDED){
uint16_t ediv; uint16_t ediv;
le_device_db_encryption_get(sm_conn->sm_le_db_index, &ediv, NULL, NULL, NULL, NULL, NULL); sm_key_t ltk;
if (ediv){ le_device_db_encryption_get(sm_conn->sm_le_db_index, &ediv, NULL, ltk, NULL, NULL, NULL);
if (!sm_is_null_key(ltk) || ediv){
log_info("sm: Setting up previous ltk/ediv/rand for device index %u", sm_conn->sm_le_db_index); log_info("sm: Setting up previous ltk/ediv/rand for device index %u", sm_conn->sm_le_db_index);
sm_conn->sm_engine_state = SM_INITIATOR_PH0_HAS_LTK; sm_conn->sm_engine_state = SM_INITIATOR_PH0_HAS_LTK;
} else { } else {
@ -3493,14 +3502,15 @@ void sm_request_pairing(hci_con_handle_t con_handle){
} else { } else {
// used as a trigger to start central/master/initiator security procedures // used as a trigger to start central/master/initiator security procedures
uint16_t ediv; uint16_t ediv;
sm_key_t ltk;
if (sm_conn->sm_engine_state == SM_INITIATOR_CONNECTED){ if (sm_conn->sm_engine_state == SM_INITIATOR_CONNECTED){
switch (sm_conn->sm_irk_lookup_state){ switch (sm_conn->sm_irk_lookup_state){
case IRK_LOOKUP_FAILED: case IRK_LOOKUP_FAILED:
sm_conn->sm_engine_state = SM_INITIATOR_PH1_W2_SEND_PAIRING_REQUEST; sm_conn->sm_engine_state = SM_INITIATOR_PH1_W2_SEND_PAIRING_REQUEST;
break; break;
case IRK_LOOKUP_SUCCEEDED: case IRK_LOOKUP_SUCCEEDED:
le_device_db_encryption_get(sm_conn->sm_le_db_index, &ediv, NULL, NULL, NULL, NULL, NULL); le_device_db_encryption_get(sm_conn->sm_le_db_index, &ediv, NULL, ltk, NULL, NULL, NULL);
if (ediv){ if (!sm_is_null_key(ltk) || ediv){
log_info("sm: Setting up previous ltk/ediv/rand for device index %u", sm_conn->sm_le_db_index); log_info("sm: Setting up previous ltk/ediv/rand for device index %u", sm_conn->sm_le_db_index);
sm_conn->sm_engine_state = SM_INITIATOR_PH0_HAS_LTK; sm_conn->sm_engine_state = SM_INITIATOR_PH0_HAS_LTK;
} else { } else {