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

sm: fix local nonce generation

Browse Source
This commit is contained in:
Matthias Ringwald 2016-05-29 19:59:02 +02:00
parent 1c516d8ff1
commit 945888f5ea
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/ble/sm.c
View File

@ -1316,6 +1316,7 @@ static inline void sm_pdu_received_in_wrong_state(sm_connection_t * sm_conn){
#ifdef ENABLE_LE_SECURE_CONNECTIONS
static void sm_sc_prepare_dhkey_check(sm_connection_t * sm_conn);
static int sm_passkey_used(stk_generation_method_t method);
static void sm_sc_state_after_receiving_random(sm_connection_t * sm_conn){
if (sm_conn->sm_role){
@ -1570,16 +1571,17 @@ static void g2_calculate_engine(sm_connection_t * sm_conn) {
}
}
static void sm_sc_calculate_local_confirm(sm_connection_t * sm_conn){
static void sm_sc_generate_local_nonce(sm_connection_t * sm_conn){
// TODO: use random generator to generate nonce
log_info("SM: generate local nonce");
// generate 128-bit nonce
int i;
for (i=0;i<16;i++){
setup->sm_local_nonce[i] = rand() & 0xff;
}
}
static void sm_sc_calculate_local_confirm(sm_connection_t * sm_conn){
uint8_t z = 0;
if (setup->sm_stk_generation_method != JUST_WORKS && setup->sm_stk_generation_method != NK_BOTH_INPUT){
// some form of passkey
@ -1937,6 +1939,11 @@ static void sm_run(void){
#ifdef ENABLE_LE_SECURE_CONNECTIONS
case SM_SC_W2_CMAC_FOR_CONFIRMATION:
if (!sm_cmac_ready()) break;
if (sm_passkey_used(setup->sm_stk_generation_method)){
sm_sc_generate_local_nonce(connection);
}
connection->sm_engine_state = SM_SC_W4_CMAC_FOR_CONFIRMATION;
sm_sc_calculate_local_confirm(connection);
break;
@ -2861,6 +2868,17 @@ static inline int sm_calc_actual_encryption_key_size(int other){
return sm_max_encryption_key_size;
}
static int sm_just_works_or_numeric_comparison(stk_generation_method_t method){
switch (method){
case JUST_WORKS:
case NK_BOTH_INPUT:
return 1;
default:
return 0;
}
}
static int sm_passkey_used(stk_generation_method_t method){
switch (method){
case PK_RESP_INPUT:
@ -3089,6 +3107,11 @@ static void sm_pdu_handler(uint8_t packet_type, hci_con_handle_t con_handle, uin
sm_conn->sm_engine_state = SM_SC_W2_CMAC_FOR_CONFIRMATION;
} else {
// initiator
if (sm_just_works_or_numeric_comparison(setup->sm_stk_generation_method)){
sm_sc_generate_local_nonce(sm_conn);
}
sm_conn->sm_engine_state = SM_SC_SEND_PAIRING_RANDOM;
}
break;

4
src/hci.h
View File

@ -313,6 +313,8 @@ typedef enum {
SM_SC_W4_CONFIRMATION,
SM_SC_SEND_PAIRING_RANDOM,
SM_SC_W4_PAIRING_RANDOM,
SM_SC_W2_CALCULATE_G2,
SM_SC_W4_CALCULATE_G2,
SM_SC_W2_CALCULATE_F5_SALT,
SM_SC_W4_CALCULATE_F5_SALT,
SM_SC_W2_CALCULATE_F5_MACKEY,
@ -323,8 +325,6 @@ typedef enum {
SM_SC_W4_CALCULATE_F6_FOR_DHKEY_CHECK,
SM_SC_W2_CALCULATE_F6_TO_VERIFY_DHKEY_CHECK,
SM_SC_W4_CALCULATE_F6_TO_VERIFY_DHKEY_CHECK,
SM_SC_W2_CALCULATE_G2,
SM_SC_W4_CALCULATE_G2,
SM_SC_W4_USER_RESPONSE,
SM_SC_SEND_DHKEY_CHECK_COMMAND,
SM_SC_W4_DHKEY_CHECK_COMMAND,