summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2015-01-27 16:04:33 -0800
committerMarcel Holtmann <marcel@holtmann.org>2015-01-28 21:26:21 +0100
commitaa5b03456500b57ab30313affa822d4cd90e2ab2 (patch)
treeb76f4ced72a0eadceac228a29446f983b28479c4 /net/bluetooth
parenta83ed81ef5881445d96120bea2032f72884fe038 (diff)
downloadop-kernel-dev-aa5b03456500b57ab30313affa822d4cd90e2ab2.zip
op-kernel-dev-aa5b03456500b57ab30313affa822d4cd90e2ab2.tar.gz
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: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/hci_event.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 8ed8516..00c1606 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -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;
OpenPOWER on IntegriCloud