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

fixed passkey classes

pull/6188/head
paul-szczepanek-arm 2018-01-17 12:28:48 +00:00
parent 6420465c29
commit 1a7e3faa18
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,10 +39,11 @@ typedef SecurityManager::SecurityIOCapabilities_t SecurityIOCapabilities_t;
class PasskeyNum {
public:
PasskeyNum() : number(0) { }
PasskeyNum(uint32_t num) : number(num) { }
operator uint32_t() {
return number;
}
private:
uint32_t number;
};
@ -50,7 +51,7 @@ class PasskeyAsci {
public:
static const uint8_t NUMBER_OFFSET = '0';
PasskeyAsci(uint8_t* passkey) {
PasskeyAsci(const uint8_t* passkey) {
if (passkey) {
memcpy(asci, passkey, SecurityManager::PASSKEY_LEN);
} else {
@ -62,9 +63,9 @@ public:
}
PasskeyAsci(const PasskeyNum& passkey) {
for (int i = 5, m = 100000; i >= 0; --i, m /= 10) {
uint32_t result = passkey / m;
uint32_t result = passkey.number / m;
asci[i] = NUMBER_OFFSET + result;
passkey -= result;
passkey.number -= result;
}
}
operator PasskeyNum() {
@ -198,7 +199,7 @@ public:
db.restore();
bondable = initBondable;
mitm = initMITM;
iocaps = initIocaps;
io_capability = initIocaps;
displayPasskey = PasskeyAsci(initPasskey);
legacyPairingAllowed = true;
@ -319,7 +320,7 @@ public:
//
/**
* Returns the requested LTK to the PAL.
* Returns the requested LTK to the PAL. Called by the security db.
*
* @param entry security entry returned by the database.
* @param entryKeys security entry containing keys.
@ -335,7 +336,6 @@ public:
// Authentication
//
ble_error_t requestPairing(connection_handle_t connection) {
(void) connection;
return BLE_ERROR_NOT_IMPLEMENTED; /* Requesting action from porters: override this API if security is supported. */
@ -415,7 +415,7 @@ private:
ble::pal::SecurityManager& pal;
SecurityDb db;
SecurityIOCapabilities_t iocaps;
SecurityIOCapabilities_t io_capability;
PasskeyNum displayPasskey;
bool mitm;