espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 10:47:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

ble_mesh: fix rejecting invalid remote public key

Browse Source
This commit is contained in:
lly
2019-09-02 14:40:28 +08:00
parent d123f6c04b
commit 299c86cc84
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
components/bt/esp_ble_mesh/mesh_core/prov.c
View File

@ -937,6 +937,20 @@ static void send_pub_key(void)
PROV_BUF(buf, 65); PROV_BUF(buf, 65);
const u8_t *key; const u8_t *key;
/* Copy remote key in little-endian for bt_mesh_dh_key_gen().
* X and Y halves are swapped independently. Use response
* buffer as a temporary storage location. The validating of
* the remote public key is finished when it is received.
*/
sys_memcpy_swap(buf.data, &link.conf_inputs[17], 32);
sys_memcpy_swap(&buf.data[32], &link.conf_inputs[49], 32);
if (bt_mesh_dh_key_gen(buf.data, prov_dh_key_cb, 0)) {
BT_ERR("%s, Unable to generate DHKey", __func__);
prov_send_fail_msg(PROV_ERR_UNEXP_ERR);
return;
}
key = bt_mesh_pub_key_get(); key = bt_mesh_pub_key_get();
if (!key) { if (!key) {
BT_ERR("%s, No public key available", __func__); BT_ERR("%s, No public key available", __func__);
@ -954,18 +968,8 @@ static void send_pub_key(void)
memcpy(&link.conf_inputs[81], &buf.data[1], 64); memcpy(&link.conf_inputs[81], &buf.data[1], 64);
prov_send(&buf); if (prov_send(&buf)) {
BT_ERR("Failed to send Public Key");
/* Copy remote key in little-endian for bt_mesh_dh_key_gen().
* X and Y halves are swapped independently.
*/
net_buf_simple_reset(&buf);
sys_memcpy_swap(buf.data, &link.conf_inputs[17], 32);
sys_memcpy_swap(&buf.data[32], &link.conf_inputs[49], 32);
if (bt_mesh_dh_key_gen(buf.data, prov_dh_key_cb, 0)) {
BT_ERR("%s, Unable to generate DHKey", __func__);
prov_send_fail_msg(PROV_ERR_UNEXP_ERR);
return; return;
} }