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

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

pull/6188/head
paul-szczepanek-arm 2018-02-27 11:57:20 +00:00
parent 0f1fd58c38 0b0d614787
commit 957cee39fe
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -361,8 +361,8 @@ private:
* @return true if cryptography functioned worked
*/
static bool crypto_toolbox_f4(
const public_key_coord_t &U,
const public_key_coord_t &V,
const public_key_t &U,
const public_key_t &V,
const oob_lesc_value_t &X,
oob_confirm_t &confirm
);

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

@ -974,9 +974,9 @@ public:
* If the verification failed this will not be called and cancel_pairing will be called instead.
*
* @param[in] connection connection handle
* @param[in] oob_rand_t random number sent from the local device to be used in further
* @param[in] local_random random number sent from the local device to be used in further
* calculations by the stack, set to 0 if peer reported no OOB present
* @param[in] oob_rand_t random number from the peer to be used in further
* @param[in] peer_random random number from the peer to be used in further
* calculations by the stack, set to 0 if no OOB data received
* @retval BLE_ERROR_NONE On success, else an error code indicating reason for failure
*/

2
features/FEATURE_BLE/tests/generic/SecurityManager/mock/MockPalSecurityManager.h
View File

@ -170,7 +170,7 @@ public:
MOCK_METHOD3(
oob_data_verified,
ble_error_t(connection_handle_t, const oob_rand_t &, const oob_rand_t &)
ble_error_t(connection_handle_t, const oob_lesc_value_t &, const oob_lesc_value_t &)
);
// get the event handler present in the mock object.

2
features/FEATURE_BLE/tests/generic/SecurityManager/mock/MockSecurityManagerEventHandler.h
View File

@ -59,7 +59,7 @@ public:
MOCK_METHOD2(legacyPairingOobGenerated, void(const address_t *, const oob_tk_t *));
MOCK_METHOD3(oobGenerated, void(const address_t *, const oob_rand_t *, const oob_confirm_t *));
MOCK_METHOD3(oobGenerated, void(const address_t *, const oob_lesc_value_t *, const oob_confirm_t *));
MOCK_METHOD3(signingKey, void(connection_handle_t, const csrk_t *, bool));
};