From 0226480ce16f3391f9ad4040c3e9291f19aa7203 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Thu, 30 Oct 2014 19:16:15 +0200 Subject: [PATCH] core: Always use extended remote_oob_data parameters This paves the way for the P-256 parameters and sending zero values for them is equal to using the non-extended version. --- lib/mgmt.h | 6 ++++-- src/adapter.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/mgmt.h b/lib/mgmt.h index 46766a96a..4cfeac0e5 100644 --- a/lib/mgmt.h +++ b/lib/mgmt.h @@ -284,8 +284,10 @@ struct mgmt_rp_read_local_oob_ext_data { #define MGMT_OP_ADD_REMOTE_OOB_DATA 0x0021 struct mgmt_cp_add_remote_oob_data { struct mgmt_addr_info addr; - uint8_t hash[16]; - uint8_t randomizer[16]; + uint8_t hash192[16]; + uint8_t rand192[16]; + uint8_t hash256[16]; + uint8_t rand256[16]; } __packed; #define MGMT_OP_REMOVE_REMOTE_OOB_DATA 0x0022 diff --git a/src/adapter.c b/src/adapter.c index 606affdfe..3f0ee86b2 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -6389,10 +6389,10 @@ int btd_adapter_add_remote_oob_data(struct btd_adapter *adapter, memset(&cp, 0, sizeof(cp)); bacpy(&cp.addr.bdaddr, bdaddr); - memcpy(cp.hash, hash, 16); + memcpy(cp.hash192, hash, 16); if (randomizer) - memcpy(cp.randomizer, randomizer, 16); + memcpy(cp.rand192, randomizer, 16); if (mgmt_send(adapter->mgmt, MGMT_OP_ADD_REMOTE_OOB_DATA, adapter->dev_id, sizeof(cp), &cp, -- 2.47.3