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

use common io caps type

pull/6188/head
paul-szczepanek-arm 2018-01-17 21:40:06 +00:00
parent b00b746aa0
commit 8db6427fde
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,7 +198,7 @@ public:
SecurityIOCapabilities_t iocaps = IO_CAPS_NONE, SecurityIOCapabilities_t iocaps = IO_CAPS_NONE,
const Passkey_t passkey = NULL) { const Passkey_t passkey = NULL) {
db.restore(); db.restore();
io_capability = iocaps; io_capability = io_capability_t(iocaps);
display_passkey = PasskeyAsci::to_num(passkey); display_passkey = PasskeyAsci::to_num(passkey);
legacy_pairing_allowed = true; legacy_pairing_allowed = true;
@ -277,7 +277,7 @@ public:
ble_error_t getLinkSecurity(connection_handle_t connection, ble_error_t getLinkSecurity(connection_handle_t connection,
SecurityMode_t *securityMode) { SecurityMode_t *securityMode) {
securityMode = SECURITY_MODE_ENCRYPTION_OPEN_LINK; *securityMode = SECURITY_MODE_ENCRYPTION_OPEN_LINK;
return BLE_ERROR_NONE; return BLE_ERROR_NONE;
} }
@ -478,7 +478,7 @@ private:
ble::pal::SecurityManager& pal; ble::pal::SecurityManager& pal;
SecurityDb db; SecurityDb db;
SecurityIOCapabilities_t io_capability; io_capability_t io_capability;
PasskeyNum display_passkey; PasskeyNum display_passkey;
bool pairing_authorisation_required; bool pairing_authorisation_required;
@ -498,7 +498,7 @@ public:
// //
void on_pairing_request(connection_handle_t connection, void on_pairing_request(connection_handle_t connection,
SecurityIOCapabilities_t iocaps, io_capability_t iocaps,
bool use_oob, bool use_oob,
AuthenticationMask authentication, AuthenticationMask authentication,
uint8_t max_key_size, uint8_t max_key_size,
@ -528,7 +528,7 @@ public:
void on_security_setup_initiated(connection_handle_t connection, void on_security_setup_initiated(connection_handle_t connection,
bool allow_bonding, bool allow_bonding,
bool require_mitm, bool require_mitm,
SecurityIOCapabilities_t iocaps) { io_capability_t iocaps) {
if (_app_event_handler) { if (_app_event_handler) {
_app_event_handler->securitySetupInitiated(connection, allow_bonding, require_mitm, iocaps); _app_event_handler->securitySetupInitiated(connection, allow_bonding, require_mitm, iocaps);
} }