michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Fix not reseting required security in case of error

Browse source 
If bt_conn_security failed required security level should be set
back to current security. Otherwise it might not be possible to
try later on with lower security.

Change-Id: I3ad7151f2cdff15147b9948bbdab516b8cc16ce2
Signed-off-by: Szymon Janc <ext.szymon.janc@tieto.com>
This commit is contained in:
Szymon Janc 2015-10-07 17:09:24 +02:00 • committed by Anas Nashif
commit 0fe883ccb1
1 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
net/bluetooth/conn.c
View file

@ -156,6 +156,8 @@ int bt_conn_le_start_encryption(struct bt_conn *conn, uint64_t rand,
int bt_conn_security(struct bt_conn *conn, bt_security_t sec)
{
int err = 0;
if (conn->state != BT_CONN_CONNECTED) {
return -ENOTCONN;
}
@ -180,23 +182,32 @@ int bt_conn_security(struct bt_conn *conn, bt_security_t sec)
if (keys) {
if (sec > BT_SECURITY_MEDIUM &&
keys->type != BT_KEYS_AUTHENTICATED) {
return bt_smp_send_pairing_req(conn);
err = bt_smp_send_pairing_req(conn);
goto done;
}
return bt_conn_le_start_encryption(conn, keys->ltk.rand,
keys->ltk.ediv,
keys->ltk.val);
err = bt_conn_le_start_encryption(conn, keys->ltk.rand,
keys->ltk.ediv,
keys->ltk.val);
goto done;
}
return bt_smp_send_pairing_req(conn);
err = bt_smp_send_pairing_req(conn);
goto done;
}
#endif /* CONFIG_BLUETOOTH_CENTRAL */
#if defined(CONFIG_BLUETOOTH_PERIPHERAL)
return bt_smp_send_security_req(conn);
#else
return -EIO;
err = bt_smp_send_security_req(conn);
#endif /* CONFIG_BLUETOOTH_PERIPHERAL */
done:
/* reset required security level in case of error */
if (err) {
conn->required_sec_level = conn->sec_level;
}
return err;
}
#endif /* CONFIG_BLUETOOTH_SMP */