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

added 'get oob data' callback support

Browse Source
This commit is contained in:
matthias.ringwald@gmail.com 2013-11-28 15:34:11 +00:00
parent 37743dbf87
commit 03435b99d8
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
example/libusb/ble_server.c
View File

@ -164,6 +164,8 @@ typedef enum {
} security_manager_state_t; } security_manager_state_t;
static att_connection_t att_connection; static att_connection_t att_connection;
static uint16_t att_addr_type;
static bd_addr_t att_address;
static uint16_t att_response_handle = 0; static uint16_t att_response_handle = 0;
static uint16_t att_response_size = 0; static uint16_t att_response_size = 0;
static uint8_t att_response_buffer[28]; static uint8_t att_response_buffer[28];
@ -196,7 +198,6 @@ static int sm_send_master_identification = 0;
static int sm_send_identity_information = 0; static int sm_send_identity_information = 0;
static int sm_send_identity_address_information = 0; static int sm_send_identity_address_information = 0;
static int sm_send_signing_identification = 0; static int sm_send_signing_identification = 0;
static int sm_send_s_random = 0;
static int sm_received_encryption_information = 0; static int sm_received_encryption_information = 0;
static int sm_received_master_identification = 0; static int sm_received_master_identification = 0;
@ -236,6 +237,13 @@ static bd_addr_t sm_m_address;
static key_t sm_m_csrk; static key_t sm_m_csrk;
static key_t sm_m_irk; static key_t sm_m_irk;
// @returns 1 if oob data is available
// 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;
void sm_register_oob_data_callback( (*get_oob_data_callback)(uint8_t addres_type, bd_addr_t * addr, uint8_t * oob_data)){
sm_get_oob_data = get_oob_data_callback;
}
static void att_try_respond(void){ static void att_try_respond(void){
if (!att_response_size) return; if (!att_response_size) return;
if (!att_response_handle) return; if (!att_response_handle) return;
@ -395,7 +403,11 @@ static void sm_run(void){
// buffer[1] = 0x02; // io capability: KeyboardOnly // buffer[1] = 0x02; // io capability: KeyboardOnly
// buffer[1] = 0x03; // io capability: NoInputNoOutput // buffer[1] = 0x03; // io capability: NoInputNoOutput
buffer[1] = 0x04; // io capability: KeyboardDisplay buffer[1] = 0x04; // io capability: KeyboardDisplay
buffer[2] = 0x00; // no oob data available if (sm_get_oob_data){
buffer[2] = sm_get_oob_data(att_addr_type, att_address, NULL);
} else {
buffer[2] = 0x00; // no oob data available
}
buffer[3] = buffer[3] & 3; // remove MITM flag buffer[3] = buffer[3] & 3; // remove MITM flag
buffer[4] = 0x10; // maxium encryption key size buffer[4] = 0x10; // maxium encryption key size
@ -518,14 +530,6 @@ static void sm_run(void){
l2cap_send_connectionless(sm_response_handle, L2CAP_CID_SECURITY_MANAGER_PROTOCOL, (uint8_t*) buffer, sizeof(buffer)); l2cap_send_connectionless(sm_response_handle, L2CAP_CID_SECURITY_MANAGER_PROTOCOL, (uint8_t*) buffer, sizeof(buffer));
return; return;
} }
if (sm_send_s_random){
sm_send_s_random = 0;
uint8_t buffer[17];
buffer[0] = SM_CODE_PAIRING_RANDOM;
swap128(sm_s_random, &buffer[1]);
l2cap_send_connectionless(sm_response_handle, L2CAP_CID_SECURITY_MANAGER_PROTOCOL, (uint8_t*) buffer, sizeof(buffer));
return;
}
sm_state_responding = SM_STATE_IDLE; sm_state_responding = SM_STATE_IDLE;
break; break;
@ -697,6 +701,14 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
case HCI_SUBEVENT_LE_LONG_TERM_KEY_REQUEST: case HCI_SUBEVENT_LE_LONG_TERM_KEY_REQUEST:
log_info("LTK Request, state %u", sm_state_responding); log_info("LTK Request, state %u", sm_state_responding);
if (sm_state_responding == SM_STATE_W4_LTK_REQUEST){ if (sm_state_responding == SM_STATE_W4_LTK_REQUEST){
// use OOB data if available
if ((*sm_get_oob_data)(att_addr_type, att_address, sm_stk)){
key_t stk_flipped;
swap128(sm_stk, stk_flipped);
hci_send_cmd(&hci_le_long_term_key_request_reply, sm_response_handle, stk_flipped);
sm_state_responding = SM_STATE_W4_CONNECTION_ENCRYPTED;
break;
}
// calculate STK // calculate STK
log_info("calculating STK"); log_info("calculating STK");
// key_t sm_stk; // key_t sm_stk;