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

Commit aa5b0345 authored by Marcel Holtmann's avatar Marcel Holtmann
Browse files

Bluetooth: Check for P-256 OOB values in Secure Connections Only mode 



If Secure Connections Only mode has been enabled, the it is important
to check that OOB data for P-256 values is provided. In case it is not,
then tell the remote side that no OOB data is present.

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

net/bluetooth/hci_event.c

+13 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ 
#include "amp.h"

#include "smp.h"



#define ZERO_KEY "\x00\x00\x00\x00\x00\x00\x00\x00" \

		 "\x00\x00\x00\x00\x00\x00\x00\x00"



/* Handle HCI Event packets */



static void hci_cc_inquiry_cancel(struct hci_dev *hdev, struct sk_buff *skb)
@@ -3864,6 +3867,16 @@ static u8 bredr_oob_data_present(struct hci_conn *conn) 
	if (!data)

		return 0x00;



	/* When Secure Connections Only mode is enabled, then the P-256

	 * values are required. If they are not available, then do not

	 * declare that OOB data is present.

	 */

	if (bredr_sc_enabled(hdev) &&

	    test_bit(HCI_SC_ONLY, &hdev->dev_flags) &&

	    (!memcmp(data->rand256, ZERO_KEY, 16) ||

	     !memcmp(data->hash256, ZERO_KEY, 16)))

		return 0x00;



	if (conn->out || test_bit(HCI_CONN_REMOTE_OOB, &conn->flags))

		return 0x01;