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

Commit 1a8bab4f authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Track local vs remote OOB data availability 



There are several decisions in the SMP logic that depend not only on
whether we're doing SMP or not, but also whether local and/or remote OOB
data is present. This patch splits the existing SMP_FLAG_OOB into two
new flags to track local and remote OOB data respectively.

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

net/bluetooth/smp.c

+6 −4
Original line number Diff line number Diff line
@@ -70,7 +70,8 @@ enum { 
	SMP_FLAG_DEBUG_KEY,

	SMP_FLAG_WAIT_USER,

	SMP_FLAG_DHKEY_PENDING,

	SMP_FLAG_OOB,

	SMP_FLAG_REMOTE_OOB,

	SMP_FLAG_LOCAL_OOB,

};



struct smp_dev {
@@ -680,7 +681,7 @@ static void build_pairing_cmd(struct l2cap_conn *conn, 
		oob_data = hci_find_remote_oob_data(hdev, &hcon->dst,

						    bdaddr_type);

		if (oob_data && oob_data->present) {

			set_bit(SMP_FLAG_OOB, &smp->flags);

			set_bit(SMP_FLAG_REMOTE_OOB, &smp->flags);

			oob_flag = SMP_OOB_PRESENT;

			memcpy(smp->rr, oob_data->rand256, 16);

			memcpy(smp->pcnf, oob_data->hash256, 16);
@@ -1820,7 +1821,7 @@ static u8 sc_send_public_key(struct smp_chan *smp) 


	BT_DBG("");



	if (test_bit(SMP_FLAG_OOB, &smp->flags)) {

	if (test_bit(SMP_FLAG_LOCAL_OOB, &smp->flags)) {

		struct l2cap_chan *chan = hdev->smp_data;

		struct smp_dev *smp_dev;
@@ -2453,7 +2454,8 @@ static u8 sc_select_method(struct smp_chan *smp) 
	struct smp_cmd_pairing *local, *remote;

	u8 local_mitm, remote_mitm, local_io, remote_io, method;



	if (test_bit(SMP_FLAG_OOB, &smp->flags))

	if (test_bit(SMP_FLAG_REMOTE_OOB, &smp->flags) ||

	    test_bit(SMP_FLAG_LOCAL_OOB, &smp->flags))

		return REQ_OOB;



	/* The preq/prsp contain the raw Pairing Request/Response PDUs