patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

Bluetooth: host: Fix SMP local keys check when starting encryption

Browse source 
Fix SMP check of existing local keys when attempting to start security
with required security mode 1 level 4. The logic for checking the
conditions was wrong, leading to a situation where encryption would be
attempted to be started by the central instead of initiating a new
pairing procedure. This would fail when the connection was encrypted and
the connection would be disconnected.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2022-08-05 10:50:47 +02:00 committed by Carles Cufí
parent 42e372fc3e
commit 83d5402fe8
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
subsys/bluetooth/host/smp.c
View file

@ -357,15 +357,15 @@ static bool smp_keys_check(struct bt_conn *conn)
return false;
}
if (conn->required_sec_level > BT_SECURITY_L2 &&
if (conn->required_sec_level >= BT_SECURITY_L3 &&
!(conn->le.keys->flags & BT_KEYS_AUTHENTICATED)) {
return false;
}
if (conn->required_sec_level > BT_SECURITY_L3 &&
!(conn->le.keys->flags & BT_KEYS_AUTHENTICATED) &&
!(conn->le.keys->keys & BT_KEYS_LTK_P256) &&
!(conn->le.keys->enc_size == BT_SMP_MAX_ENC_KEY_SIZE)) {
if (conn->required_sec_level >= BT_SECURITY_L4 &&
!((conn->le.keys->flags & BT_KEYS_AUTHENTICATED) &&
(conn->le.keys->keys & BT_KEYS_LTK_P256) &&
(conn->le.keys->enc_size == BT_SMP_MAX_ENC_KEY_SIZE))) {
return false;
}