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

cordio security pass

pull/9790/head
paul-szczepanek-arm 2019-02-22 17:57:11 +00:00 committed by Vincent Coubard
parent bc3ff56504
commit aa6342b265
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
features/FEATURE_BLE/source/generic/GenericGap.tpp
View File

@ -1019,7 +1019,7 @@ ble_error_t GenericGap<PalGapImpl, PalSecurityManager, ConnectionEventMonitorEve
*params *params
); );
} }
#endif BLE_FEATURE_GATT_SERVER #endif // BLE_FEATURE_GATT_SERVER
#endif // BLE_FEATURE_CONNECTABLE #endif // BLE_FEATURE_CONNECTABLE
#if BLE_FEATURE_GATT_SERVER #if BLE_FEATURE_GATT_SERVER

9
features/FEATURE_BLE/source/generic/GenericSecurityManager.tpp
View File

@ -1066,7 +1066,7 @@ void GenericSecurityManager<TPalSecurityManager, SigningMonitor>::return_csrk_cb
flags->csrk_mitm_protected flags->csrk_mitm_protected
); );
} }
#endif BLE_FEATURE_SIGNING #endif // BLE_FEATURE_SIGNING
template<template<class> class TPalSecurityManager, template<class> class SigningMonitor> template<template<class> class TPalSecurityManager, template<class> class SigningMonitor>
void GenericSecurityManager<TPalSecurityManager, SigningMonitor>::update_oob_presence(connection_handle_t connection) { void GenericSecurityManager<TPalSecurityManager, SigningMonitor>::update_oob_presence(connection_handle_t connection) {
@ -1179,7 +1179,7 @@ void GenericSecurityManager<TPalSecurityManager, SigningMonitor>::on_security_en
} }
typedef advertising_peer_address_type_t address_type_t; typedef advertising_peer_address_type_t address_type_t;
#if BLE_FEATURE_PRIVACY
_pal.add_device_to_resolving_list( _pal.add_device_to_resolving_list(
identity->identity_address_is_public ? identity->identity_address_is_public ?
address_type_t::PUBLIC : address_type_t::PUBLIC :
@ -1187,8 +1187,10 @@ void GenericSecurityManager<TPalSecurityManager, SigningMonitor>::on_security_en
identity->identity_address, identity->identity_address,
identity->irk identity->irk
); );
#endif // BLE_FEATURE_PRIVACY
} }
#if BLE_FEATURE_PRIVACY
template<template<class> class TPalSecurityManager, template<class> class SigningMonitor> template<template<class> class TPalSecurityManager, template<class> class SigningMonitor>
void GenericSecurityManager<TPalSecurityManager, SigningMonitor>::on_identity_list_retrieved( void GenericSecurityManager<TPalSecurityManager, SigningMonitor>::on_identity_list_retrieved(
ble::ArrayView<SecurityEntryIdentity_t>& identity_list, ble::ArrayView<SecurityEntryIdentity_t>& identity_list,
@ -1209,6 +1211,7 @@ void GenericSecurityManager<TPalSecurityManager, SigningMonitor>::on_identity_li
delete [] identity_list.data(); delete [] identity_list.data();
} }
#endif // BLE_FEATURE_PRIVACY
/* Implements ble::pal::SecurityManagerEventHandler */ /* Implements ble::pal::SecurityManagerEventHandler */
@ -1660,7 +1663,7 @@ void GenericSecurityManager<TPalSecurityManager, SigningMonitor>::on_keys_distri
_db->set_entry_peer_irk(cb->db_entry, irk); _db->set_entry_peer_irk(cb->db_entry, irk);
} }
#endif BLE_FEATURE_PRIVACY #endif // BLE_FEATURE_PRIVACY
template<template<class> class TPalSecurityManager, template<class> class SigningMonitor> template<template<class> class TPalSecurityManager, template<class> class SigningMonitor>
void GenericSecurityManager<TPalSecurityManager, SigningMonitor>::on_keys_distributed_bdaddr_( void GenericSecurityManager<TPalSecurityManager, SigningMonitor>::on_keys_distributed_bdaddr_(