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

sm: add sm_register_sc_oob_data_callback, verify received OOB data

Browse Source
This commit is contained in:
Matthias Ringwald 2018-04-03 13:43:57 +02:00
parent c59d0c922e
commit a680ba6b58
2 changed files with 50 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/ble/sm.c
View File

@ -340,6 +340,7 @@ typedef struct sm_setup_context {
// Phase 2 (Pairing over SMP) // Phase 2 (Pairing over SMP)
stk_generation_method_t sm_stk_generation_method; stk_generation_method_t sm_stk_generation_method;
sm_key_t sm_tk; sm_key_t sm_tk;
uint8_t sm_have_oob_data;
uint8_t sm_use_secure_connections; uint8_t sm_use_secure_connections;
sm_key_t sm_c1_t3_value; // c1 calculation sm_key_t sm_c1_t3_value; // c1 calculation
@ -405,6 +406,7 @@ static uint16_t sm_active_connection_handle = HCI_CON_HANDLE_INVALID;
// @returns 1 if oob data is available // @returns 1 if oob data is available
// stores oob data in provided 16 byte buffer if not null // stores oob data in provided 16 byte buffer if not null
static int (*sm_get_oob_data)(uint8_t addres_type, bd_addr_t addr, uint8_t * oob_data) = NULL; static int (*sm_get_oob_data)(uint8_t addres_type, bd_addr_t addr, uint8_t * oob_data) = NULL;
static int (*sm_get_sc_oob_data)(uint8_t addres_type, bd_addr_t addr, uint8_t * oob_sc_local_random, uint8_t * oob_sc_peer_confirm, uint8_t * oob_sc_peer_random);
// horizontal: initiator capabilities // horizontal: initiator capabilities
// vertial: responder capabilities // vertial: responder capabilities
@ -1193,12 +1195,28 @@ static void sm_init_setup(sm_connection_t * sm_conn){
setup->sm_peer_addr_type = sm_conn->sm_peer_addr_type; setup->sm_peer_addr_type = sm_conn->sm_peer_addr_type;
memcpy(setup->sm_peer_address, sm_conn->sm_peer_address, 6); memcpy(setup->sm_peer_address, sm_conn->sm_peer_address, 6);
// query client for OOB data // query client for Legacy Pairing OOB data
int have_oob_data = 0; setup->sm_have_oob_data = 0;
if (sm_get_oob_data) { if (sm_get_oob_data) {
have_oob_data = (*sm_get_oob_data)(sm_conn->sm_peer_addr_type, sm_conn->sm_peer_address, setup->sm_tk); setup->sm_have_oob_data = (*sm_get_oob_data)(sm_conn->sm_peer_addr_type, sm_conn->sm_peer_address, setup->sm_tk);
} }
// if available and SC supported, also ask for SC OOB Data
#ifdef ENABLE_LE_SECURE_CONNECTIONS
if (setup->sm_have_oob_data && (sm_auth_req & SM_AUTHREQ_SECURE_CONNECTION)){
if (sm_get_sc_oob_data){
setup->sm_have_oob_data = (*sm_get_sc_oob_data)(
sm_conn->sm_peer_addr_type,
sm_conn->sm_peer_address,
setup->sm_local_random,
setup->sm_peer_confirm,
setup->sm_peer_random);
} else {
setup->sm_have_oob_data = 0;
}
}
#endif
sm_pairing_packet_t * local_packet; sm_pairing_packet_t * local_packet;
if (IS_RESPONDER(sm_conn->sm_role)){ if (IS_RESPONDER(sm_conn->sm_role)){
// slave // slave
@ -1220,7 +1238,7 @@ static void sm_init_setup(sm_connection_t * sm_conn){
uint8_t auth_req = sm_auth_req; uint8_t auth_req = sm_auth_req;
sm_pairing_packet_set_io_capability(*local_packet, sm_io_capabilities); sm_pairing_packet_set_io_capability(*local_packet, sm_io_capabilities);
sm_pairing_packet_set_oob_data_flag(*local_packet, have_oob_data); sm_pairing_packet_set_oob_data_flag(*local_packet, setup->sm_have_oob_data);
sm_pairing_packet_set_auth_req(*local_packet, auth_req); sm_pairing_packet_set_auth_req(*local_packet, auth_req);
sm_pairing_packet_set_max_encryption_key_size(*local_packet, sm_max_encryption_key_size); sm_pairing_packet_set_max_encryption_key_size(*local_packet, sm_max_encryption_key_size);
} }
@ -1502,7 +1520,7 @@ static void sm_sc_cmac_done(uint8_t * hash){
if (sm_sc_oob_state == SM_SC_OOB_W4_CONFIRM){ if (sm_sc_oob_state == SM_SC_OOB_W4_CONFIRM){
sm_sc_oob_state = SM_SC_OOB_IDLE; sm_sc_oob_state = SM_SC_OOB_IDLE;
(*sm_sc_oob_callback)(sm_sc_oob_random, hash); (*sm_sc_oob_callback)(hash, sm_sc_oob_random);
return; return;
} }
@ -1779,6 +1797,12 @@ static void sm_sc_calculate_local_confirm(sm_connection_t * sm_conn){
} }
static void sm_sc_calculate_remote_confirm(sm_connection_t * sm_conn){ static void sm_sc_calculate_remote_confirm(sm_connection_t * sm_conn){
// OOB
if (setup->sm_stk_generation_method == OOB){
f4_engine(sm_conn, setup->sm_peer_q, setup->sm_peer_q, setup->sm_peer_random, 0);
return;
}
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 (setup->sm_stk_generation_method != JUST_WORKS && setup->sm_stk_generation_method != NK_BOTH_INPUT){
// some form of passkey // some form of passkey
@ -3867,6 +3891,13 @@ static void sm_pdu_handler(uint8_t packet_type, hci_con_handle_t con_handle, uin
break; break;
} }
// validate confirm value if Cb = f4(PKb, Pkb, rb, 0) for OOB if data received
if (setup->sm_stk_generation_method == OOB && setup->sm_have_oob_data){
sm_conn->sm_engine_state = SM_SC_W2_CMAC_FOR_CHECK_CONFIRMATION;
break;
}
// TODO: we only get here for Responder role with JW/NC
sm_sc_state_after_receiving_random(sm_conn); sm_sc_state_after_receiving_random(sm_conn);
break; break;
@ -4013,10 +4044,14 @@ static void sm_pdu_handler(uint8_t packet_type, hci_con_handle_t con_handle, uin
} }
// Security Manager Client API // Security Manager Client API
void sm_register_oob_data_callback( int (*get_oob_data_callback)(uint8_t addres_type, bd_addr_t addr, uint8_t * oob_data)){ void sm_register_oob_data_callback( int (*get_oob_data_callback)(uint8_t address_type, bd_addr_t addr, uint8_t * oob_data)){
sm_get_oob_data = get_oob_data_callback; sm_get_oob_data = get_oob_data_callback;
} }
void sm_register_sc_oob_data_callback( int (*get_sc_oob_data_callback)(uint8_t address_type, bd_addr_t addr, uint8_t * oob_sc_local_random, uint8_t * oob_sc_peer_confirm, uint8_t * oob_sc_peer_random)){
sm_get_sc_oob_data = get_sc_oob_data_callback;
}
void sm_add_event_handler(btstack_packet_callback_registration_t * callback_handler){ void sm_add_event_handler(btstack_packet_callback_registration_t * callback_handler){
btstack_linked_list_add_tail(&sm_event_handlers, (btstack_linked_item_t*) callback_handler); btstack_linked_list_add_tail(&sm_event_handlers, (btstack_linked_item_t*) callback_handler);
} }

10
src/ble/sm.h
View File

@ -76,7 +76,7 @@ void sm_set_ir(sm_key_t ir);
* @brief Registers OOB Data Callback. The callback should set the oob_data and return 1 if OOB data is availble * @brief Registers OOB Data Callback. The callback should set the oob_data and return 1 if OOB data is availble
* @param get_oob_data_callback * @param get_oob_data_callback
*/ */
void sm_register_oob_data_callback( int (*get_oob_data_callback)(uint8_t addres_type, bd_addr_t addr, uint8_t * oob_data)); void sm_register_oob_data_callback( int (*get_oob_data_callback)(uint8_t address_type, bd_addr_t addr, uint8_t * oob_data));
/** /**
* @brief Add event packet handler. * @brief Add event packet handler.
@ -251,6 +251,14 @@ void sm_allow_ltk_reconstruction_without_le_device_db_entry(int allow);
*/ */
uint8_t sm_generate_sc_oob_data(void (*callback)(const uint8_t * confirm_value, const uint8_t * random_value)); uint8_t sm_generate_sc_oob_data(void (*callback)(const uint8_t * confirm_value, const uint8_t * random_value));
/**
*
* @brief Registers OOB Data Callback for LE Secure Conections. The callback should set all arguments and return 1 if OOB data is availble
* @note the oob_sc_local_random usually is the random_value returend by sm_generate_sc_oob_data
* @param get_oob_data_callback
*/
void sm_register_sc_oob_data_callback( int (*get_sc_oob_data_callback)(uint8_t address_type, bd_addr_t addr, uint8_t * oob_sc_local_random, uint8_t * oob_sc_peer_confirm, uint8_t * oob_sc_peer_random));
/* API_END */ /* API_END */
// PTS testing // PTS testing