espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-08-21 09:20:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

nimble/host/sm: rename BLE_SM_SC_LVL to BLE_SM_LVL

Browse Source 
This rename makes it consistent with Core specification Vol. 3,
part C, 10.2.1 LE security mode 1. This level specifies security
requirements for both SC and legacy pairing, not only SC.
Updated description of this setting.
This commit is contained in:
Krzysztof Kopyściński
2022-06-29 13:53:36 +02:00
committed by Szymon Janc
parent 55f1818d7d
commit acaa9351b1
8 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/host/src/ble_att_svr.c
+2 -2
View File
@@ -2500,7 +2500,7 @@ ble_att_svr_rx_notify(uint16_t conn_handle, struct os_mbuf **rxom)
/* All indications shall be confirmed, but only these with required
* security established shall be pass to application
*/
if (MYNEWT_VAL(BLE_SM_SC_LVL) >= 2 && !sec_state.encrypted) {
if (MYNEWT_VAL(BLE_SM_LVL) >= 2 && !sec_state.encrypted) {
return 0;
}
@@ -2591,7 +2591,7 @@ ble_att_svr_rx_indicate(uint16_t conn_handle, struct os_mbuf **rxom)
/* All indications shall be confirmed, but only these with required
* security established shall be pass to application
*/
if (MYNEWT_VAL(BLE_SM_SC_LVL) >= 2 && !sec_state.encrypted) {
if (MYNEWT_VAL(BLE_SM_LVL) >= 2 && !sec_state.encrypted) {
goto done;
}
nimble/host/src/ble_sm.c
+3 -3
View File
@@ -1737,10 +1737,10 @@ ble_sm_verify_auth_requirements(uint8_t cmd)
return false;
}
}
/* Fail if Secure Connections level forces MITM protection and remote does not
/* Fail if security level forces MITM protection and remote does not
* support it
*/
if (MYNEWT_VAL(BLE_SM_SC_LVL) >= 3 && !(cmd & BLE_SM_PAIR_AUTHREQ_MITM)) {
if (MYNEWT_VAL(BLE_SM_LVL) >= 3 && !(cmd & BLE_SM_PAIR_AUTHREQ_MITM)) {
return false;
}
return true;
@@ -1823,7 +1823,7 @@ ble_sm_pair_req_rx(uint16_t conn_handle, struct os_mbuf **om,
if (conn->bhc_flags & BLE_HS_CONN_F_MASTER) {
res->sm_err = BLE_SM_ERR_CMD_NOT_SUPP;
res->app_status = BLE_HS_SM_US_ERR(BLE_SM_ERR_CMD_NOT_SUPP);
} else if (MYNEWT_VAL(BLE_SM_SC_LVL) == 1) {
} else if (MYNEWT_VAL(BLE_SM_LVL) == 1) {
res->sm_err = BLE_SM_ERR_CMD_NOT_SUPP;
res->app_status = BLE_HS_SM_US_ERR(BLE_SM_ERR_CMD_NOT_SUPP);
} else if (req->max_enc_key_size < BLE_SM_PAIR_KEY_SZ_MIN) {
nimble/host/syscfg.yml
+3 -2
View File
@@ -108,7 +108,7 @@ syscfg.defs:
- 'BLE_SM_SC if 1'
- '!BLE_SM_LEGACY if 1'
BLE_SM_SC_LVL:
BLE_SM_LVL:
description: >
Force global Secure Connections mode 1 level. This level
describes requirements for pairing response/request received
@@ -117,7 +117,8 @@ syscfg.defs:
authentication requirements is granted
- 2 - allow to pair despite MITM being on or off
- 3 - allow to pair only when MITM protection is on
- 4 - allow to pair only when 128 bit key is used and MITM is on
- 4 - allow to pair only with Secure Connections and
when 128 bit key is used and MITM is on
When set to 0 level is no forced and pairing is allowed for all
requests/responses with valid values (for example pairing will be
rejected with key longer than 128 bits). Successful pairing with
porting/examples/linux/include/syscfg/syscfg.h
+2 -2
View File
@@ -823,8 +823,8 @@
#define MYNEWT_VAL_BLE_SM_SC_DEBUG_KEYS (0)
#endif
#ifndef MYNEWT_VAL_BLE_SM_SC_LVL
#define MYNEWT_VAL_BLE_SM_SC_LVL (0)
#ifndef MYNEWT_VAL_BLE_SM_LVL
#define MYNEWT_VAL_BLE_SM_LVL (0)
#endif
#ifndef MYNEWT_VAL_BLE_SM_SC_ONLY
porting/examples/linux_blemesh/include/syscfg/syscfg.h
+2 -2
View File
@@ -826,8 +826,8 @@
#define MYNEWT_VAL_BLE_SM_SC_DEBUG_KEYS (0)
#endif
#ifndef MYNEWT_VAL_BLE_SM_SC_LVL
#define MYNEWT_VAL_BLE_SM_SC_LVL (0)
#ifndef MYNEWT_VAL_BLE_SM_LVL
#define MYNEWT_VAL_BLE_SM_LVL (0)
#endif
#ifndef MYNEWT_VAL_BLE_SM_SC_ONLY
porting/examples/nuttx/include/syscfg/syscfg.h
+2 -2
View File
@@ -825,8 +825,8 @@
#define MYNEWT_VAL_BLE_SM_SC_DEBUG_KEYS (0)
#endif
#ifndef MYNEWT_VAL_BLE_SM_SC_LVL
#define MYNEWT_VAL_BLE_SM_SC_LVL (0)
#ifndef MYNEWT_VAL_BLE_SM_LVL
#define MYNEWT_VAL_BLE_SM_LVL (0)
#endif
#ifndef MYNEWT_VAL_BLE_SM_SC_ONLY
porting/nimble/include/syscfg/syscfg.h
+2 -2
View File
@@ -822,8 +822,8 @@
#define MYNEWT_VAL_BLE_SM_SC_DEBUG_KEYS (0)
#endif
#ifndef MYNEWT_VAL_BLE_SM_SC_LVL
#define MYNEWT_VAL_BLE_SM_SC_LVL (0)
#ifndef MYNEWT_VAL_BLE_SM_LVL
#define MYNEWT_VAL_BLE_SM_LVL (0)
#endif
#ifndef MYNEWT_VAL_BLE_SM_SC_ONLY
porting/npl/riot/include/syscfg/syscfg.h
+2 -2
View File
@@ -1584,8 +1584,8 @@
#define MYNEWT_VAL_BLE_SM_SC_DEBUG_KEYS (0)
#endif
#ifndef MYNEWT_VAL_BLE_SM_SC_LVL
#define MYNEWT_VAL_BLE_SM_SC_LVL (0)
#ifndef MYNEWT_VAL_BLE_SM_LVL
#define MYNEWT_VAL_BLE_SM_LVL (0)
#endif
#ifndef MYNEWT_VAL_BLE_SM_SC_ONLY