ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

factor out invalid rand function

pull/7688/head
paul-szczepanek-arm 2018-08-08 14:19:06 +01:00
parent 021c452823
commit c1ce511dff
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5xPalSecurityManager.cpp
View File

@ -760,6 +760,16 @@ nRF5xSecurityManager& nRF5xSecurityManager::get_security_manager()
return _security_manager; return _security_manager;
} }
bool is_rand_invalid(const uint8_t* rand)
{
for (int i = 0; i < 8; ++i) {
if (rand[i]) {
return false;
}
}
return true;
}
bool nRF5xSecurityManager::sm_handler(const ble_evt_t *evt) bool nRF5xSecurityManager::sm_handler(const ble_evt_t *evt)
{ {
nRF5xSecurityManager& self = nRF5xSecurityManager::get_security_manager(); nRF5xSecurityManager& self = nRF5xSecurityManager::get_security_manager();
@ -846,9 +856,8 @@ bool nRF5xSecurityManager::sm_handler(const ble_evt_t *evt)
const ble_gap_evt_sec_info_request_t& req = const ble_gap_evt_sec_info_request_t& req =
gap_evt.params.sec_info_request; gap_evt.params.sec_info_request;
uint8_t invalid_rand[BLE_GAP_SEC_RAND_LEN] = { 0 };
if (req.master_id.ediv == 0 && if (req.master_id.ediv == 0 &&
memcmp(req.master_id.rand, invalid_rand, sizeof(invalid_rand) == 0) is_rand_invalid(req.master_id.rand)
) { ) {
// request ltk generated with secure connection // request ltk generated with secure connection
handler->on_ltk_request(connection); handler->on_ltk_request(connection);
@ -956,9 +965,8 @@ bool nRF5xSecurityManager::sm_handler(const ble_evt_t *evt)
peer_dist = pairing_cb->initiator_dist; peer_dist = pairing_cb->initiator_dist;
} }
uint8_t invalid_rand[BLE_GAP_SEC_RAND_LEN] = { 0 };
if (pairing_cb->own_enc_key.master_id.ediv == 0 && if (pairing_cb->own_enc_key.master_id.ediv == 0 &&
memcmp(pairing_cb->own_enc_key.master_id.rand, invalid_rand, sizeof(invalid_rand) == 0) is_rand_invalid(pairing_cb->own_enc_key.master_id.rand)
) { ) {
handler->on_secure_connections_ltk_generated( handler->on_secure_connections_ltk_generated(
connection, connection,