forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bluetooth: Add flag to track STK encryption

Browse source 
There are certain subtle differences in behavior when we're encrypted
with the STK, such as allowing re-encryption even though the security
level stays the same. Because of this, add a flag to track whether we're
encrypted with an STK or not.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Johan Hedberg 2014-07-01 19:14:12 +03:00 • committed by Marcel Holtmann
commit fe59a05f94
3 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/net/bluetooth/hci_core.h
View file

@ -536,6 +536,7 @@ enum {
HCI_CONN_AUTH, HCI_CONN_AUTH,
HCI_CONN_SECURE, HCI_CONN_SECURE,
HCI_CONN_FIPS, HCI_CONN_FIPS,
HCI_CONN_STK_ENCRYPT,
}; };
static inline bool hci_conn_ssp_enabled(struct hci_conn *conn) static inline bool hci_conn_ssp_enabled(struct hci_conn *conn)

3
net/bluetooth/hci_event.c
View file

@ -4365,8 +4365,11 @@ static void hci_le_ltk_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
* using a distributed LTK. * using a distributed LTK.
*/ */
if (ltk->type == SMP_STK) { if (ltk->type == SMP_STK) {
set_bit(HCI_CONN_STK_ENCRYPT, &conn->flags);
list_del(&ltk->list); list_del(&ltk->list);
kfree(ltk); kfree(ltk);
} else {
clear_bit(HCI_CONN_STK_ENCRYPT, &conn->flags);
} }
hci_dev_unlock(hdev); hci_dev_unlock(hdev);

4
net/bluetooth/smp.c
View file

@ -538,6 +538,7 @@ static u8 smp_random(struct smp_chan *smp)
hci_le_start_enc(hcon, ediv, rand, stk); hci_le_start_enc(hcon, ediv, rand, stk);
hcon->enc_key_size = smp->enc_key_size; hcon->enc_key_size = smp->enc_key_size;
set_bit(HCI_CONN_STK_ENCRYPT, &hcon->flags);
} else { } else {
u8 stk[16], auth; u8 stk[16], auth;
__le64 rand = 0; __le64 rand = 0;
@ -856,6 +857,9 @@ static bool smp_ltk_encrypt(struct l2cap_conn *conn, u8 sec_level)
hci_le_start_enc(hcon, key->ediv, key->rand, key->val); hci_le_start_enc(hcon, key->ediv, key->rand, key->val);
hcon->enc_key_size = key->enc_size; hcon->enc_key_size = key->enc_size;
/* We never store STKs for master role, so clear this flag */
clear_bit(HCI_CONN_STK_ENCRYPT, &hcon->flags);
return true; return true;
} }