Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 519ca9d0 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: Provide remote OOB data for Secure Connections 



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: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 5afeac14

include/net/bluetooth/hci_core.h

+4 −2
Original line number Diff line number Diff line
@@ -114,8 +114,10 @@ struct link_key { 
struct oob_data {

	struct list_head list;

	bdaddr_t bdaddr;

	u8 hash[16];

	u8 randomizer[16];

	u8 hash192[16];

	u8 randomizer192[16];

	u8 hash256[16];

	u8 randomizer256[16];

};



#define HCI_MAX_SHORT_NAME_LENGTH	10

net/bluetooth/hci_core.c

+3 −3
Original line number Diff line number Diff line
@@ -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);



	if (!data) {

		data = kmalloc(sizeof(*data), GFP_ATOMIC);

		data = kzalloc(sizeof(*data), GFP_ATOMIC);

		if (!data)

			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);

	}



	memcpy(data->hash, hash, sizeof(data->hash));

	memcpy(data->randomizer, randomizer, sizeof(data->randomizer));

	memcpy(data->hash192, hash, sizeof(data->hash192));

	memcpy(data->randomizer192, randomizer, sizeof(data->randomizer192));



	BT_DBG("%s for %pMR", hdev->name, bdaddr);

net/bluetooth/hci_event.c

+24 −8
Original line number Diff line number Diff line
@@ -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);

	if (data) {

		if (test_bit(HCI_SC_ENABLED, &hdev->dev_flags)) {

			struct hci_cp_remote_oob_ext_data_reply cp;



			bacpy(&cp.bdaddr, &ev->bdaddr);

			memcpy(cp.hash192, data->hash192, sizeof(cp.hash192));

			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_EXT_DATA_REPLY,

				     sizeof(cp), &cp);

		} else {

			struct hci_cp_remote_oob_data_reply cp;



			bacpy(&cp.bdaddr, &ev->bdaddr);

		memcpy(cp.hash, data->hash, sizeof(cp.hash));

		memcpy(cp.randomizer, data->randomizer, sizeof(cp.randomizer));

			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);

			hci_send_cmd(hdev, HCI_OP_REMOTE_OOB_DATA_REPLY,

				     sizeof(cp), &cp);

		}

	} else {

		struct hci_cp_remote_oob_data_neg_reply cp;



		bacpy(&cp.bdaddr, &ev->bdaddr);

		hci_send_cmd(hdev, HCI_OP_REMOTE_OOB_DATA_NEG_REPLY, sizeof(cp),

			     &cp);

		hci_send_cmd(hdev, HCI_OP_REMOTE_OOB_DATA_NEG_REPLY,

			     sizeof(cp), &cp);

	}



unlock: