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

Remove own_oob and peer_oob flags from Nordic PAL 

the own_oob and peer_oob flags were not being set to 1 even though
an OOB pairing request was in progress, which therefore prevented
OOB data from being passed down to the softdevice during a OOB
pairing operation, thus causing the OOB pairing process to fail.
pull/9507/head
Nic Costa 2019-01-08 12:45:39 -06:00 committed by adbridge
parent 09bd512da8
commit 3b99566226
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,11 +81,6 @@ struct nRF5xSecurityManager::pairing_control_block_t {
ble_gap_id_key_t peer_id_key; ble_gap_id_key_t peer_id_key;
ble_gap_sign_info_t peer_sign_key; ble_gap_sign_info_t peer_sign_key;
ble_gap_lesc_p256_pk_t peer_pk; ble_gap_lesc_p256_pk_t peer_pk;
// flag required to help DHKey computation/process; should be removed with
// later versions of the softdevice
uint8_t own_oob:1;
uint8_t peer_oob:1;
}; };
nRF5xSecurityManager::nRF5xSecurityManager() nRF5xSecurityManager::nRF5xSecurityManager()
@ -663,26 +658,37 @@ ble_error_t nRF5xSecurityManager::secure_connections_oob_request_reply(
const oob_lesc_value_t &peer_random, const oob_lesc_value_t &peer_random,
const oob_confirm_t &peer_confirm const oob_confirm_t &peer_confirm
) { ) {
bool have_oob_own;
bool have_oob_peer;
const oob_lesc_value_t zerokey;
ble_gap_lesc_oob_data_t oob_own;
ble_gap_lesc_oob_data_t oob_peer;
pairing_control_block_t* pairing_cb = get_pairing_cb(connection); pairing_control_block_t* pairing_cb = get_pairing_cb(connection);
if (!pairing_cb) { if (!pairing_cb) {
return BLE_ERROR_INVALID_STATE; return BLE_ERROR_INVALID_STATE;
} }
ble_gap_lesc_oob_data_t oob_own; have_oob_own = false;
ble_gap_lesc_oob_data_t oob_peer; if (local_random != zerokey) {
have_oob_own = true;
// is own address important ?
memcpy(oob_own.r, local_random.data(), local_random.size());
// FIXME: What to do with local confirm ???
}
// is own address important ? have_oob_peer = false;
memcpy(oob_own.r, local_random.data(), local_random.size()); if (peer_random != zerokey && peer_confirm != zerokey) {
// FIXME: What to do with local confirm ??? have_oob_peer = true;
// is peer address important ?
// is peer address important ? memcpy(oob_peer.r, peer_random.data(), peer_random.size());
memcpy(oob_peer.r, peer_random.data(), peer_random.size()); memcpy(oob_peer.c, peer_confirm.data(), peer_confirm.size());
memcpy(oob_peer.c, peer_confirm.data(), peer_confirm.size()); }
uint32_t err = sd_ble_gap_lesc_oob_data_set( uint32_t err = sd_ble_gap_lesc_oob_data_set(
connection, connection,
pairing_cb->own_oob ? &oob_own : NULL, have_oob_own ? &oob_own : NULL,
pairing_cb->peer_oob ? &oob_peer : NULL have_oob_peer ? &oob_peer : NULL
); );
return convert_sd_error(err); return convert_sd_error(err);