From 12a5026a382281a2d95375ef1f54c4121cb20b81 Mon Sep 17 00:00:00 2001 From: "h.sandeep" Date: Mon, 21 Nov 2016 16:44:42 +0530 Subject: [PATCH] Bluetooth: Fix IRK distribution issue when Privacy is disabled The devices, like Android 6.x, which don't support privacy 1.2 couldn't make BLE connection to the device which doesn't distribute IRK when pairing because they use use wrong address type. For compatibility, it needs to distribute IRK even though Privacy feature is disabled. So setting IRK interface is added and BlueZ will set IRK if privacy feature is disabled. And when BLE pairing, IRK will be always distributed. Change-Id: I6dbcef9663a1a0cb2b7db89cad6e725025e41fa1 Signed-off-by: h.sandeep --- net/bluetooth/smp.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index 1ab3dc9c8f99..1ad2643791f9 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c @@ -59,6 +59,11 @@ /* Maximum message length that can be passed to aes_cmac */ #define CMAC_MSG_MAX 80 +#ifdef TIZEN_BT +#define ZERO_KEY "\x00\x00\x00\x00\x00\x00\x00\x00" \ + "\x00\x00\x00\x00\x00\x00\x00\x00" +#endif + enum { SMP_FLAG_TK_VALID, SMP_FLAG_CFM_PENDING, @@ -660,8 +665,13 @@ static void build_pairing_cmd(struct l2cap_conn *conn, if (hci_dev_test_flag(hdev, HCI_RPA_RESOLVING)) remote_dist |= SMP_DIST_ID_KEY; +#ifdef TIZEN_BT + if (memcmp(hdev->irk, ZERO_KEY, 16)) + local_dist |= SMP_DIST_ID_KEY; +#else if (hci_dev_test_flag(hdev, HCI_PRIVACY)) local_dist |= SMP_DIST_ID_KEY; +#endif if (hci_dev_test_flag(hdev, HCI_SC_ENABLED) && (authreq & SMP_AUTH_SC)) { -- 2.34.1