From b54464ca655f93a396209e244911d9f2fcf8e3b3 Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Sat, 19 Jun 2021 17:57:37 +0200 Subject: [PATCH] hci: delete unused authentication flags --- src/hci.c | 9 --------- src/hci.h | 33 ++++++++++++++------------------- 2 files changed, 14 insertions(+), 28 deletions(-) diff --git a/src/hci.c b/src/hci.c index 45a9222e3..3a500636f 100644 --- a/src/hci.c +++ b/src/hci.c @@ -2693,7 +2693,6 @@ static void event_handler(uint8_t *packet, uint16_t size){ break; case HCI_EVENT_LINK_KEY_REQUEST: - hci_add_connection_flags_for_flipped_bd_addr(&packet[2], AUTH_FLAG_RECV_LINK_KEY_REQUEST); // request handled by hci_run() hci_add_connection_flags_for_flipped_bd_addr(&packet[2], AUTH_FLAG_HANDLE_LINK_KEY_REQUEST); break; @@ -2705,7 +2704,6 @@ static void event_handler(uint8_t *packet, uint16_t size){ hci_pairing_complete(conn, ERROR_CODE_SUCCESS); - conn->authentication_flags |= AUTH_FLAG_RECV_LINK_KEY_NOTIFICATION; link_key_type_t link_key_type = (link_key_type_t)packet[24]; // Change Connection Encryption keeps link key type if (link_key_type != CHANGED_COMBINATION_KEY){ @@ -2761,7 +2759,6 @@ static void event_handler(uint8_t *packet, uint16_t size){ conn = hci_connection_for_bd_addr_and_type(addr, BD_ADDR_TYPE_ACL); if (!conn) break; - hci_add_connection_flags_for_flipped_bd_addr(&packet[2], AUTH_FLAG_RECV_IO_CAPABILITIES_REQUEST); hci_pairing_started(conn, true); #ifndef ENABLE_EXPLICIT_IO_CAPABILITIES_REPLY if (hci_stack->ssp_io_capability != SSP_IO_CAPABILITY_UNKNOWN){ @@ -4969,12 +4966,6 @@ int hci_send_cmd_packet(uint8_t *packet, int size){ hci_stack->outgoing_addr_type = BD_ADDR_TYPE_ACL; (void) memcpy(hci_stack->outgoing_addr, addr, 6); break; - case HCI_OPCODE_HCI_LINK_KEY_REQUEST_REPLY: - hci_add_connection_flags_for_flipped_bd_addr(&packet[3], AUTH_FLAG_SENT_LINK_KEY_REPLY); - break; - case HCI_OPCODE_HCI_LINK_KEY_REQUEST_NEGATIVE_REPLY: - hci_add_connection_flags_for_flipped_bd_addr(&packet[3], AUTH_FLAG_SENT_LINK_KEY_NEGATIVE_REQUEST); - break; case HCI_OPCODE_HCI_DELETE_STORED_LINK_KEY: if (hci_stack->link_key_db) { reverse_bd_addr(&packet[3], addr); diff --git a/src/hci.h b/src/hci.h index adc0f4897..866cd29fd 100644 --- a/src/hci.h +++ b/src/hci.h @@ -199,34 +199,29 @@ typedef enum { // Authentication flags typedef enum { AUTH_FLAG_NONE = 0x0000, - AUTH_FLAG_RECV_LINK_KEY_REQUEST = 0x0001, - AUTH_FLAG_HANDLE_LINK_KEY_REQUEST = 0x0002, - AUTH_FLAG_SENT_LINK_KEY_REPLY = 0x0004, - AUTH_FLAG_SENT_LINK_KEY_NEGATIVE_REQUEST = 0x0008, - AUTH_FLAG_RECV_LINK_KEY_NOTIFICATION = 0x0010, - AUTH_FLAG_DENY_PIN_CODE_REQUEST = 0x0040, - AUTH_FLAG_RECV_IO_CAPABILITIES_REQUEST = 0x0080, - AUTH_FLAG_RECV_IO_CAPABILITIES_RESPONSE = 0x0100, - AUTH_FLAG_SEND_IO_CAPABILITIES_REPLY = 0x0200, - AUTH_FLAG_SEND_IO_CAPABILITIES_NEGATIVE_REPLY = 0x0400, - AUTH_FLAG_SEND_USER_CONFIRM_REPLY = 0x0800, - AUTH_FLAG_SEND_USER_PASSKEY_REPLY = 0x1000, + AUTH_FLAG_HANDLE_LINK_KEY_REQUEST = 0x0001, + AUTH_FLAG_DENY_PIN_CODE_REQUEST = 0x0002, + AUTH_FLAG_RECV_IO_CAPABILITIES_RESPONSE = 0x0004, + AUTH_FLAG_SEND_IO_CAPABILITIES_REPLY = 0x0008, + AUTH_FLAG_SEND_IO_CAPABILITIES_NEGATIVE_REPLY = 0x0010, + AUTH_FLAG_SEND_USER_CONFIRM_REPLY = 0x0020, + AUTH_FLAG_SEND_USER_PASSKEY_REPLY = 0x0040, // Classic OOB - AUTH_FLAG_SEND_REMOTE_OOB_DATA_REPLY = 0x2000, + AUTH_FLAG_SEND_REMOTE_OOB_DATA_REPLY = 0x0080, // pairing status - AUTH_FLAG_LEGACY_PAIRING_ACTIVE = 0x4000, - AUTH_FLAG_SSP_PAIRING_ACTIVE = 0x8000, + AUTH_FLAG_LEGACY_PAIRING_ACTIVE = 0x0100, + AUTH_FLAG_SSP_PAIRING_ACTIVE = 0x0200, AUTH_FLAG_PAIRING_ACTIVE_MASK = (AUTH_FLAG_LEGACY_PAIRING_ACTIVE | AUTH_FLAG_SSP_PAIRING_ACTIVE), // connection status - AUTH_FLAG_CONNECTION_AUTHENTICATED = 0x10000, - AUTH_FLAG_CONNECTION_ENCRYPTED = 0x20000, + AUTH_FLAG_CONNECTION_AUTHENTICATED = 0x0400, + AUTH_FLAG_CONNECTION_ENCRYPTED = 0x0800, // errands - AUTH_FLAG_READ_RSSI = 0x40000, - AUTH_FLAG_WRITE_SUPERVISION_TIMEOUT = 0x80000, + AUTH_FLAG_READ_RSSI = 0x1000, + AUTH_FLAG_WRITE_SUPERVISION_TIMEOUT = 0x2000, } hci_authentication_flags_t;