SecurityManager: Add CreateBondOutOfBand interface.

Allow for creating bonds with remote Out of Band data.

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Change-Id: I6f6d85cc22fd5b1a1abf6b629ecdd37950b4d239

diff --git a/gd/security/internal/security_manager_impl.cc b/gd/security/internal/security_manager_impl.cc
index 117e18d..4e99c58 100644 (file)
--- a/gd/security/internal/security_manager_impl.cc
+++ b/gd/security/internal/security_manager_impl.cc
@@ -127,6 +127,11 @@ void SecurityManagerImpl::CreateBond(hci::AddressWithType device) {
   }
 }
 
+void SecurityManagerImpl::CreateBondOutOfBand(
+    hci::AddressWithType device, pairing::OobData remote_p192_oob_data, pairing::OobData remote_p256_oob_data) {
+  // TODO(optedoblivion): Implement when ClassicPairingHandler is ready.
+}
+
 void SecurityManagerImpl::CreateBondLe(hci::AddressWithType address) {
   auto record = security_database_.FindOrCreate(address);
   if (record->IsPaired()) {

diff --git a/gd/security/internal/security_manager_impl.h b/gd/security/internal/security_manager_impl.h
index aecf0cd..b8798dc 100644 (file)
--- a/gd/security/internal/security_manager_impl.h
+++ b/gd/security/internal/security_manager_impl.h
@@ -30,6 +30,7 @@
 #include "security/channel/security_manager_channel.h"
 #include "security/initial_informations.h"
 #include "security/pairing/classic_pairing_handler.h"
+#include "security/pairing/oob_data.h"
 #include "security/pairing_handler_le.h"
 #include "security/record/security_record.h"
 #include "security/record/security_record_database.h"
@@ -87,6 +88,18 @@ class SecurityManagerImpl : public channel::ISecurityManagerChannelListener, pub
   void CreateBond(hci::AddressWithType address);
 
   /**
+   * Initiates bond over Classic transport with device, if not bonded yet.
+   *
+   * Allows for OobData to be passed in for use while pairing
+   *
+   * @param address device address we want to bond with
+   * @param remote_p192_oob_data P192 data given to the stack
+   * @param remote_p256_oob_data P256 data given to the stack
+   */
+  void CreateBondOutOfBand(
+      hci::AddressWithType address, pairing::OobData remote_p192_oob_data, pairing::OobData remote_p256_oob_data);
+
+  /**
    * Initiates bond over Low Energy transport with device, if not bonded yet.
    *
    * @param address device address we want to bond with

diff --git a/gd/security/security_manager.cc b/gd/security/security_manager.cc
index bc9bd53..d7252e6 100644 (file)
--- a/gd/security/security_manager.cc
+++ b/gd/security/security_manager.cc
@@ -36,6 +36,16 @@ void SecurityManager::CreateBond(hci::AddressWithType device) {
                                            std::forward<hci::AddressWithType>(device)));
 }
 
+void SecurityManager::CreateBondOutOfBand(
+    hci::AddressWithType device, pairing::OobData remote_p192_oob_data, pairing::OobData remote_p256_oob_data) {
+  security_handler_->Post(common::BindOnce(
+      &internal::SecurityManagerImpl::CreateBondOutOfBand,
+      common::Unretained(security_manager_impl_),
+      std::forward<hci::AddressWithType>(device),
+      remote_p192_oob_data,
+      remote_p256_oob_data));
+}
+
 void SecurityManager::CreateBondLe(hci::AddressWithType device) {
   security_handler_->Post(common::BindOnce(&internal::SecurityManagerImpl::CreateBondLe,
                                            common::Unretained(security_manager_impl_),

diff --git a/gd/security/security_manager.h b/gd/security/security_manager.h
index aa8bd7c..8447b9c 100644 (file)
--- a/gd/security/security_manager.h
+++ b/gd/security/security_manager.h
@@ -24,6 +24,7 @@
 #include "hci/address_with_type.h"
 #include "hci/le_address_manager.h"
 #include "security/internal/security_manager_impl.h"
+#include "security/pairing/oob_data.h"
 #include "security/security_manager_listener.h"
 
 namespace bluetooth {
@@ -45,11 +46,25 @@ class SecurityManager : public UICallbacks {
   /**
    * Initiates bond over Classic transport with device, if not bonded yet.
    *
+   * This will initiate the Numeric Comparison bonding method
+   *
    * @param address device address we want to bond with
    */
   void CreateBond(hci::AddressWithType address);
 
   /**
+   * Initiates bond over Classic transport with device, if not bonded yet.
+   *
+   * This will initiate the Out of Band bonding method
+   *
+   * @param address device address we want to bond with
+   * @param remote_p192_oob_data comparison and random for p192
+   * @param remote_p256_oob_data comparison and random for p256
+   */
+  void CreateBondOutOfBand(
+      hci::AddressWithType address, pairing::OobData remote_p192_oob_data, pairing::OobData remote_p256_oob_data);
+
+  /**
    * Initiates bond over Low Energy transport with device, if not bonded yet.
    *
    * @param address device address we want to bond with