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

Commit 81328d5c authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Unify remote OOB data functions 



There's no need to duplicate code for the 192 vs 192+256 variants of the
OOB data functions. This is also helpful to pave the way to support LE
SC OOB data where only 256 bit data is provided.

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

include/net/bluetooth/hci_core.h

+2 −4
Original line number Diff line number Diff line
@@ -944,8 +944,6 @@ void hci_remote_oob_data_clear(struct hci_dev *hdev); 
struct oob_data *hci_find_remote_oob_data(struct hci_dev *hdev,

					  bdaddr_t *bdaddr);

int hci_add_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr,

			    u8 *hash, u8 *rand);

int hci_add_remote_oob_ext_data(struct hci_dev *hdev, bdaddr_t *bdaddr,

			    u8 *hash192, u8 *rand192,

			    u8 *hash256, u8 *rand256);

int hci_remove_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr);

net/bluetooth/hci_core.c

+15 −31
Original line number Diff line number Diff line
@@ -3517,32 +3517,6 @@ void hci_remote_oob_data_clear(struct hci_dev *hdev) 
}



int hci_add_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr,

			    u8 *hash, u8 *rand)

{

	struct oob_data *data;



	data = hci_find_remote_oob_data(hdev, bdaddr);

	if (!data) {

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

		if (!data)

			return -ENOMEM;



		bacpy(&data->bdaddr, bdaddr);

		list_add(&data->list, &hdev->remote_oob_data);

	}



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

	memcpy(data->rand192, rand, sizeof(data->rand192));



	memset(data->hash256, 0, sizeof(data->hash256));

	memset(data->rand256, 0, sizeof(data->rand256));



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



	return 0;

}



int hci_add_remote_oob_ext_data(struct hci_dev *hdev, bdaddr_t *bdaddr,

			    u8 *hash192, u8 *rand192,

			    u8 *hash256, u8 *rand256)

{
@@ -3558,11 +3532,21 @@ int hci_add_remote_oob_ext_data(struct hci_dev *hdev, bdaddr_t *bdaddr, 
		list_add(&data->list, &hdev->remote_oob_data);

	}



	if (hash192 && rand192) {

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

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

	} else {

		memset(data->hash192, 0, sizeof(data->hash192));

		memset(data->rand192, 0, sizeof(data->rand192));

	}



	if (hash256 && rand256) {

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

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

	} else {

		memset(data->hash256, 0, sizeof(data->hash256));

		memset(data->rand256, 0, sizeof(data->rand256));

	}



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

net/bluetooth/mgmt.c

+5 −4
Original line number Diff line number Diff line
@@ -3599,7 +3599,8 @@ static int add_remote_oob_data(struct sock *sk, struct hci_dev *hdev, 
		}



		err = hci_add_remote_oob_data(hdev, &cp->addr.bdaddr,

					      cp->hash, cp->rand);

					      cp->hash, cp->rand,

					      NULL, NULL);

		if (err < 0)

			status = MGMT_STATUS_FAILED;

		else
@@ -3619,7 +3620,7 @@ static int add_remote_oob_data(struct sock *sk, struct hci_dev *hdev, 
			goto unlock;

		}



		err = hci_add_remote_oob_ext_data(hdev, &cp->addr.bdaddr,

		err = hci_add_remote_oob_data(hdev, &cp->addr.bdaddr,

					      cp->hash192, cp->rand192,

					      cp->hash256, cp->rand256);

		if (err < 0)