Merge pull request #632 from ArturA-MS/pairing_auth_req_etc

Added support for passkey-entry and made some usability improvements

Author: hathach

libraries/Bluefruit52Lib/src/BLESecurity.cpp

@@ -76,10 +76,18 @@ static void _passkey_display_cabllack_dfr(BLESecurity::pair_passkey_cb_t func, u
   }
 }
 
+static void _passkey_request_callback_dfr(BLESecurity::pair_passkey_req_cb_t func, uint16_t conn_hdl)
+{
+  uint8_t passkey[6];
+  func(conn_hdl, passkey);
+  sd_ble_gap_auth_key_reply(conn_hdl, BLE_GAP_AUTH_KEY_TYPE_PASSKEY, passkey);
+}
+
 BLESecurity::BLESecurity(void)
 {
   _sec_param = _sec_param_default;
   _passkey_cb = NULL;
+  _passkey_req_cb = NULL;
   _complete_cb = NULL;
   _secured_cb = NULL;
 }
@@ -207,6 +215,12 @@ bool BLESecurity::setPairPasskeyCallback(pair_passkey_cb_t fp)
   return true;
 }
 
+void BLESecurity::setPairPasskeyRequestCallback(pair_passkey_req_cb_t fp)
+{
+  _passkey_req_cb = fp;
+  _sec_param.mitm = 1;
+}
+
 void BLESecurity::setPairCompleteCallback(pair_complete_cb_t fp)
 {
   _complete_cb = fp;
@@ -308,6 +322,16 @@ void BLESecurity::_eventHandler(ble_evt_t* evt)
     }
     break;
 
+    case BLE_GAP_EVT_AUTH_KEY_REQUEST:
+    {
+      LOG_LV2("PAIR", "Passkey requested");
+      if (_passkey_req_cb)
+      {
+        ada_callback(NULL, 0, _passkey_request_callback_dfr, _passkey_req_cb, conn_hdl);
+      }
+    }
+    break;
+
 #ifdef NRF_CRYPTOCELL
     case BLE_GAP_EVT_LESC_DHKEY_REQUEST:
     {

libraries/Bluefruit52Lib/src/BLESecurity.h

@@ -35,7 +35,8 @@
 class BLESecurity
 {
   public:
-    typedef bool (*pair_passkey_cb_t ) (uint16_t conn_hdl, uint8_t const passkey[6], bool match_request);
+    typedef bool (*pair_passkey_cb_t) (uint16_t conn_hdl, uint8_t const passkey[6], bool match_request);
+    typedef void (*pair_passkey_req_cb_t) (uint16_t conn_hdl, uint8_t passkey[6]);
     typedef void (*pair_complete_cb_t) (uint16_t conn_hdl, uint8_t auth_status);
     typedef void (*secured_conn_cb_t) (uint16_t conn_hdl);
 
@@ -57,6 +58,7 @@ class BLESecurity
 
     //------------- Callbacks -------------//
     bool setPairPasskeyCallback(pair_passkey_cb_t fp);
+    void setPairPasskeyRequestCallback(pair_passkey_req_cb_t fp);
     void setPairCompleteCallback(pair_complete_cb_t fp);
     void setSecuredCallback(secured_conn_cb_t fp);
 
@@ -82,6 +84,7 @@ class BLESecurity
     bond_keys_t  _bond_keys; // Shared keys with bonded device during securing connection, size ~ 80 bytes
 
     pair_passkey_cb_t  _passkey_cb;
+    pair_passkey_req_cb_t _passkey_req_cb;
     pair_complete_cb_t _complete_cb;
     secured_conn_cb_t  _secured_cb;
 };

libraries/Bluefruit52Lib/src/bluefruit.cpp

@@ -607,6 +607,21 @@ bool AdafruitBluefruit::connected(uint16_t conn_hdl)
   return conn && conn->connected();
 }
 
+uint8_t AdafruitBluefruit::getConnectedHandles(uint16_t* hdl_list, uint8_t max_count)
+{
+  uint8_t count = 0;
+  for (uint16_t hdl = 0; (hdl < BLE_MAX_CONNECTION) && (count < max_count); ++hdl)
+  {
+    if (this->connected(hdl))
+    {
+      hdl_list[count] = hdl;
+      count++;
+    }
+  }
+
+  return count;
+}
+
 bool AdafruitBluefruit::disconnect(uint16_t conn_hdl)
 {
   BLEConnection* conn = this->Connection(conn_hdl);

libraries/Bluefruit52Lib/src/bluefruit.h

@@ -164,6 +164,7 @@ class AdafruitBluefruit
     uint8_t  connected         (void); // Number of connected
     bool     connected         (uint16_t conn_hdl);
 
+    uint8_t  getConnectedHandles(uint16_t* hdl_list, uint8_t max_count);
     uint16_t connHandle        (void);
 
     // Alias to BLEConnection API()