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

BLE - Cleanup CordioPalSecurityManager conditional directives. 

- Within constructor
- Within member declaration
- Private function declaration and definition.
pull/9790/head
Vincent Coubard 2019-02-28 11:36:36 +00:00
parent b0d62a7090
commit a31d1012db
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
features/FEATURE_BLE/targets/TARGET_CORDIO/CordioPalSecurityManager.h
View File

@ -238,7 +238,6 @@ public:
*/ */
ble_error_t set_irk_(const irk_t &irk); ble_error_t set_irk_(const irk_t &irk);
#if BLE_FEATURE_SIGNING
/** /**
* @see ::ble::pal::SecurityManager::set_csrk * @see ::ble::pal::SecurityManager::set_csrk
*/ */
@ -258,7 +257,6 @@ public:
); );
ble_error_t remove_peer_csrk_(connection_handle_t connection); ble_error_t remove_peer_csrk_(connection_handle_t connection);
#endif // BLE_FEATURE_SIGNING
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// Authentication // Authentication
@ -363,10 +361,8 @@ private:
// Try to dequeue and process the next control block // Try to dequeue and process the next control block
// cb_completed is set when the previous block has completed // cb_completed is set when the previous block has completed
void process_privacy_control_blocks(bool cb_completed); void process_privacy_control_blocks(bool cb_completed);
#if BLE_FEATURE_SIGNING
void cleanup_peer_csrks(); void cleanup_peer_csrks();
#endif
bool _use_default_passkey; bool _use_default_passkey;
passkey_num_t _default_passkey; passkey_num_t _default_passkey;
@ -377,10 +373,8 @@ private:
bool _processing_privacy_control_block; bool _processing_privacy_control_block;
irk_t _irk; irk_t _irk;
#if BLE_FEATURE_SIGNING
csrk_t _csrk; csrk_t _csrk;
csrk_t* _peer_csrks[DM_CONN_MAX]; csrk_t* _peer_csrks[DM_CONN_MAX];
#endif // BLE_FEATURE_SIGNING
}; };
} // cordio } // cordio

14
features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioPalSecurityManager.tpp
View File

@ -16,8 +16,6 @@
#include "BLERoles.h" #include "BLERoles.h"
#if BLE_FEATURE_SECURITY
#include <string.h> #include <string.h>
#include "CordioPalSecurityManager.h" #include "CordioPalSecurityManager.h"
@ -39,10 +37,8 @@ CordioSecurityManager<EventHandler>::CordioSecurityManager() :
_lesc_keys_generated(false), _lesc_keys_generated(false),
_public_key_x(), _public_key_x(),
_pending_privacy_control_blocks(NULL), _pending_privacy_control_blocks(NULL),
_processing_privacy_control_block(false) _processing_privacy_control_block(false),
#if BLE_FEATURE_SIGNING _peer_csrks()
, _peer_csrks()
#endif
{ {
} }
@ -332,7 +328,6 @@ ble_error_t CordioSecurityManager<EventHandler>::set_irk_(const irk_t& irk)
return BLE_ERROR_NONE; return BLE_ERROR_NONE;
} }
#if BLE_FEATURE_SIGNING
template <class EventHandler> template <class EventHandler>
ble_error_t CordioSecurityManager<EventHandler>::set_csrk_( ble_error_t CordioSecurityManager<EventHandler>::set_csrk_(
const csrk_t& csrk, const csrk_t& csrk,
@ -390,7 +385,6 @@ ble_error_t CordioSecurityManager<EventHandler>::remove_peer_csrk_(connection_ha
AttsSetCsrk(connection, NULL, false); AttsSetCsrk(connection, NULL, false);
return BLE_ERROR_NONE; return BLE_ERROR_NONE;
} }
#endif // BLE_FEATURE_SIGNING
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// Global parameters // Global parameters
@ -1011,7 +1005,6 @@ void CordioSecurityManager<EventHandler>::process_privacy_control_blocks(bool cb
_pending_privacy_control_blocks = next; _pending_privacy_control_blocks = next;
} }
#if BLE_FEATURE_SIGNING
template <class EventHandler> template <class EventHandler>
void CordioSecurityManager<EventHandler>::cleanup_peer_csrks() { void CordioSecurityManager<EventHandler>::cleanup_peer_csrks() {
for (size_t i = 0; i < DM_CONN_MAX; ++i) { for (size_t i = 0; i < DM_CONN_MAX; ++i) {
@ -1021,11 +1014,8 @@ void CordioSecurityManager<EventHandler>::cleanup_peer_csrks() {
} }
} }
} }
#endif // BLE_FEATURE_SIGNING
} // cordio } // cordio
} // vendor } // vendor
} // pal } // pal
} // ble } // ble
#endif // BLE_FEATURE_SECURITY