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

added callback on encryption request even if lower and restructured for clarity

pull/6188/head
paul-szczepanek-arm 2018-03-01 15:17:36 +00:00
parent e8f29f7327
commit b89f9f2482
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -375,25 +375,21 @@ ble_error_t GenericSecurityManager::setLinkEncryption(
return BLE_ERROR_OPERATION_NOT_PERMITTED; return BLE_ERROR_OPERATION_NOT_PERMITTED;
} }
/* ignore if the link is already at required state*/
if (current_encryption == encryption) { if (current_encryption == encryption) {
eventHandler->linkEncryptionResult(connection, current_encryption);
return BLE_ERROR_NONE;
}
if (encryption == link_encryption_t::NOT_ENCRYPTED) { /* ignore if the link is already at required state*/
return BLE_ERROR_INVALID_STATE; } else if (encryption == link_encryption_t::NOT_ENCRYPTED) {
/* ignore if we are requesting an open link on an already encrypted link */
} else if (encryption == link_encryption_t::ENCRYPTED) { } else if (encryption == link_encryption_t::ENCRYPTED) {
/* if already better than encrypted don't bother */ /* only change if we're not already encrypted with mitm */
if (current_encryption == link_encryption_t::ENCRYPTED_WITH_MITM) { if (current_encryption != link_encryption_t::ENCRYPTED_WITH_MITM) {
eventHandler->linkEncryptionResult(connection, current_encryption);
return BLE_ERROR_NONE;
}
cb->encryption_requested = true; cb->encryption_requested = true;
return enable_encryption(connection); return enable_encryption(connection);
}
} else if (encryption == link_encryption_t::ENCRYPTED_WITH_MITM) { } else if (encryption == link_encryption_t::ENCRYPTED_WITH_MITM) {
@ -409,6 +405,8 @@ ble_error_t GenericSecurityManager::setLinkEncryption(
return BLE_ERROR_INVALID_PARAM; return BLE_ERROR_INVALID_PARAM;
} }
eventHandler->linkEncryptionResult(connection, current_encryption);
return BLE_ERROR_NONE; return BLE_ERROR_NONE;
} }