Bluetooth: Use the updated key structures for handling LTKs
This updates all the users of the older way, that was using the link_keys list to store the SMP keys, to use the new way. This includes defining new types for the keys, we have a type for each combination of STK/LTK and Master/Slave. Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@openbossa.org> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
committed by
Johan Hedberg
parent
b899efaf9b
commit
c9839a11c0
@@ -3256,7 +3256,7 @@ static inline void hci_le_ltk_request_evt(struct hci_dev *hdev,
|
||||
struct hci_cp_le_ltk_reply cp;
|
||||
struct hci_cp_le_ltk_neg_reply neg;
|
||||
struct hci_conn *conn;
|
||||
struct link_key *ltk;
|
||||
struct smp_ltk *ltk;
|
||||
|
||||
BT_DBG("%s handle %d", hdev->name, cpu_to_le16(ev->handle));
|
||||
|
||||
@@ -3272,10 +3272,17 @@ static inline void hci_le_ltk_request_evt(struct hci_dev *hdev,
|
||||
|
||||
memcpy(cp.ltk, ltk->val, sizeof(ltk->val));
|
||||
cp.handle = cpu_to_le16(conn->handle);
|
||||
conn->pin_length = ltk->pin_len;
|
||||
|
||||
if (ltk->authenticated)
|
||||
conn->sec_level = BT_SECURITY_HIGH;
|
||||
|
||||
hci_send_cmd(hdev, HCI_OP_LE_LTK_REPLY, sizeof(cp), &cp);
|
||||
|
||||
if (ltk->type & HCI_SMP_STK) {
|
||||
list_del(<k->list);
|
||||
kfree(ltk);
|
||||
}
|
||||
|
||||
hci_dev_unlock(hdev);
|
||||
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user