Commit 863efaf2 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Add initial code for distributing local IRK 



This code adds a HCI_PRIVACY flag to track whether Privacy support is
enabled (meaning we have a local IRK) and makes sure the IRK is
distributed during SMP key distribution in case this flag is set.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 524237cb

include/net/bluetooth/hci.h

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ enum { 
	HCI_SSP_ENABLED,

	HCI_SC_ENABLED,

	HCI_SC_ONLY,

	HCI_PRIVACY,

	HCI_RPA_RESOLVING,

	HCI_HS_ENABLED,

	HCI_LE_ENABLED,

include/net/bluetooth/hci_core.h

+2 −0
Original line number Diff line number Diff line
@@ -303,6 +303,8 @@ struct hci_dev { 
	__u8			scan_rsp_data[HCI_MAX_AD_LENGTH];

	__u8			scan_rsp_data_len;



	__u8			irk[16];



	int (*open)(struct hci_dev *hdev);

	int (*close)(struct hci_dev *hdev);

	int (*flush)(struct hci_dev *hdev);

net/bluetooth/smp.c

+4 −2
Original line number Diff line number Diff line
@@ -265,6 +265,9 @@ static void build_pairing_cmd(struct l2cap_conn *conn, 
	if (test_bit(HCI_RPA_RESOLVING, &hdev->dev_flags))

		remote_dist |= SMP_DIST_ID_KEY;



	if (test_bit(HCI_PRIVACY, &hdev->dev_flags))

		local_dist |= SMP_DIST_ID_KEY;



	if (rsp == NULL) {

		req->io_capability = conn->hcon->io_capability;

		req->oob_flag = SMP_OOB_NOT_PRESENT;
@@ -1189,8 +1192,7 @@ int smp_distribute_keys(struct l2cap_conn *conn, __u8 force) 
		struct smp_cmd_ident_addr_info addrinfo;

		struct smp_cmd_ident_info idinfo;



		/* Send a dummy key */

		get_random_bytes(idinfo.irk, sizeof(idinfo.irk));

		memcpy(idinfo.irk, hdev->irk, sizeof(idinfo.irk));



		smp_send_cmd(conn, SMP_CMD_IDENT_INFO, sizeof(idinfo), &idinfo);

CRA Git | Maintained and supported by SUSTech CRA and CCSE