korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-12-26 20:33:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

android/hid: Force encryption for keyboards

Browse Source 
Encryption is mandatory for keyboards. Instead of using hardcoded security
level it's now set per device (with LOW as default) and raised for
keyboards (after the SDP query is done). This level is then used to
establish outgoing connections and raising the security level of the
incomming ones.
This commit is contained in:
Jakub Tyszkowski 2014-08-25 14:54:19 +02:00 committed by Luiz Augusto von Dentz
parent 36bb67a400
commit 2884336bac
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
android/hidhost.c
View File

@ -110,6 +110,7 @@ struct hid_device {
uint8_t last_hid_msg;
struct bt_hog *hog;
guint reconnect_id;
int sec_level;
};
static int device_cmp(gconstpointer s, gconstpointer user_data)
@ -162,6 +163,8 @@ static struct hid_device *hid_device_new(const bdaddr_t *addr)
dev = g_new0(struct hid_device, 1);
bacpy(&dev->dst, addr);
dev->state = HAL_HIDHOST_STATE_DISCONNECTED;
dev->sec_level = BT_IO_SEC_LOW;
devices = g_slist_append(devices, dev);
return dev;
@ -594,7 +597,7 @@ static void control_connect_cb(GIOChannel *chan, GError *conn_err,
BT_IO_OPT_SOURCE_BDADDR, &adapter_addr,
BT_IO_OPT_DEST_BDADDR, &dev->dst,
BT_IO_OPT_PSM, L2CAP_PSM_HIDP_INTR,
BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_LOW,
BT_IO_OPT_SEC_LEVEL, dev->sec_level,
BT_IO_OPT_INVALID);
if (!dev->intr_io) {
error("hidhost: Failed to connect interrupt channel (%s)",
@ -640,9 +643,14 @@ static void hid_sdp_search_cb(sdp_list_t *recs, int err, gpointer data)
dev->country = data->val.uint8;
data = sdp_data_get(rec, SDP_ATTR_HID_DEVICE_SUBCLASS);
if (data)
if (data) {
dev->subclass = data->val.uint8;
/* Encryption is mandatory for keyboards */
if (dev->subclass & 0x40)
dev->sec_level = BT_IO_SEC_MEDIUM;
}
data = sdp_data_get(rec, SDP_ATTR_HID_BOOT_DEVICE);
if (data)
dev->boot_dev = data->val.uint8;
@ -673,6 +681,18 @@ static void hid_sdp_search_cb(sdp_list_t *recs, int err, gpointer data)
}
if (dev->ctrl_io) {
/* Raise the security level for this device if needed. */
if ((dev->sec_level > BT_IO_SEC_LOW) &&
!bt_io_set(dev->ctrl_io, &gerr,
BT_IO_OPT_SEC_LEVEL, dev->sec_level,
BT_IO_OPT_INVALID)) {
error("hidhost: Cannot raise security level: %s",
gerr->message);
g_error_free(gerr);
goto fail;
}
if (uhid_create(dev) < 0)
goto fail;
return;
@ -682,7 +702,7 @@ static void hid_sdp_search_cb(sdp_list_t *recs, int err, gpointer data)
BT_IO_OPT_SOURCE_BDADDR, &adapter_addr,
BT_IO_OPT_DEST_BDADDR, &dev->dst,
BT_IO_OPT_PSM, L2CAP_PSM_HIDP_CTRL,
BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_LOW,
BT_IO_OPT_SEC_LEVEL, dev->sec_level,
BT_IO_OPT_INVALID);
if (gerr) {
error("hidhost: Failed to connect control channel (%s)",