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

hci: emit dedicated bonding complete on pairing complete and encryption complete with error

Browse Source
This commit is contained in:
Matthias Ringwald 2022-03-03 12:28:56 +01:00
parent 8c021356a2
commit 5999ee11ac
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/hci.c
View File

@ -497,6 +497,13 @@ static void hci_pairing_complete(hci_connection_t * hci_connection, uint8_t stat
reverse_bd_addr(hci_connection->address, &event[4]);
event[10] = status;
hci_emit_event(event, sizeof(event), 1);
// emit dedicated bonding done on failure, otherwise verify that connection can be encrypted
if ((status != ERROR_CODE_SUCCESS) && ((hci_connection->bonding_flags & BONDING_DEDICATED) != 0)){
hci_connection->bonding_flags &= ~BONDING_DEDICATED;
hci_connection->bonding_flags |= BONDING_DISCONNECT_DEDICATED_DONE;
hci_connection->bonding_status = status;
}
}
bool hci_authentication_active_for_handle(hci_con_handle_t handle){
@ -3282,14 +3289,6 @@ static void event_handler(uint8_t *packet, uint16_t size){
#ifdef ENABLE_CLASSIC
else {
// dedicated bonding: send result and disconnect
if (conn->bonding_flags & BONDING_DEDICATED){
conn->bonding_flags &= ~BONDING_DEDICATED;
conn->bonding_flags |= BONDING_DISCONNECT_DEDICATED_DONE;
conn->bonding_status = packet[2];
break;
}
// Detect Secure Connection -> Legacy Connection Downgrade Attack (BIAS)
bool sc_used_during_pairing = gap_secure_connection_for_link_key_type(conn->link_key_type);
bool connected_uses_aes_ccm = encryption_enabled == 2;
@ -3327,6 +3326,13 @@ static void event_handler(uint8_t *packet, uint16_t size){
} else {
conn->authentication_flags &= ~AUTH_FLAG_CONNECTION_ENCRYPTED;
}
} else {
uint8_t status = hci_event_encryption_change_get_status(packet);
if ((conn->bonding_flags & BONDING_DEDICATED) != 0){
conn->bonding_flags &= ~BONDING_DEDICATED;
conn->bonding_flags |= BONDING_DISCONNECT_DEDICATED_DONE;
conn->bonding_status = status;
}
}
break;