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

we don't need two event handler since now the generic security manager implements the interface

pull/6188/head
paul-szczepanek-arm 2018-01-30 17:01:30 -06:00
parent e686eec048
commit 2060ad5df0
3 changed files with 19 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
features/FEATURE_BLE/ble/SecurityManager.h
View File

@ -794,10 +794,10 @@ public:
} }
private: private:
SecurityManagerEventHandler* eventHandler;
SecurityManagerShutdownCallbackChain_t shutdownCallChain; SecurityManagerShutdownCallbackChain_t shutdownCallChain;
protected: protected:
SecurityManagerEventHandler* eventHandler;
LegacySecurityManagerEventHandler defaultEventHandler; LegacySecurityManagerEventHandler defaultEventHandler;
}; };

8
features/FEATURE_BLE/ble/generic/GenericSecurityManager.h
View File

@ -197,14 +197,6 @@ public:
Keypress_t keypress Keypress_t keypress
); );
////////////////////////////////////////////////////////////////////////////
// Event handler
//
virtual void setSecurityManagerEventHandler(
::SecurityManager::SecurityManagerEventHandler* handler
);
protected: protected:
GenericSecurityManager(ble::pal::SecurityManager& palImpl, GenericSecurityDb& dbImpl) GenericSecurityManager(ble::pal::SecurityManager& palImpl, GenericSecurityDb& dbImpl)
: _pal(palImpl), : _pal(palImpl),

49
features/FEATURE_BLE/source/generic/GenericSecurityManager.cpp
View File

@ -76,9 +76,9 @@ ble_error_t GenericSecurityManager::purgeAllBondingState(void) {
} }
ble_error_t GenericSecurityManager::generateWhitelistFromBondTable(Gap::Whitelist_t *whitelist) const { ble_error_t GenericSecurityManager::generateWhitelistFromBondTable(Gap::Whitelist_t *whitelist) const {
if (_app_event_handler) { if (eventHandler) {
_db.generate_whitelist_from_bond_table( _db.generate_whitelist_from_bond_table(
mbed::callback(_app_event_handler, &::SecurityManager::SecurityManagerEventHandler::whitelistFromBondTable), mbed::callback(eventHandler, &::SecurityManager::SecurityManagerEventHandler::whitelistFromBondTable),
whitelist whitelist
); );
} }
@ -483,19 +483,6 @@ ble_error_t GenericSecurityManager::sendKeypressNotification(
return _pal.send_keypress_notification(connection, keypress); return _pal.send_keypress_notification(connection, keypress);
} }
////////////////////////////////////////////////////////////////////////////
// Event handler
//
void GenericSecurityManager::setSecurityManagerEventHandler(
::SecurityManager::SecurityManagerEventHandler* handler
) {
SecurityManager::setSecurityManagerEventHandler(handler);
if (handler) {
_app_event_handler = handler;
}
}
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// Helper functions // Helper functions
// //
@ -618,7 +605,7 @@ void GenericSecurityManager::return_csrk_cb(
return; return;
} }
_app_event_handler->signingKey( eventHandler->signingKey(
connection, connection,
csrk, csrk,
entry->mitm_csrk entry->mitm_csrk
@ -650,7 +637,7 @@ void GenericSecurityManager::on_pairing_request(
set_mitm_performed(connection, false); set_mitm_performed(connection, false);
if (_pairing_authorisation_required) { if (_pairing_authorisation_required) {
_app_event_handler->acceptPairingRequest(connection); eventHandler->acceptPairingRequest(connection);
} }
} }
@ -660,7 +647,7 @@ void GenericSecurityManager::on_pairing_error(
) { ) {
set_mitm_performed(connection, false); set_mitm_performed(connection, false);
_app_event_handler->pairingResult( eventHandler->pairingResult(
connection, connection,
(SecurityManager::SecurityCompletionStatus_t)(error.value() | 0x80) (SecurityManager::SecurityCompletionStatus_t)(error.value() | 0x80)
); );
@ -669,7 +656,7 @@ void GenericSecurityManager::on_pairing_error(
void GenericSecurityManager::on_pairing_timed_out(connection_handle_t connection) { void GenericSecurityManager::on_pairing_timed_out(connection_handle_t connection) {
set_mitm_performed(connection, false); set_mitm_performed(connection, false);
_app_event_handler->pairingResult( eventHandler->pairingResult(
connection, connection,
SecurityManager::SEC_STATUS_TIMEOUT SecurityManager::SEC_STATUS_TIMEOUT
); );
@ -688,7 +675,7 @@ void GenericSecurityManager::on_pairing_completed(connection_handle_t connection
} }
} }
_app_event_handler->pairingResult( eventHandler->pairingResult(
connection, connection,
SecurityManager::SEC_STATUS_SUCCESS SecurityManager::SEC_STATUS_SUCCESS
); );
@ -699,7 +686,7 @@ void GenericSecurityManager::on_pairing_completed(connection_handle_t connection
// //
void GenericSecurityManager::on_valid_mic_timeout(connection_handle_t connection) { void GenericSecurityManager::on_valid_mic_timeout(connection_handle_t connection) {
_app_event_handler->validMicTimeout(connection); eventHandler->validMicTimeout(connection);
} }
void GenericSecurityManager::on_slave_security_request( void GenericSecurityManager::on_slave_security_request(
@ -747,13 +734,13 @@ void GenericSecurityManager::on_link_encryption_result(
entry->authenticated = true; entry->authenticated = true;
} }
_app_event_handler->linkEncryptionResult(connection, result); eventHandler->linkEncryptionResult(connection, result);
} }
void GenericSecurityManager::on_link_encryption_request_timed_out( void GenericSecurityManager::on_link_encryption_request_timed_out(
connection_handle_t connection connection_handle_t connection
) { ) {
_app_event_handler->linkEncryptionResult( eventHandler->linkEncryptionResult(
connection, connection,
link_encryption_t::NOT_ENCRYPTED link_encryption_t::NOT_ENCRYPTED
); );
@ -775,7 +762,7 @@ void GenericSecurityManager::on_passkey_display(
passkey_num_t passkey passkey_num_t passkey
) { ) {
set_mitm_performed(connection); set_mitm_performed(connection);
_app_event_handler->passkeyDisplay(connection, PasskeyAsci(passkey).asci); eventHandler->passkeyDisplay(connection, PasskeyAsci(passkey).asci);
} }
void GenericSecurityManager::on_keypress_notification( void GenericSecurityManager::on_keypress_notification(
@ -783,27 +770,27 @@ void GenericSecurityManager::on_keypress_notification(
SecurityManager::Keypress_t keypress SecurityManager::Keypress_t keypress
) { ) {
set_mitm_performed(connection); set_mitm_performed(connection);
_app_event_handler->keypressNotification(connection, keypress); eventHandler->keypressNotification(connection, keypress);
} }
void GenericSecurityManager::on_passkey_request(connection_handle_t connection) { void GenericSecurityManager::on_passkey_request(connection_handle_t connection) {
set_mitm_performed(connection); set_mitm_performed(connection);
_app_event_handler->passkeyRequest(connection); eventHandler->passkeyRequest(connection);
} }
void GenericSecurityManager::on_confirmation_request(connection_handle_t connection) { void GenericSecurityManager::on_confirmation_request(connection_handle_t connection) {
set_mitm_performed(connection); set_mitm_performed(connection);
_app_event_handler->confirmationRequest(connection); eventHandler->confirmationRequest(connection);
} }
void GenericSecurityManager::on_legacy_pairing_oob_request(connection_handle_t connection) { void GenericSecurityManager::on_legacy_pairing_oob_request(connection_handle_t connection) {
set_mitm_performed(connection); set_mitm_performed(connection);
_app_event_handler->legacyPairingOobRequest(connection); eventHandler->legacyPairingOobRequest(connection);
} }
void GenericSecurityManager::on_oob_request(connection_handle_t connection) { void GenericSecurityManager::on_oob_request(connection_handle_t connection) {
set_mitm_performed(connection); set_mitm_performed(connection);
_app_event_handler->oobRequest(connection); eventHandler->oobRequest(connection);
} }
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
@ -839,7 +826,7 @@ void GenericSecurityManager::on_keys_distributed(
csrk csrk
); );
_app_event_handler->signingKey( eventHandler->signingKey(
connection, connection,
csrk, csrk,
entry->mitm_csrk entry->mitm_csrk
@ -913,7 +900,7 @@ void GenericSecurityManager::on_keys_distributed_csrk(
_db.set_entry_peer_csrk(connection, csrk); _db.set_entry_peer_csrk(connection, csrk);
_app_event_handler->signingKey( eventHandler->signingKey(
connection, connection,
csrk, csrk,
entry->mitm_csrk entry->mitm_csrk