Revert "Bluetooth: Avoid re-authentication for secure high connections"

This reverts commit 45c9e8141e54a691180c55ed9e242302a74224a8.

Change-Id: Iee644f37c2108013654e99d82f63101db3da009e
Signed-off-by: Bhakthavatsala Raghavendra <braghave@codeaurora.org>
This commit is contained in:
Bhakthavatsala Raghavendra 2013-02-13 13:27:45 +05:30 committed by Iliyan Malchev
parent 296f7ed251
commit 30c3f2ef61

View file

@ -2669,6 +2669,12 @@ static inline void hci_link_key_request_evt(struct hci_dev *hdev, struct sk_buff
BT_DBG("Conn pending sec level is %d, ssp is %d, key len is %d",
conn->pending_sec_level, conn->ssp_mode, key->pin_len);
}
if (conn && (conn->ssp_mode == 0) &&
(conn->pending_sec_level == BT_SECURITY_VERY_HIGH) &&
(key->pin_len != 16)) {
BT_DBG("Security is high ignoring this key");
goto not_found;
}
if (key->key_type == 0x04 && conn && conn->auth_type != 0xff &&
(conn->auth_type & 0x01)) {