Skip to content

BLE: call secure connections versions of ltk functions #7688

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 5 commits into from
Aug 9, 2018
Merged

BLE: call secure connections versions of ltk functions #7688

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fbb926d
call the correct ltk function when SC is used
paul-szczepanek-arm Aug 3, 2018
021c452
replaced lesc field usage with ediv&rand check
paul-szczepanek-arm Aug 6, 2018
c1ce511
factor out invalid rand function
paul-szczepanek-arm Aug 8, 2018
cbf1776
MACRO the size of rand
paul-szczepanek-arm Aug 8, 2018
6c9bd16
factored out whole ediv rand check
paul-szczepanek-arm Aug 8, 2018
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
84 changes: 55 additions & 29 deletions features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5xPalSecurityManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,6 +760,16 @@ nRF5xSecurityManager& nRF5xSecurityManager::get_security_manager()
return _security_manager;
}

bool is_rand_invalid(const uint8_t* rand)
{
for (int i = 0; i < BLE_GAP_SEC_RAND_LEN; ++i) {
if (rand[i]) {
return false;
}
}
return true;
}

bool nRF5xSecurityManager::sm_handler(const ble_evt_t *evt)
{
nRF5xSecurityManager& self = nRF5xSecurityManager::get_security_manager();
Expand Down Expand Up @@ -846,11 +856,18 @@ bool nRF5xSecurityManager::sm_handler(const ble_evt_t *evt)
const ble_gap_evt_sec_info_request_t& req =
gap_evt.params.sec_info_request;

handler->on_ltk_request(
connection,
ediv_t((uint8_t*)(&req.master_id.ediv)),
rand_t(req.master_id.rand)
);
if (req.master_id.ediv == 0 &&
is_rand_invalid(req.master_id.rand)
) {
// request ltk generated with secure connection
handler->on_ltk_request(connection);
} else {
handler->on_ltk_request(
connection,
ediv_t((uint8_t*)(&req.master_id.ediv)),
rand_t(req.master_id.rand)
);
}

return true;
}
Expand Down Expand Up @@ -948,34 +965,43 @@ bool nRF5xSecurityManager::sm_handler(const ble_evt_t *evt)
peer_dist = pairing_cb->initiator_dist;
}

if (own_dist.get_encryption()) {
handler->on_keys_distributed_local_ltk(
if (pairing_cb->own_enc_key.master_id.ediv == 0 &&
is_rand_invalid(pairing_cb->own_enc_key.master_id.rand)
) {
handler->on_secure_connections_ltk_generated(
connection,
ltk_t(pairing_cb->own_enc_key.enc_info.ltk)
);
} else {
if (own_dist.get_encryption()) {
handler->on_keys_distributed_local_ltk(
connection,
ltk_t(pairing_cb->own_enc_key.enc_info.ltk)
);

handler->on_keys_distributed_local_ediv_rand(
connection,
ediv_t(reinterpret_cast<uint8_t*>(
&pairing_cb->own_enc_key.master_id.ediv
)),
pairing_cb->own_enc_key.master_id.rand
);
}

handler->on_keys_distributed_local_ediv_rand(
connection,
ediv_t(reinterpret_cast<uint8_t*>(
&pairing_cb->own_enc_key.master_id.ediv
)),
pairing_cb->own_enc_key.master_id.rand
);
}

if (peer_dist.get_encryption()) {
handler->on_keys_distributed_ltk(
connection,
ltk_t(pairing_cb->peer_enc_key.enc_info.ltk)
);

handler->on_keys_distributed_ediv_rand(
connection,
ediv_t(reinterpret_cast<uint8_t*>(
&pairing_cb->peer_enc_key.master_id.ediv
)),
pairing_cb->peer_enc_key.master_id.rand
);
if (peer_dist.get_encryption()) {
handler->on_keys_distributed_ltk(
connection,
ltk_t(pairing_cb->peer_enc_key.enc_info.ltk)
);

handler->on_keys_distributed_ediv_rand(
connection,
ediv_t(reinterpret_cast<uint8_t*>(
&pairing_cb->peer_enc_key.master_id.ediv
)),
pairing_cb->peer_enc_key.master_id.rand
);
}
}

if (peer_dist.get_identity()) {
Expand Down