Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d59ea8e authored by Martin Brabham's avatar Martin Brabham
Browse files

Rename GetOutOfBandData -> GetLeOutOfBandData 

Currently, this function is only used by cert tests.
This rename is a stopgap until it is dropped from the
FacadeConfigurationApi interface in favor of the SecurityManager
interface.

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest:test_successful_dut_initiated_ssp_oob
Test: cert/run --host LeSecurityTest
Change-Id: Ib1a79de46d3a59ec1c14338e8328718d114aed2a
parent 8566e8b9

system/gd/security/cert/le_security_test.py

+8 −8
Original line number Diff line number Diff line
@@ -831,7 +831,7 @@ class LeSecurityTest(GdBaseTestClass): 
            self._prepare_cert_for_connection()



            if dut_oob_flag == LeOobDataFlag.PRESENT:

                oobdata = self.cert.security.GetOutOfBandData(empty_proto.Empty())

                oobdata = self.cert.security.GetLeOutOfBandData(empty_proto.Empty())

                self.dut.security.SetOutOfBandData(

                    OobDataMessage(

                        address=self.cert_address,
@@ -839,7 +839,7 @@ class LeSecurityTest(GdBaseTestClass): 
                        random_value=oobdata.random_value))



            if cert_oob_flag == LeOobDataFlag.PRESENT:

                oobdata = self.dut.security.GetOutOfBandData(empty_proto.Empty())

                oobdata = self.dut.security.GetLeOutOfBandData(empty_proto.Empty())

                self.cert.security.SetOutOfBandData(

                    OobDataMessage(

                        address=self.dut_address,
@@ -898,7 +898,7 @@ class LeSecurityTest(GdBaseTestClass): 
            self._prepare_dut_for_connection()



            if dut_oob_flag == LeOobDataFlag.PRESENT:

                oobdata = self.cert.security.GetOutOfBandData(empty_proto.Empty())

                oobdata = self.cert.security.GetLeOutOfBandData(empty_proto.Empty())

                self.dut.security.SetOutOfBandData(

                    OobDataMessage(

                        address=self.cert_address,
@@ -906,7 +906,7 @@ class LeSecurityTest(GdBaseTestClass): 
                        random_value=oobdata.random_value))



            if cert_oob_flag == LeOobDataFlag.PRESENT:

                oobdata = self.dut.security.GetOutOfBandData(empty_proto.Empty())

                oobdata = self.dut.security.GetLeOutOfBandData(empty_proto.Empty())

                self.cert.security.SetOutOfBandData(

                    OobDataMessage(

                        address=self.dut_address,
@@ -965,14 +965,14 @@ class LeSecurityTest(GdBaseTestClass): 


            self._prepare_dut_for_connection()



            oobdata = self.cert.security.GetOutOfBandData(empty_proto.Empty())

            oobdata = self.cert.security.GetLeOutOfBandData(empty_proto.Empty())

            self.dut.security.SetOutOfBandData(

                OobDataMessage(

                    address=self.cert_address,

                    confirmation_value=oobdata.confirmation_value,

                    random_value=oobdata.random_value))



            oobdata = self.dut.security.GetOutOfBandData(empty_proto.Empty())

            oobdata = self.dut.security.GetLeOutOfBandData(empty_proto.Empty())

            self.cert.security.SetOutOfBandData(

                OobDataMessage(

                    address=self.dut_address,
@@ -1036,14 +1036,14 @@ class LeSecurityTest(GdBaseTestClass): 


            self._prepare_cert_for_connection()



            oobdata = self.cert.security.GetOutOfBandData(empty_proto.Empty())

            oobdata = self.cert.security.GetLeOutOfBandData(empty_proto.Empty())

            self.dut.security.SetOutOfBandData(

                OobDataMessage(

                    address=self.cert_address,

                    confirmation_value=oobdata.confirmation_value,

                    random_value=oobdata.random_value))



            oobdata = self.dut.security.GetOutOfBandData(empty_proto.Empty())

            oobdata = self.dut.security.GetLeOutOfBandData(empty_proto.Empty())

            self.cert.security.SetOutOfBandData(

                OobDataMessage(

                    address=self.dut_address,

system/gd/security/facade.cc

+2 −2
Original line number Diff line number Diff line
@@ -299,13 +299,13 @@ class SecurityModuleFacadeService : public SecurityModuleFacade::Service, public 
    return ::grpc::Status::OK;

  }



  ::grpc::Status GetOutOfBandData(

  ::grpc::Status GetLeOutOfBandData(

      ::grpc::ServerContext* context,

      const ::google::protobuf::Empty* request,

      ::bluetooth::security::OobDataMessage* response) override {

    std::array<uint8_t, 16> le_sc_c;

    std::array<uint8_t, 16> le_sc_r;

    security_module_->GetFacadeConfigurationApi()->GetOutOfBandData(&le_sc_c, &le_sc_r);

    security_module_->GetFacadeConfigurationApi()->GetLeOutOfBandData(&le_sc_c, &le_sc_r);



    std::string le_sc_c_str(17, '\0');

    std::copy(le_sc_c.begin(), le_sc_c.end(), le_sc_c_str.data());

system/gd/security/facade.proto

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ service SecurityModuleFacade { 
  rpc SetLeIoCapability(LeIoCapabilityMessage) returns (google.protobuf.Empty) {}

  rpc SetLeAuthRequirements(LeAuthRequirementsMessage) returns (google.protobuf.Empty) {}

  rpc SetLeMaximumEncryptionKeySize(LeMaximumEncryptionKeySizeMessage) returns (google.protobuf.Empty) {}

  rpc GetOutOfBandData(google.protobuf.Empty) returns (OobDataMessage) {}

  rpc GetLeOutOfBandData(google.protobuf.Empty) returns (OobDataMessage) {}

  rpc SetOutOfBandData(OobDataMessage) returns (google.protobuf.Empty) {}

  rpc SetLeOobDataPresent(LeOobDataPresentMessage) returns (google.protobuf.Empty) {}

  rpc SetLeInitiatorAddressPolicy(hci.PrivacyPolicy) returns (google.protobuf.Empty) {}

system/gd/security/facade_configuration_api.cc

+2 −2
Original line number Diff line number Diff line
@@ -58,9 +58,9 @@ void FacadeConfigurationApi::SetLeOobDataPresent(OobDataFlag oob_present) { 
  security_handler_->CallOn(security_manager_impl_, &internal::SecurityManagerImpl::SetLeOobDataPresent, oob_present);

}



void FacadeConfigurationApi::GetOutOfBandData(

void FacadeConfigurationApi::GetLeOutOfBandData(

    std::array<uint8_t, 16>* confirmation_value, std::array<uint8_t, 16>* random_value) {

  security_manager_impl_->GetOutOfBandData(confirmation_value, random_value);

  security_manager_impl_->GetLeOutOfBandData(confirmation_value, random_value);

}



void FacadeConfigurationApi::SetOutOfBandData(

system/gd/security/facade_configuration_api.h

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 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>* confirmation_value, std::array<uint8_t, 16>* random_value);

  void GetLeOutOfBandData(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> confirmation_value,