Skip to content

Host privacy: Set Identity address when retrieved #13658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 23, 2020
Merged

Host privacy: Set Identity address when retrieved #13658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9127cb
BLE: Remove set advertising timeout from SM pal
pan- Sep 23, 2020
08d4cb2
BLE: Update identity address when retrieved from the DB
pan- Sep 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions connectivity/FEATURE_BLE/source/cordio/source/PalSecurityManagerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,18 +207,6 @@ ble_error_t PalSecurityManager::encrypt_data(
return BLE_ERROR_NOT_IMPLEMENTED;
}

////////////////////////////////////////////////////////////////////////////
// Privacy
//


ble_error_t PalSecurityManager::set_private_address_timeout(
uint16_t timeout_in_seconds
)
{
DmPrivSetResolvablePrivateAddrTimeout(timeout_in_seconds);
return BLE_ERROR_NONE;
}

////////////////////////////////////////////////////////////////////////////
// Keys
Expand Down
9 changes: 0 additions & 9 deletions connectivity/FEATURE_BLE/source/cordio/source/PalSecurityManagerImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,15 +174,6 @@ class PalSecurityManager final : public ble::PalSecurityManager {
encryption_block_t &data
) final;

////////////////////////////////////////////////////////////////////////////
// Privacy
//

/**
* @see ::ble::PalSecurityManager::set_private_address_timeout
*/
ble_error_t set_private_address_timeout(uint16_t timeout_in_seconds) final;

////////////////////////////////////////////////////////////////////////////
// Keys
//
Expand Down
18 changes: 12 additions & 6 deletions connectivity/FEATURE_BLE/source/generic/SecurityManagerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,10 @@ ble_error_t SecurityManager::getSigningKey(connection_handle_t connection, bool
ble_error_t SecurityManager::setPrivateAddressTimeout(uint16_t timeout_in_seconds)
{
if (!_db) return BLE_ERROR_INITIALIZATION_INCOMPLETE;
return _pal.set_private_address_timeout(timeout_in_seconds);
_private_address_controller.set_timeout(
resolvable_address_timeout_t(timeout_in_seconds)
);
return BLE_ERROR_NONE;
}

////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -1035,8 +1038,12 @@ ble_error_t SecurityManager::init_identity()
ble::Gap& gap = BLE::Instance().gap();

irk_t irk = _db->get_local_irk();
address_t identity_address;
bool public_identity_address = false;
if (irk != irk_t()) {
pirk = &irk;
public_identity_address = _db->is_local_identity_address_public();
identity_address = _db->get_local_identity_address();

if (!_db->is_local_identity_address_public()) {
// Some controllers doesn't store their random static address and
Expand All @@ -1057,16 +1064,15 @@ ble_error_t SecurityManager::init_identity()
}

pirk = &irk;
address_t random_static_address = gap.getRandomStaticAddress();
if (ret != BLE_ERROR_NONE) {
return ret;
}
_db->set_local_identity(irk, random_static_address, /* public_address */ false);
public_identity_address = false;
identity_address = gap.getRandomStaticAddress();
_db->set_local_identity(irk, identity_address, public_identity_address);
}

auto err = _pal.set_irk(*pirk);
if (!err) {
_private_address_controller.set_local_irk(*pirk);
_pal.set_identity_address(identity_address, public_identity_address);
}
return err;
}
Expand Down
8 changes: 0 additions & 8 deletions connectivity/FEATURE_BLE/source/pal/PalSecurityManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,14 +753,6 @@ class PalSecurityManager {
encryption_block_t &data
) = 0;

////////////////////////////////////////////////////////////////////////////
// Privacy
//

virtual ble_error_t set_private_address_timeout(
uint16_t timeout_in_seconds
) = 0;

////////////////////////////////////////////////////////////////////////////
// Keys
//
Expand Down