michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: host: Fix LE SC OOB authentication and id for central role

Browse source 
If the application has used bt_le_oob_get_local to retrieve the OOB
RPA address and OOB authentication information the central role should
use this RPA address for the next RPA timeout period.

The central role always refreshes the RPA address for the initiator,
this will make the OOB information not usable as the peer cannot
recognize the central role since the RPA address is changed.
Check if the initiator can use the address for the duration of the of
remaining RPA period.

Fix central role using the advertiser identity when setting the private
address. The central role should only use the default identity.

Regressions from:
fbe3285bfa
and
4876a8f39a

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2020-03-06 12:13:44 +01:00 • committed by Johan Hedberg
commit bb42abdd7c
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
subsys/bluetooth/host/hci_core.c
View file

@ -573,7 +573,7 @@ static void le_update_private_addr(void)
/* If both advertiser and scanner is running then the advertiser ID must
* be BT_ID_DEFAULT, this will update the RPA address for both roles.
*/
err = le_set_private_addr(bt_dev.adv_id);
err = le_set_private_addr(adv_enabled ? bt_dev.adv_id : BT_ID_DEFAULT);
if (err) {
BT_WARN("Failed to update RPA address (%d)", err);
return;
@ -875,6 +875,17 @@ static void hci_num_completed_packets(struct net_buf *buf)
}
}
static inline bool rpa_timeout_valid_check(void)
{
#if defined(CONFIG_BT_PRIVACY)
/* Check if create conn timeout will happen before RPA timeout. */
return k_delayed_work_remaining_get(&bt_dev.rpa_update) >
K_SECONDS(CONFIG_BT_CREATE_CONN_TIMEOUT);
#else
return true;
#endif
}
#if defined(CONFIG_BT_CENTRAL)
int bt_le_create_conn(const struct bt_conn *conn)
{
@ -890,8 +901,8 @@ int bt_le_create_conn(const struct bt_conn *conn)
}
if (IS_ENABLED(CONFIG_BT_PRIVACY)) {
if (use_filter) {
err = le_set_private_addr(bt_dev.adv_id);
if (use_filter || rpa_timeout_valid_check()) {
err = le_set_private_addr(BT_ID_DEFAULT);
if (err) {
return err;
}