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

hci: move dedicated bonding into hci_handle_mutual_authentication_completed

Browse Source
This commit is contained in:
Matthias Ringwald 2023-05-10 15:56:33 +02:00
parent 4aa2f135a0
commit 67718330f1
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/hci.c
View File

@ -2567,14 +2567,8 @@ static void hci_handle_mutual_authentication_completed(hci_connection_t * conn){
conn->requested_security_level = LEVEL_0; conn->requested_security_level = LEVEL_0;
gap_security_level_t security_level = gap_security_level_for_connection(conn); gap_security_level_t security_level = gap_security_level_for_connection(conn);
hci_emit_security_level(conn->con_handle, security_level); hci_emit_security_level(conn->con_handle, security_level);
}
static void hci_handle_read_encryption_key_size_complete(hci_connection_t * conn, uint8_t encryption_key_size) { // dedicated bonding
conn->authentication_flags |= AUTH_FLAG_CONNECTION_ENCRYPTED;
conn->encryption_key_size = encryption_key_size;
gap_security_level_t security_level = gap_security_level_for_connection(conn);
// trigger disconnect for dedicated bonding, skip emit security level as disconnect is pending
if ((conn->bonding_flags & BONDING_DEDICATED) != 0){ if ((conn->bonding_flags & BONDING_DEDICATED) != 0){
conn->bonding_flags &= ~BONDING_DEDICATED; conn->bonding_flags &= ~BONDING_DEDICATED;
conn->bonding_status = security_level == 0 ? ERROR_CODE_INSUFFICIENT_SECURITY : ERROR_CODE_SUCCESS; conn->bonding_status = security_level == 0 ? ERROR_CODE_INSUFFICIENT_SECURITY : ERROR_CODE_SUCCESS;
@ -2584,10 +2578,15 @@ static void hci_handle_read_encryption_key_size_complete(hci_connection_t * conn
#else #else
// request disconnect, event is emitted after disconnect // request disconnect, event is emitted after disconnect
conn->bonding_flags |= BONDING_DISCONNECT_DEDICATED_DONE; conn->bonding_flags |= BONDING_DISCONNECT_DEDICATED_DONE;
return;
#endif #endif
} }
}
static void hci_handle_read_encryption_key_size_complete(hci_connection_t * conn, uint8_t encryption_key_size) {
conn->authentication_flags |= AUTH_FLAG_CONNECTION_ENCRYPTED;
conn->encryption_key_size = encryption_key_size;
// mutual authentication complete if authenticated and we have retrieved the encryption key size
if ((conn->authentication_flags & AUTH_FLAG_CONNECTION_AUTHENTICATED) != 0) { if ((conn->authentication_flags & AUTH_FLAG_CONNECTION_AUTHENTICATED) != 0) {
hci_handle_mutual_authentication_completed(conn); hci_handle_mutual_authentication_completed(conn);
} else { } else {