OrgZephyr/zephyr
OrgZephyr
/
zephyr
mirror of https://github.com/zephyrproject-rtos/zephyr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Bluetooth: host: Elevate security to L4 when SC only is enabled 

Elevate connections always to security mode 1 level 4 when
Secure Connections Only Mode has been enabled in the Security Manager.

Elevate connections always to security mode 1 level 3 when
Legacy pairing with OOB only has been enabled in the Security Manager.

Fixes: #27338

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2020-08-03 12:54:22 +02:00 committed by Carles Cufí
parent 127e82e3b8
commit c7ad66157d
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/bluetooth/conn.h
View File

@ -705,6 +705,12 @@ typedef enum __packed {
* This function may return error if the pairing procedure has already been
* initiated by the local device or the peer device.
*
* @note When :option:`CONFIG_BT_SMP_SC_ONLY` is enabled then the security
* level will always be level 4.
*
* @note When :option:`CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY` is enabled then the
* security level will always be level 3.
*
* @param conn Connection object.
* @param sec Requested security level.
*

10
subsys/bluetooth/host/conn.c
View File

@ -828,14 +828,12 @@ int bt_conn_set_security(struct bt_conn *conn, bt_security_t sec)
return -ENOTCONN;
}
if (IS_ENABLED(CONFIG_BT_SMP_SC_ONLY) &&
sec < BT_SECURITY_L4) {
return -EOPNOTSUPP;
if (IS_ENABLED(CONFIG_BT_SMP_SC_ONLY)) {
sec = BT_SECURITY_L4;
}
if (IS_ENABLED(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY) &&
sec > BT_SECURITY_L3) {
return -EOPNOTSUPP;
if (IS_ENABLED(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)) {
sec = BT_SECURITY_L3;
}
/* nothing to do */