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

sm: introduce sm_passkey_entry

Browse Source
This commit is contained in:
Matthias Ringwald 2018-04-04 22:34:29 +02:00
parent 13aa3e4b90
commit 40c5d8508b
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/ble/sm.c
View File

@ -436,6 +436,7 @@ static inline int sm_calc_actual_encryption_key_size(int other);
static int sm_validate_stk_generation_method(void); static int sm_validate_stk_generation_method(void);
static void sm_handle_encryption_result(uint8_t * data); static void sm_handle_encryption_result(uint8_t * data);
static void sm_notify_client_status_reason(sm_connection_t * sm_conn, uint8_t status, uint8_t reason); static void sm_notify_client_status_reason(sm_connection_t * sm_conn, uint8_t status, uint8_t reason);
static int sm_passkey_entry(stk_generation_method_t method);
static void log_info_hex16(const char * name, uint16_t value){ static void log_info_hex16(const char * name, uint16_t value){
log_info("%-6s 0x%04x", name, value); log_info("%-6s 0x%04x", name, value);
@ -1695,6 +1696,7 @@ static void sm_sc_calculate_dhkey(sm_key256_t dhkey){
#endif #endif
static void f5_calculate_salt(sm_connection_t * sm_conn){ static void f5_calculate_salt(sm_connection_t * sm_conn){
log_info("f5_calculate_salt");
// calculate salt for f5 // calculate salt for f5
const uint16_t message_len = 32; const uint16_t message_len = 32;
sm_cmac_connection = sm_conn; sm_cmac_connection = sm_conn;
@ -1800,7 +1802,7 @@ static void g2_calculate(sm_connection_t * sm_conn) {
static void sm_sc_calculate_local_confirm(sm_connection_t * sm_conn){ static void sm_sc_calculate_local_confirm(sm_connection_t * sm_conn){
uint8_t z = 0; uint8_t z = 0;
if (setup->sm_stk_generation_method != JUST_WORKS && setup->sm_stk_generation_method != NK_BOTH_INPUT){ if (sm_passkey_entry(setup->sm_stk_generation_method)){
// some form of passkey // some form of passkey
uint32_t pk = big_endian_read_32(setup->sm_tk, 12); uint32_t pk = big_endian_read_32(setup->sm_tk, 12);
z = 0x80 | ((pk >> setup->sm_passkey_bit) & 1); z = 0x80 | ((pk >> setup->sm_passkey_bit) & 1);
@ -1821,7 +1823,7 @@ static void sm_sc_calculate_remote_confirm(sm_connection_t * sm_conn){
} }
uint8_t z = 0; uint8_t z = 0;
if (setup->sm_stk_generation_method != JUST_WORKS && setup->sm_stk_generation_method != NK_BOTH_INPUT){ if (sm_passkey_entry(setup->sm_stk_generation_method)){
// some form of passkey // some form of passkey
uint32_t pk = big_endian_read_32(setup->sm_tk, 12); uint32_t pk = big_endian_read_32(setup->sm_tk, 12);
// sm_passkey_bit was increased before sending confirm value // sm_passkey_bit was increased before sending confirm value
@ -2540,7 +2542,9 @@ static void sm_run(void){
uint8_t buffer[17]; uint8_t buffer[17];
buffer[0] = SM_CODE_PAIRING_RANDOM; buffer[0] = SM_CODE_PAIRING_RANDOM;
reverse_128(setup->sm_local_nonce, &buffer[1]); reverse_128(setup->sm_local_nonce, &buffer[1]);
if (setup->sm_stk_generation_method != JUST_WORKS && setup->sm_stk_generation_method != NK_BOTH_INPUT && setup->sm_passkey_bit < 20){ log_info("stk method %u, num bits %u", setup->sm_stk_generation_method, setup->sm_passkey_bit);
if (sm_passkey_entry(setup->sm_stk_generation_method) && setup->sm_passkey_bit < 20){
log_info("SM_SC_SEND_PAIRING_RANDOM A");
if (IS_RESPONDER(connection->sm_role)){ if (IS_RESPONDER(connection->sm_role)){
// responder // responder
connection->sm_engine_state = SM_SC_W4_CONFIRMATION; connection->sm_engine_state = SM_SC_W4_CONFIRMATION;
@ -2549,11 +2553,14 @@ static void sm_run(void){
connection->sm_engine_state = SM_SC_W4_PAIRING_RANDOM; connection->sm_engine_state = SM_SC_W4_PAIRING_RANDOM;
} }
} else { } else {
log_info("SM_SC_SEND_PAIRING_RANDOM B");
if (IS_RESPONDER(connection->sm_role)){ if (IS_RESPONDER(connection->sm_role)){
// responder // responder
if (setup->sm_stk_generation_method == NK_BOTH_INPUT){ if (setup->sm_stk_generation_method == NK_BOTH_INPUT){
log_info("SM_SC_SEND_PAIRING_RANDOM B1");
connection->sm_engine_state = SM_SC_W2_CALCULATE_G2; connection->sm_engine_state = SM_SC_W2_CALCULATE_G2;
} else { } else {
log_info("SM_SC_SEND_PAIRING_RANDOM B2");
sm_sc_prepare_dhkey_check(connection); sm_sc_prepare_dhkey_check(connection);
} }
} else { } else {
@ -3563,6 +3570,18 @@ static int sm_passkey_used(stk_generation_method_t method){
return 0; return 0;
} }
} }
static int sm_passkey_entry(stk_generation_method_t method){
switch (method){
case PK_RESP_INPUT:
case PK_INIT_INPUT:
case OK_BOTH_INPUT:
return 1;
default:
return 0;
}
}
#endif #endif
/** /**