From ce6f032970583acb019505c65ab8709c934c0409 Mon Sep 17 00:00:00 2001
From: paul-szczepanek-arm
 <33840200+paul-szczepanek-arm@users.noreply.github.com>
Date: Fri, 12 Jan 2018 12:41:43 +0000
Subject: [PATCH] pairing params added

---
 .../FEATURE_BLE/ble/pal/PalSecurityManager.h  | 65 ++++++++++++++-----
 .../source/generic/GenericSecurityManager.cpp |  2 +-
 2 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/features/FEATURE_BLE/ble/pal/PalSecurityManager.h b/features/FEATURE_BLE/ble/pal/PalSecurityManager.h
index a4b1712c8a..a613115bf0 100644
--- a/features/FEATURE_BLE/ble/pal/PalSecurityManager.h
+++ b/features/FEATURE_BLE/ble/pal/PalSecurityManager.h
@@ -50,6 +50,35 @@ typedef uint8_t ediv_t[8];
 typedef uint8_t rand_t[2];
 typedef uint32_t passkey_num_t;
 
+typedef uint8_t key_distribution_t;
+
+enum KeyDistributionFlags_t : uint8_t {
+    KEY_DISTRIBUTION_NONE       = 0x00,
+    KEY_DISTRIBUTION_ENCRYPTION = 0x01,
+    KEY_DISTRIBUTION_IDENTITY   = 0x02,
+    KEY_DISTRIBUTION_SIGNING    = 0x04,
+    KEY_DISTRIBUTION_LINK       = 0x08,
+    KEY_DISTRIBUTION_ALL        = 0x0F
+};
+
+typedef uint8_t authentication_t;
+
+enum AuthenticationFlags_t : uint8_t {
+    AUTHENTICATION_BONDING                = 0x01,
+    AUTHENTICATION_MITM                   = 0x04, /* 0x02 missing because bonding uses two bits */
+    AUTHENTICATION_SECURE_CONNECTIONS     = 0x08,
+    AUTHENTICATION_KEYPRESS_NOTIFICATION  = 0x10
+};
+
+struct pairing_request_t {
+    SecurityManager::SecurityIOCapabilities_t iocaps;
+    bool use_oob;
+    authentication_t auth;
+    uint8_t max_key_size;
+    key_distribution_t initiator_dist;
+    key_distribution_t responder_dist;
+};
+
 struct bonded_list_entry_t {
     address_t peer_address;
     ediv_t ediv;
@@ -296,11 +325,6 @@ public:
 
     /* keys */
 
-    virtual ble_error_t set_key_distribution() {
-        (void);
-        return BLE_ERROR_NOT_IMPLEMENTED;
-    }
-
     virtual ble_error_t set_ltk(connection_handle_t handle, ltk_t ltk) {
         (void)ltk;
         return BLE_ERROR_NOT_IMPLEMENTED;
@@ -329,22 +353,27 @@ public:
         return BLE_ERROR_NOT_IMPLEMENTED;
     }
 
-    virtual ble_error_t request_pairing() {
+    virtual ble_error_t request_pairing(connection_handle_t handle, pairing_request_t params) {
         return BLE_ERROR_NOT_IMPLEMENTED;
     }
+    virtual ble_error_t accept_pairing(connection_handle_t handle, pairing_request_t params) {
+        (void)handle;
+        (void)params;
+        return BLE_ERROR_NOT_IMPLEMENTED;
+    }
+    virtual ble_error_t reject_pairing(connection_handle_t handle) {
+        (void)handle;
+        return BLE_ERROR_NOT_IMPLEMENTED;
+    }
+    virtual ble_error_t cancel_pairing(connection_handle_t handle) {
+        (void)handle;
+        return BLE_ERROR_NOT_IMPLEMENTED;
+    }
+
     virtual ble_error_t set_pairing_request_authorisation(bool authorisation_required = true) {
         (void)authorisation_required;
         return BLE_ERROR_NOT_IMPLEMENTED;
     }
-    virtual ble_error_t accept_pairing() {
-        return BLE_ERROR_NOT_IMPLEMENTED;
-    }
-    virtual ble_error_t reject_pairing() {
-        return BLE_ERROR_NOT_IMPLEMENTED;
-    }
-    virtual ble_error_t cancel_pairing() {
-        return BLE_ERROR_NOT_IMPLEMENTED;
-    }
 
     virtual ble_error_t request_authentication() {
         return BLE_ERROR_NOT_IMPLEMENTED;
@@ -405,11 +434,11 @@ public:
         /* guaranteed to be a valid pointer */
         return _pal_event_handler;
     }
-    void set_app_event_handler(::SecurityManagerEventHandler &app_event_handler) {
+    void set_app_event_handler(::SecurityManagerEventHandler *app_event_handler) {
         _pal_event_handler->set_app_event_handler(app_event_handler);
     }
-    void set_event_handler(SecurityManagerEventHandler &event_handler) {
-        _pal_event_handler = &event_handler;
+    void set_event_handler(SecurityManagerEventHandler *event_handler) {
+        _pal_event_handler = event_handler;
     }
 
 private:
diff --git a/features/FEATURE_BLE/source/generic/GenericSecurityManager.cpp b/features/FEATURE_BLE/source/generic/GenericSecurityManager.cpp
index fae61dcc9a..693cda67f9 100644
--- a/features/FEATURE_BLE/source/generic/GenericSecurityManager.cpp
+++ b/features/FEATURE_BLE/source/generic/GenericSecurityManager.cpp
@@ -113,7 +113,7 @@ public:
 protected:
     GenericSecurityManager(ble::pal::SecurityManager& palImpl) : pal(palImpl), saveStateEnabled(false) {
         pal_event_handler.set_app_event_handler(&defaultEventHandler);
-        pal.set_event_handler(pal_event_handler);
+        pal.set_event_handler(&pal_event_handler);
     }
 
 public: