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

move key distribution into explicit state, use state for send security request and send pairing failed

Browse Source
This commit is contained in:
matthias.ringwald@gmail.com 2013-11-16 22:49:43 +00:00
parent fb0d10171a
commit 1573cd5f74
1 changed files with 82 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
example/libusb/ble_server.c
View File

@ -105,10 +105,13 @@ typedef enum {
SM_STATE_IDLE,
SM_STATE_SEND_SECURITY_REQUEST,
SM_STATE_SEND_PAIRING_RESPONSE,
SM_STATE_W4_PAIRING_CONFIRM,
SM_STATE_SEND_PAIRING_FAILED,
SM_STATE_SEND_PAIRING_RANDOM,
// calculate confirm values for local and remote connection
SM_STATE_C1_GET_RANDOM_A,
@ -146,6 +149,9 @@ typedef enum {
SM_STATE_PH3_IRK_GET_ENC,
SM_STATE_PH3_IRK_W4_ENC,
//
SM_STATE_DISTRIBUTE_KEYS,
// re establish previously distribued LTK
SM_STATE_PH4_DHK_GET_ENC,
SM_STATE_PH4_DHK_W4_ENC,
@ -185,7 +191,6 @@ static int sm_key_distribution_set = 0;
static security_manager_state_t sm_state_responding = SM_STATE_IDLE;
static int sm_send_security_request = 0;
static int sm_send_encryption_information = 0;
static int sm_send_master_identification = 0;
static int sm_send_identity_information = 0;
@ -369,6 +374,15 @@ static void sm_run(void){
switch (sm_state_responding){
case SM_STATE_SEND_SECURITY_REQUEST: {
uint8_t buffer[2];
buffer[0] = SM_CODE_SECURITY_REQUEST;
buffer[1] = SM_AUTHREQ_BONDING;
l2cap_send_connectionless(sm_response_handle, L2CAP_CID_SECURITY_MANAGER_PROTOCOL, (uint8_t*) buffer, sizeof(buffer));
sm_state_responding = SM_STATE_IDLE;
return;
}
case SM_STATE_SEND_PAIRING_RESPONSE: {
// TODO use provided IO capabilites
// TOOD use local MITM flag
@ -402,6 +416,15 @@ static void sm_run(void){
break;
}
case SM_STATE_SEND_PAIRING_RANDOM: {
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));
sm_state_responding = SM_STATE_W4_LTK_REQUEST;
break;
}
case SM_STATE_C1_GET_RANDOM_A:
case SM_STATE_C1_GET_RANDOM_B:
case SM_STATE_PH3_GET_RANDOM:
@ -452,19 +475,7 @@ static void sm_run(void){
return;
}
default:
break;
}
// send security request
if (sm_send_security_request){
sm_send_security_request = 0;
uint8_t buffer[2];
buffer[0] = SM_CODE_SECURITY_REQUEST;
buffer[1] = SM_AUTHREQ_BONDING;
l2cap_send_connectionless(sm_response_handle, L2CAP_CID_SECURITY_MANAGER_PROTOCOL, (uint8_t*) buffer, sizeof(buffer));
return;
}
case SM_STATE_DISTRIBUTE_KEYS:
if (sm_send_encryption_information){
sm_send_encryption_information = 0;
uint8_t buffer[17];
@ -515,6 +526,12 @@ static void sm_run(void){
l2cap_send_connectionless(sm_response_handle, L2CAP_CID_SECURITY_MANAGER_PROTOCOL, (uint8_t*) buffer, sizeof(buffer));
return;
}
sm_state_responding = SM_STATE_IDLE;
break;
default:
break;
}
}
static void sm_packet_handler(uint8_t packet_type, uint16_t handle, uint8_t *packet, uint16_t size){
@ -669,11 +686,12 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
BD_ADDR_COPY(sm_s_address, hci_local_bd_addr());
printf("Incoming connection, own address ");
print_bd_addr(sm_s_address);
// request security
sm_send_security_request = 1;
// reset connection MTU
att_connection.mtu = 23;
// request security
sm_state_responding = SM_STATE_SEND_SECURITY_REQUEST;
break;
case HCI_SUBEVENT_LE_LONG_TERM_KEY_REQUEST:
@ -768,8 +786,7 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
print_key("c1!", m_confirm_test);
if (memcmp(sm_m_confirm, m_confirm_test, 16) == 0){
// send s_random
sm_send_s_random = 1;
sm_state_responding = SM_STATE_W4_LTK_REQUEST;
sm_state_responding = SM_STATE_SEND_PAIRING_RANDOM;
break;
}
sm_state_responding = SM_STATE_SEND_PAIRING_FAILED;