From cbf80e9da56802c3e7684b11f6caa34f89ab9d6c Mon Sep 17 00:00:00 2001
From: paul-szczepanek-arm
 <33840200+paul-szczepanek-arm@users.noreply.github.com>
Date: Tue, 3 Apr 2018 09:57:58 +0100
Subject: [PATCH] typos, style and other review fixes

---
 .../ble/generic/GenericSecurityManager.h            |  2 +-
 .../source/generic/GenericGattClient.cpp            | 10 +++++-----
 .../source/generic/GenericSecurityManager.cpp       | 13 +++++++------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/features/FEATURE_BLE/ble/generic/GenericSecurityManager.h b/features/FEATURE_BLE/ble/generic/GenericSecurityManager.h
index c2f0b28f85..7fe92b3b30 100644
--- a/features/FEATURE_BLE/ble/generic/GenericSecurityManager.h
+++ b/features/FEATURE_BLE/ble/generic/GenericSecurityManager.h
@@ -526,7 +526,7 @@ public:
         connection_handle_t connection
     );
 
-    /** @copydoc ble::pal::SecurityManager::on_invalid_mic
+    /** @copydoc ble::pal::SecurityManager::on_signature_verification_failure
      */
     virtual void on_signature_verification_failure(
         connection_handle_t connection
diff --git a/features/FEATURE_BLE/source/generic/GenericGattClient.cpp b/features/FEATURE_BLE/source/generic/GenericGattClient.cpp
index a6d1d0692e..4962b9dd2b 100644
--- a/features/FEATURE_BLE/source/generic/GenericGattClient.cpp
+++ b/features/FEATURE_BLE/source/generic/GenericGattClient.cpp
@@ -40,6 +40,11 @@ using ble::pal::AttHandleValueIndication;
 using ble::pal::AttHandleValueNotification;
 using ble::pal::AttFindInformationResponse;
 
+#define PREPARE_WRITE_HEADER_LENGTH 5
+#define WRITE_HEADER_LENGTH 3
+#define CMAC_LENGTH 8
+#define MAC_COUNTER_LENGTH 4
+
 namespace ble {
 namespace generic {
 
@@ -1064,11 +1069,6 @@ ble_error_t GenericGattClient::read(
 	return err;
 }
 
-#define PREPARE_WRITE_HEADER_LENGTH 5
-#define WRITE_HEADER_LENGTH 3
-#define CMAC_LENGTH 8
-#define MAC_COUNTER_LENGTH 4
-
 ble_error_t GenericGattClient::write(
 	GattClient::WriteOp_t cmd,
 	Gap::Handle_t connection_handle,
diff --git a/features/FEATURE_BLE/source/generic/GenericSecurityManager.cpp b/features/FEATURE_BLE/source/generic/GenericSecurityManager.cpp
index c3a9aedbf4..a079c58c68 100644
--- a/features/FEATURE_BLE/source/generic/GenericSecurityManager.cpp
+++ b/features/FEATURE_BLE/source/generic/GenericSecurityManager.cpp
@@ -319,7 +319,7 @@ ble_error_t GenericSecurityManager::enableSigning(
                 cb->db_entry
             );
         } else {
-            /* crate keys if needed and exchange them */
+            /* create keys if needed and exchange them */
             init_signing();
             if (cb->is_master) {
                return requestPairing(connection);
@@ -745,7 +745,8 @@ void GenericSecurityManager::set_peer_csrk_cb(
     _pal.set_peer_csrk(
         cb->connection,
         *csrk,
-        cb->csrk_mitm_protected);
+        cb->csrk_mitm_protected
+    );
 }
 
 void GenericSecurityManager::return_csrk_cb(
@@ -829,8 +830,8 @@ void GenericSecurityManager::on_connected(
     }
 
     const bool signing = cb->signing_override_default ?
-                         cb->signing_requested
-                         : _default_key_distribution.get_signing();
+                         cb->signing_requested :
+                         _default_key_distribution.get_signing();
 
     if (signing && cb->csrk_stored) {
         _db.get_entry_peer_csrk(
@@ -951,8 +952,8 @@ void GenericSecurityManager::on_signature_verification_failure(
     }
 
     const bool signing = cb->signing_override_default ?
-                         cb->signing_requested
-                         : _default_key_distribution.get_signing();
+                         cb->signing_requested :
+                         _default_key_distribution.get_signing();
 
     if (signing) {
         cb->csrk_failures++;