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

Author: paul-szczepanek-arm

features/FEATURE_BLE/ble/generic/GenericSecurityManager.h

@@ -361,8 +361,8 @@ class GenericSecurityManager : public SecurityManager,
      * @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
     );

features/FEATURE_BLE/ble/pal/PalSecurityManager.h

@@ -974,9 +974,9 @@ class SecurityManager : private mbed::NonCopyable<SecurityManager> {
      * 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
      */

features/FEATURE_BLE/tests/generic/SecurityManager/mock/MockPalSecurityManager.h

@@ -170,7 +170,7 @@ class MockPalSecurityManager : public ble::pal::SecurityManager {
 
     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.

features/FEATURE_BLE/tests/generic/SecurityManager/mock/MockSecurityManagerEventHandler.h

@@ -59,7 +59,7 @@ class MockSecurityManagerEventHandler :
 
     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));
 };