michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: Provisioning output count number should be at least 1

Browse source 
When selecting a random count for blink, beep or vibrate, the Bluetooth
Mesh Profile Specification v1.0.1, section 5.4.2.4 states: "the device
shall select a random integer between 0 and 10 to the power of the
Authentication Size exclusive".

This means that if size is 1, the integer should be in the range 1-9,
while the implementation chose an integer in the range 0-9. Reduce the
range and add 1 to the num to correct this for these actions.

Fixes #34209.

Signed-off-by: Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no>
This commit is contained in:
Trond Einar Snekvik 2021-04-13 09:11:47 +02:00 • committed by Carles Cufí
commit 3656f7f609
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
subsys/bluetooth/mesh/prov.c
View file

@ -171,7 +171,19 @@ int bt_mesh_prov_auth(uint8_t method, uint8_t action, uint8_t size)
uint32_t num; uint32_t num;
bt_rand(&num, sizeof(num)); bt_rand(&num, sizeof(num));
num %= div[size - 1];
if (output == BT_MESH_BLINK ||
output == BT_MESH_BEEP ||
output == BT_MESH_VIBRATE) {
/* According to the Bluetooth Mesh Profile
* Specification Section 5.4.2.4, blink, beep
* and vibrate should be a random integer
* between 0 and 10^size, *exclusive*:
*/
num = (num % (div[size - 1] - 1)) + 1;
} else {
num %= div[size - 1];
}
sys_put_be32(num, &bt_mesh_prov_link.auth[12]); sys_put_be32(num, &bt_mesh_prov_link.auth[12]);
(void)memset(bt_mesh_prov_link.auth, 0, 12); (void)memset(bt_mesh_prov_link.auth, 0, 12);