evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bluetooth: Provide remote OOB data for Secure Connections

Browse source 
When Secure Connections has been enabled it is possible to provide P-192
and/or P-256 data during the pairing process. The internal out-of-band
credentials storage has been extended to also hold P-256 data.

Initially the P-256 data will be empty and with Secure Connections enabled
no P-256 data will be provided. This is according to the specification
since it might be possible that the remote side did not provide either
of the out-of-band credentials.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Marcel Holtmann 2014-01-10 02:07:28 -08:00 • committed by Johan Hedberg
parent 5afeac149e
commit 519ca9d017
3 changed files with 31 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/net/bluetooth/hci_core.h
View file

@ -114,8 +114,10 @@ struct link_key {
struct oob_data { struct oob_data {
struct list_head list; struct list_head list;
bdaddr_t bdaddr; bdaddr_t bdaddr;
u8 hash[16]; u8 hash192[16];
u8 randomizer[16]; u8 randomizer192[16];
u8 hash256[16];
u8 randomizer256[16];
}; };
#define HCI_MAX_SHORT_NAME_LENGTH 10 #define HCI_MAX_SHORT_NAME_LENGTH 10

6
net/bluetooth/hci_core.c
View file

@ -2802,7 +2802,7 @@ int hci_add_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 *hash,
data = hci_find_remote_oob_data(hdev, bdaddr); data = hci_find_remote_oob_data(hdev, bdaddr);
if (!data) { if (!data) {
data = kmalloc(sizeof(*data), GFP_ATOMIC); data = kzalloc(sizeof(*data), GFP_ATOMIC);
if (!data) if (!data)
return -ENOMEM; return -ENOMEM;
@ -2810,8 +2810,8 @@ int hci_add_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 *hash,
list_add(&data->list, &hdev->remote_oob_data); list_add(&data->list, &hdev->remote_oob_data);
} }
memcpy(data->hash, hash, sizeof(data->hash)); memcpy(data->hash192, hash, sizeof(data->hash192));
memcpy(data->randomizer, randomizer, sizeof(data->randomizer)); memcpy(data->randomizer192, randomizer, sizeof(data->randomizer192));
BT_DBG("%s for %pMR", hdev->name, bdaddr); BT_DBG("%s for %pMR", hdev->name, bdaddr);

32
net/bluetooth/hci_event.c
View file

@ -3391,20 +3391,36 @@ static void hci_remote_oob_data_request_evt(struct hci_dev *hdev,
data = hci_find_remote_oob_data(hdev, &ev->bdaddr); data = hci_find_remote_oob_data(hdev, &ev->bdaddr);
if (data) { if (data) {
struct hci_cp_remote_oob_data_reply cp; if (test_bit(HCI_SC_ENABLED, &hdev->dev_flags)) {
struct hci_cp_remote_oob_ext_data_reply cp;
bacpy(&cp.bdaddr, &ev->bdaddr); bacpy(&cp.bdaddr, &ev->bdaddr);
memcpy(cp.hash, data->hash, sizeof(cp.hash)); memcpy(cp.hash192, data->hash192, sizeof(cp.hash192));
memcpy(cp.randomizer, data->randomizer, sizeof(cp.randomizer)); memcpy(cp.randomizer192, data->randomizer192,
sizeof(cp.randomizer192));
memcpy(cp.hash256, data->hash256, sizeof(cp.hash256));
memcpy(cp.randomizer256, data->randomizer256,
sizeof(cp.randomizer256));
hci_send_cmd(hdev, HCI_OP_REMOTE_OOB_DATA_REPLY, sizeof(cp), hci_send_cmd(hdev, HCI_OP_REMOTE_OOB_EXT_DATA_REPLY,
&cp); sizeof(cp), &cp);
} else {
struct hci_cp_remote_oob_data_reply cp;
bacpy(&cp.bdaddr, &ev->bdaddr);
memcpy(cp.hash, data->hash192, sizeof(cp.hash));
memcpy(cp.randomizer, data->randomizer192,
sizeof(cp.randomizer));
hci_send_cmd(hdev, HCI_OP_REMOTE_OOB_DATA_REPLY,
sizeof(cp), &cp);
}
} else { } else {
struct hci_cp_remote_oob_data_neg_reply cp; struct hci_cp_remote_oob_data_neg_reply cp;
bacpy(&cp.bdaddr, &ev->bdaddr); bacpy(&cp.bdaddr, &ev->bdaddr);
hci_send_cmd(hdev, HCI_OP_REMOTE_OOB_DATA_NEG_REPLY, sizeof(cp), hci_send_cmd(hdev, HCI_OP_REMOTE_OOB_DATA_NEG_REPLY,
&cp); sizeof(cp), &cp);
} }
unlock: unlock: