mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
Merge branch 'bugfix/endianness_in_output_or_input_oob_v4.3' into 'release/v4.3'
ble_mesh: stack: Fix endianness error in output or input oob data of number (v4.3) See merge request espressif/esp-idf!13254
This commit is contained in:
commit
83358061df
@ -2057,7 +2057,7 @@ int bt_mesh_provisioner_set_oob_input_data(const uint8_t idx, const uint8_t *val
|
|||||||
memset(link[idx].auth, 0, 16);
|
memset(link[idx].auth, 0, 16);
|
||||||
if (num_flag) {
|
if (num_flag) {
|
||||||
/* Provisioner inputs number */
|
/* Provisioner inputs number */
|
||||||
memcpy(link[idx].auth + 12, val, sizeof(uint32_t));
|
sys_memcpy_swap(link[idx].auth + 12, val, sizeof(uint32_t));
|
||||||
} else {
|
} else {
|
||||||
/* Provisioner inputs string */
|
/* Provisioner inputs string */
|
||||||
memcpy(link[idx].auth, val, link[idx].auth_size);
|
memcpy(link[idx].auth, val, link[idx].auth_size);
|
||||||
@ -2094,7 +2094,7 @@ int bt_mesh_provisioner_set_oob_output_data(const uint8_t idx, const uint8_t *nu
|
|||||||
if (num_flag) {
|
if (num_flag) {
|
||||||
/* Provisioner output number */
|
/* Provisioner output number */
|
||||||
memset(link[idx].auth, 0, 16);
|
memset(link[idx].auth, 0, 16);
|
||||||
memcpy(link[idx].auth + 16 - size, num, size);
|
sys_memcpy_swap(link[idx].auth + 16 - size, num, size);
|
||||||
} else {
|
} else {
|
||||||
/* Provisioner output string */
|
/* Provisioner output string */
|
||||||
memset(link[idx].auth, 0, 16);
|
memset(link[idx].auth, 0, 16);
|
||||||
|
Loading…
Reference in New Issue
Block a user