Commit a6f7833c authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Add smp_ltk_sec_level() helper function 



There are several places that need to determine the security level that
an LTK can provide. This patch adds a convenience function for this to
help make the code more readable.

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

net/bluetooth/hci_event.c

+1 −4
Original line number Diff line number Diff line
@@ -4506,10 +4506,7 @@ static void hci_le_ltk_request_evt(struct hci_dev *hdev, struct sk_buff *skb) 
	memcpy(cp.ltk, ltk->val, sizeof(ltk->val));

	cp.handle = cpu_to_le16(conn->handle);



	if (ltk->authenticated)

		conn->pending_sec_level = BT_SECURITY_HIGH;

	else

		conn->pending_sec_level = BT_SECURITY_MEDIUM;

	conn->pending_sec_level = smp_ltk_sec_level(ltk);



	conn->enc_key_size = ltk->enc_size;

net/bluetooth/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -1114,7 +1114,7 @@ static bool smp_ltk_encrypt(struct l2cap_conn *conn, u8 sec_level) 
	if (!key)

		return false;



	if (sec_level > BT_SECURITY_MEDIUM && !key->authenticated)

	if (smp_ltk_sec_level(key) < sec_level)

		return false;



	if (test_and_set_bit(HCI_CONN_ENCRYPT_PEND, &hcon->flags))

net/bluetooth/smp.h

+8 −0
Original line number Diff line number Diff line
@@ -125,6 +125,14 @@ enum { 
	SMP_LTK_SLAVE,

};



static inline u8 smp_ltk_sec_level(struct smp_ltk *key)

{

	if (key->authenticated)

		return BT_SECURITY_HIGH;



	return BT_SECURITY_MEDIUM;

}



/* SMP Commands */

bool smp_sufficient_security(struct hci_conn *hcon, u8 sec_level);

int smp_conn_security(struct hci_conn *hcon, __u8 sec_level);