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

Merge branch 'palsm' of https://github.com/paul-szczepanek-arm/mbed-os into palsm

pull/6188/head
paul-szczepanek-arm 2018-01-19 11:40:29 +00:00
parent 9e3797cb3c 54788555e4
commit 5fcf2a6cfb
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,9 +206,9 @@ private:
if (linkSecuredCallback) {
SecurityManager::SecurityMode_t securityMode;
if (encrypted) {
securityMode = SecurityMode_t::SECURITY_MODE_ENCRYPTION_NO_MITM
securityMode = SECURITY_MODE_ENCRYPTION_NO_MITM;
} else {
securityMode = SecurityMode_t::SECURITY_MODE_ENCRYPTION_OPEN_LINK
securityMode = SECURITY_MODE_ENCRYPTION_OPEN_LINK;
}
linkSecuredCallback(handle, securityMode);
}
@ -643,7 +643,7 @@ public:
}
/** @deprecated */
void processLinkSecuredEvent(Gap::Handle_t handle, SecurityMode_t securityMode) {
if (securityMode == SecurityMode_t::SECURITY_MODE_ENCRYPTION_NO_MITM) {
if (securityMode == SECURITY_MODE_ENCRYPTION_NO_MITM) {
eventHandler->linkEncryptionResult(handle, true);
} else {
eventHandler->linkEncryptionResult(handle, false);

4
features/FEATURE_BLE/ble/pal/PalSecurityManager.h
View File

@ -58,8 +58,8 @@ public:
memset(asci, NUMBER_OFFSET, SecurityManager::PASSKEY_LEN);
}
}
PasskeyAsci(const passkey_num_t passkey) {
for (size_t i = 5, m = 100000; i >= 0; --i, m /= 10) {
PasskeyAsci(passkey_num_t passkey) {
for (int i = 5, m = 100000; i >= 0; --i, m /= 10) {
uint32_t result = passkey / m;
asci[i] = NUMBER_OFFSET + result;
passkey -= result;

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

@ -33,7 +33,6 @@ using ble::pal::csrk_t;
using ble::pal::ltk_t;
using ble::pal::ediv_t;
using ble::pal::rand_t;
using ble::pal::AuthenticationMask::AuthenticationFlags_t;
using ble::pal::AuthenticationMask;
using ble::pal::KeyDistribution;
using ble::pairing_failure_t;
@ -103,7 +102,7 @@ public:
*/
SecurityEntry_t* get_entry(connection_handle_t connection);
void get_entry_keys(SecurityEntryKeysDbCb_t cb, ediv_t ediv, rand_t rand);
void get_entry_keys(SecurityEntryKeysDbCb_t cb, const ediv_t ediv, const rand_t rand);
void get_entry_identityt(SecurityEntryIdentityDbCb_t cb, address_t &identity_address);
void update_entry(connection_handle_t connection,
@ -156,7 +155,7 @@ public:
SecurityIOCapabilities_t iocaps = IO_CAPS_NONE,
const Passkey_t passkey = NULL) {
db.restore();
pal.set_io_capability(io_capability_t(iocaps));
pal.set_io_capability((io_capability_t::type) iocaps);
pal.set_display_passkey(PasskeyAsci::to_num(passkey));
legacy_pairing_allowed = true;
@ -210,7 +209,7 @@ public:
//
ble_error_t setIoCapability(SecurityIOCapabilities_t iocaps) {
return pal.set_io_capability(io_capability_t(iocaps));
return pal.set_io_capability((io_capability_t::type) iocaps);
}
ble_error_t setDisplayPasskey(const Passkey_t passkey) {
@ -265,11 +264,11 @@ public:
SecurityEntry_t *entry = db.get_entry(connection);
if (entry) {
if (entry->encrypted) {
*securityStatus = LinkSecurityStatus_t::ENCRYPTED;
*securityStatus = ENCRYPTED;
} else if (entry->encryption_requested) {
*securityStatus = LinkSecurityStatus_t::ENCRYPTION_IN_PROGRESS;
*securityStatus = ENCRYPTION_IN_PROGRESS;
} else {
*securityStatus = LinkSecurityStatus_t::NOT_ENCRYPTED;
*securityStatus = NOT_ENCRYPTED;
}
return BLE_ERROR_NONE;
} else {