Facade OobDataMessage: Rename members to be generic.

Member names are LE specific when that isn't necessary.
Renaming as Classic now uses the same message too.

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

diff --git a/gd/cert/py_security.py b/gd/cert/py_security.py
index d753a88..d03c055 100644 (file)
--- a/gd/cert/py_security.py
+++ b/gd/cert/py_security.py
@@ -93,13 +93,13 @@ class PySecurity(Closable):
                 p192_data=OobDataMessage(
                     address=common.BluetoothAddressWithType(
                         address=common.BluetoothAddress(address=address), type=type),
-                    le_sc_confirmation_value=bytes(bytearray(p192_oob_data[0])),
-                    le_sc_random_value=bytes(bytearray(p192_oob_data[1]))),
+                    confirmation_value=bytes(bytearray(p192_oob_data[0])),
+                    random_value=bytes(bytearray(p192_oob_data[1]))),
                 p256_data=OobDataMessage(
                     address=common.BluetoothAddressWithType(
                         address=common.BluetoothAddress(address=address), type=type),
-                    le_sc_confirmation_value=bytes(bytearray(p256_oob_data[0])),
-                    le_sc_random_value=bytes(bytearray(p256_oob_data[1])))))
+                    confirmation_value=bytes(bytearray(p256_oob_data[0])),
+                    random_value=bytes(bytearray(p256_oob_data[1])))))
 
     def remove_bond(self, address, type):
         """

diff --git a/gd/security/cert/le_security_test.py b/gd/security/cert/le_security_test.py
index a61cb3d..3adb02a 100644 (file)
--- a/gd/security/cert/le_security_test.py
+++ b/gd/security/cert/le_security_test.py
@@ -835,16 +835,16 @@ class LeSecurityTest(GdBaseTestClass):
                 self.dut.security.SetOutOfBandData(
                     OobDataMessage(
                         address=self.cert_address,
-                        le_sc_confirmation_value=oobdata.le_sc_confirmation_value,
-                        le_sc_random_value=oobdata.le_sc_random_value))
+                        confirmation_value=oobdata.confirmation_value,
+                        random_value=oobdata.random_value))
 
             if cert_oob_flag == LeOobDataFlag.PRESENT:
                 oobdata = self.dut.security.GetOutOfBandData(empty_proto.Empty())
                 self.cert.security.SetOutOfBandData(
                     OobDataMessage(
                         address=self.dut_address,
-                        le_sc_confirmation_value=oobdata.le_sc_confirmation_value,
-                        le_sc_random_value=oobdata.le_sc_random_value))
+                        confirmation_value=oobdata.confirmation_value,
+                        random_value=oobdata.random_value))
 
             self.dut.security.SetLeIoCapability(KEYBOARD_ONLY)
             self.dut.security.SetLeOobDataPresent(dut_oob_flag)
@@ -902,16 +902,16 @@ class LeSecurityTest(GdBaseTestClass):
                 self.dut.security.SetOutOfBandData(
                     OobDataMessage(
                         address=self.cert_address,
-                        le_sc_confirmation_value=oobdata.le_sc_confirmation_value,
-                        le_sc_random_value=oobdata.le_sc_random_value))
+                        confirmation_value=oobdata.confirmation_value,
+                        random_value=oobdata.random_value))
 
             if cert_oob_flag == LeOobDataFlag.PRESENT:
                 oobdata = self.dut.security.GetOutOfBandData(empty_proto.Empty())
                 self.cert.security.SetOutOfBandData(
                     OobDataMessage(
                         address=self.dut_address,
-                        le_sc_confirmation_value=oobdata.le_sc_confirmation_value,
-                        le_sc_random_value=oobdata.le_sc_random_value))
+                        confirmation_value=oobdata.confirmation_value,
+                        random_value=oobdata.random_value))
 
             self.dut.security.SetLeIoCapability(KEYBOARD_ONLY)
             self.dut.security.SetLeOobDataPresent(dut_oob_flag)
@@ -969,15 +969,15 @@ class LeSecurityTest(GdBaseTestClass):
             self.dut.security.SetOutOfBandData(
                 OobDataMessage(
                     address=self.cert_address,
-                    le_sc_confirmation_value=oobdata.le_sc_confirmation_value,
-                    le_sc_random_value=oobdata.le_sc_random_value))
+                    confirmation_value=oobdata.confirmation_value,
+                    random_value=oobdata.random_value))
 
             oobdata = self.dut.security.GetOutOfBandData(empty_proto.Empty())
             self.cert.security.SetOutOfBandData(
                 OobDataMessage(
                     address=self.dut_address,
-                    le_sc_confirmation_value=oobdata.le_sc_confirmation_value,
-                    le_sc_random_value=oobdata.le_sc_random_value))
+                    confirmation_value=oobdata.confirmation_value,
+                    random_value=oobdata.random_value))
 
             self.dut.security.SetLeIoCapability(KEYBOARD_ONLY)
             self.dut.security.SetLeOobDataPresent(OOB_PRESENT)
@@ -1040,15 +1040,15 @@ class LeSecurityTest(GdBaseTestClass):
             self.dut.security.SetOutOfBandData(
                 OobDataMessage(
                     address=self.cert_address,
-                    le_sc_confirmation_value=oobdata.le_sc_confirmation_value,
-                    le_sc_random_value=oobdata.le_sc_random_value))
+                    confirmation_value=oobdata.confirmation_value,
+                    random_value=oobdata.random_value))
 
             oobdata = self.dut.security.GetOutOfBandData(empty_proto.Empty())
             self.cert.security.SetOutOfBandData(
                 OobDataMessage(
                     address=self.dut_address,
-                    le_sc_confirmation_value=oobdata.le_sc_confirmation_value,
-                    le_sc_random_value=oobdata.le_sc_random_value))
+                    confirmation_value=oobdata.confirmation_value,
+                    random_value=oobdata.random_value))
 
             self.dut.security.SetLeIoCapability(KEYBOARD_ONLY)
             self.dut.security.SetLeOobDataPresent(OOB_PRESENT)

diff --git a/gd/security/facade.cc b/gd/security/facade.cc
index 1db3882..3d7fdf2 100644 (file)
--- a/gd/security/facade.cc
+++ b/gd/security/facade.cc
@@ -109,22 +109,16 @@ class SecurityModuleFacadeService : public SecurityModuleFacade::Service, public
     pairing::SimplePairingHash c;
     pairing::SimplePairingRandomizer r;
     std::copy(
-        std::begin(request->p192_data().le_sc_confirmation_value()),
-        std::end(request->p192_data().le_sc_confirmation_value()),
+        std::begin(request->p192_data().confirmation_value()),
+        std::end(request->p192_data().confirmation_value()),
         c.data());
-    std::copy(
-        std::begin(request->p192_data().le_sc_random_value()),
-        std::end(request->p192_data().le_sc_random_value()),
-        r.data());
+    std::copy(std::begin(request->p192_data().random_value()), std::end(request->p192_data().random_value()), r.data());
     pairing::OobData p192_data(c, r);
     std::copy(
-        std::begin(request->p256_data().le_sc_confirmation_value()),
-        std::end(request->p256_data().le_sc_confirmation_value()),
+        std::begin(request->p256_data().confirmation_value()),
+        std::end(request->p256_data().confirmation_value()),
         c.data());
-    std::copy(
-        std::begin(request->p256_data().le_sc_random_value()),
-        std::end(request->p256_data().le_sc_random_value()),
-        r.data());
+    std::copy(std::begin(request->p256_data().random_value()), std::end(request->p256_data().random_value()), r.data());
     pairing::OobData p256_data(c, r);
     security_module_->GetSecurityManager()->CreateBondOutOfBand(
         hci::AddressWithType(peer, peer_type), p192_data, p256_data);
@@ -315,11 +309,11 @@ class SecurityModuleFacadeService : public SecurityModuleFacade::Service, public
 
     std::string le_sc_c_str(17, '\0');
     std::copy(le_sc_c.begin(), le_sc_c.end(), le_sc_c_str.data());
-    response->set_le_sc_confirmation_value(le_sc_c_str);
+    response->set_confirmation_value(le_sc_c_str);
 
     std::string le_sc_r_str(17, '\0');
     std::copy(le_sc_r.begin(), le_sc_r.end(), le_sc_r_str.data());
-    response->set_le_sc_random_value(le_sc_r_str);
+    response->set_random_value(le_sc_r_str);
 
     return ::grpc::Status::OK;
   }
@@ -336,11 +330,11 @@ class SecurityModuleFacadeService : public SecurityModuleFacade::Service, public
     // We can't simply iterate till end of string, because we have an empty byte added at the end. We know confirm and
     // random are fixed size, 16 bytes
     std::array<uint8_t, 16> le_sc_c;
-    auto req_le_sc_c = request->le_sc_confirmation_value();
+    auto req_le_sc_c = request->confirmation_value();
     std::copy(req_le_sc_c.begin(), req_le_sc_c.begin() + 16, le_sc_c.data());
 
     std::array<uint8_t, 16> le_sc_r;
-    auto req_le_sc_r = request->le_sc_random_value();
+    auto req_le_sc_r = request->random_value();
     std::copy(req_le_sc_r.begin(), req_le_sc_r.begin() + 16, le_sc_r.data());
 
     security_module_->GetFacadeConfigurationApi()->SetOutOfBandData(peer_with_type, le_sc_c, le_sc_r);

diff --git a/gd/security/facade.proto b/gd/security/facade.proto
index b1f2eb7..2ab692c 100644 (file)
--- a/gd/security/facade.proto
+++ b/gd/security/facade.proto
@@ -33,8 +33,8 @@ service SecurityModuleFacade {
 
 message OobDataMessage {
   facade.BluetoothAddressWithType address = 1;
-  bytes le_sc_confirmation_value = 2;
-  bytes le_sc_random_value = 3;
+  bytes confirmation_value = 2;
+  bytes random_value = 3;
 }
 
 message OobDataBondMessage {

diff --git a/gd/security/facade_configuration_api.cc b/gd/security/facade_configuration_api.cc
index d7d486d..07abfd4 100644 (file)
--- a/gd/security/facade_configuration_api.cc
+++ b/gd/security/facade_configuration_api.cc
@@ -59,20 +59,20 @@ void FacadeConfigurationApi::SetLeOobDataPresent(OobDataFlag oob_present) {
 }
 
 void FacadeConfigurationApi::GetOutOfBandData(
-    std::array<uint8_t, 16>* le_sc_confirmation_value, std::array<uint8_t, 16>* le_sc_random_value) {
-  security_manager_impl_->GetOutOfBandData(le_sc_confirmation_value, le_sc_random_value);
+    std::array<uint8_t, 16>* confirmation_value, std::array<uint8_t, 16>* random_value) {
+  security_manager_impl_->GetOutOfBandData(confirmation_value, random_value);
 }
 
 void FacadeConfigurationApi::SetOutOfBandData(
     hci::AddressWithType remote_address,
-    std::array<uint8_t, 16> le_sc_confirmation_value,
-    std::array<uint8_t, 16> le_sc_random_value) {
+    std::array<uint8_t, 16> confirmation_value,
+    std::array<uint8_t, 16> random_value) {
   security_handler_->CallOn(
       security_manager_impl_,
       &internal::SecurityManagerImpl::SetOutOfBandData,
       remote_address,
-      le_sc_confirmation_value,
-      le_sc_random_value);
+      confirmation_value,
+      random_value);
 }
 
 void FacadeConfigurationApi::EnforceSecurityPolicy(

diff --git a/gd/security/facade_configuration_api.h b/gd/security/facade_configuration_api.h
index 2c34696..b20391d 100644 (file)
--- a/gd/security/facade_configuration_api.h
+++ b/gd/security/facade_configuration_api.h
@@ -50,11 +50,11 @@ class FacadeConfigurationApi {
   void SetLeAuthRequirements(uint8_t auth_req);
   void SetLeMaximumEncryptionKeySize(uint8_t maximum_encryption_key_size);
   void SetLeOobDataPresent(OobDataFlag oob_present);
-  void GetOutOfBandData(std::array<uint8_t, 16>* le_sc_confirmation_value, std::array<uint8_t, 16>* le_sc_random_value);
+  void GetOutOfBandData(std::array<uint8_t, 16>* confirmation_value, std::array<uint8_t, 16>* random_value);
   void SetOutOfBandData(
       hci::AddressWithType remote_address,
-      std::array<uint8_t, 16> le_sc_confirmation_value,
-      std::array<uint8_t, 16> le_sc_random_value);
+      std::array<uint8_t, 16> confirmation_value,
+      std::array<uint8_t, 16> random_value);
 
  protected:
   FacadeConfigurationApi(os::Handler* security_handler, internal::SecurityManagerImpl* security_manager_impl)

diff --git a/gd/security/internal/security_manager_impl.cc b/gd/security/internal/security_manager_impl.cc
index 6a0c84e..dff9c75 100644 (file)
--- a/gd/security/internal/security_manager_impl.cc
+++ b/gd/security/internal/security_manager_impl.cc
@@ -750,19 +750,19 @@ void SecurityManagerImpl::SetLeOobDataPresent(OobDataFlag data_present) {
 }
 
 void SecurityManagerImpl::GetOutOfBandData(
-    std::array<uint8_t, 16>* le_sc_confirmation_value, std::array<uint8_t, 16>* le_sc_random_value) {
+    std::array<uint8_t, 16>* confirmation_value, std::array<uint8_t, 16>* random_value) {
   local_le_oob_data_ = std::make_optional<MyOobData>(PairingHandlerLe::GenerateOobData());
-  *le_sc_confirmation_value = local_le_oob_data_.value().c;
-  *le_sc_random_value = local_le_oob_data_.value().r;
+  *confirmation_value = local_le_oob_data_.value().c;
+  *random_value = local_le_oob_data_.value().r;
 }
 
 void SecurityManagerImpl::SetOutOfBandData(
     hci::AddressWithType remote_address,
-    std::array<uint8_t, 16> le_sc_confirmation_value,
-    std::array<uint8_t, 16> le_sc_random_value) {
+    std::array<uint8_t, 16> confirmation_value,
+    std::array<uint8_t, 16> random_value) {
   remote_oob_data_address_ = remote_address;
-  remote_oob_data_le_sc_c_ = le_sc_confirmation_value;
-  remote_oob_data_le_sc_r_ = le_sc_random_value;
+  remote_oob_data_le_sc_c_ = confirmation_value;
+  remote_oob_data_le_sc_r_ = random_value;
 }
 
 void SecurityManagerImpl::SetAuthenticationRequirements(hci::AuthenticationRequirements authentication_requirements) {

diff --git a/gd/security/internal/security_manager_impl.h b/gd/security/internal/security_manager_impl.h
index 3e8cec6..8f19dae 100644 (file)
--- a/gd/security/internal/security_manager_impl.h
+++ b/gd/security/internal/security_manager_impl.h
@@ -191,11 +191,11 @@ class SecurityManagerImpl : public channel::ISecurityManagerChannelListener, pub
   void SetLeAuthRequirements(uint8_t auth_req);
   void SetLeMaximumEncryptionKeySize(uint8_t maximum_encryption_key_size);
   void SetLeOobDataPresent(OobDataFlag data_present);
-  void GetOutOfBandData(std::array<uint8_t, 16>* le_sc_confirmation_value, std::array<uint8_t, 16>* le_sc_random_value);
+  void GetOutOfBandData(std::array<uint8_t, 16>* confirmation_value, std::array<uint8_t, 16>* random_value);
   void SetOutOfBandData(
       hci::AddressWithType remote_address,
-      std::array<uint8_t, 16> le_sc_confirmation_value,
-      std::array<uint8_t, 16> le_sc_random_value);
+      std::array<uint8_t, 16> confirmation_value,
+      std::array<uint8_t, 16> random_value);
 
   void EnforceSecurityPolicy(hci::AddressWithType remote, l2cap::classic::SecurityPolicy policy,
                              l2cap::classic::SecurityEnforcementInterface::ResultCallback result_callback);