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

Commit bb8da304 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Automerger Merge Worker
Browse files

GD Security Pass local IRK and Address around am: c35b5c22 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1469526

Change-Id: I5b6e9713026711271ea69d73b7f83eebb50f55b0
parents 0b531711 c35b5c22

system/gd/security/initial_informations.h

+3 −0
Original line number Diff line number Diff line
@@ -79,6 +79,9 @@ struct InitialInformations { 
  hci::Role my_role;

  hci::AddressWithType my_connection_address;



  hci::AddressWithType my_identity_address;

  crypto_toolbox::Octet16 my_identity_resolving_key;



  /* My capabilities, as in pairing request/response */

  struct {

    IoCapability io_capability;

system/gd/security/internal/security_manager_impl.cc

+27 −4
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "crypto_toolbox/crypto_toolbox.h"

#include "hci/address_with_type.h"

#include "os/log.h"

#include "os/rand.h"

#include "security/initial_informations.h"

#include "security/internal/security_manager_impl.h"

#include "security/pairing_handler_le.h"
@@ -77,17 +78,33 @@ void SecurityManagerImpl::Init() { 
  ASSERT_LOG(storage_module_ != nullptr, "Storage module must not be null!");

  security_database_.LoadRecordsFromStorage();



  // TODO(b/161543441): read the privacy policy from device-specific configuration, and IRK from config file.

  storage::AdapterConfig adapter_config = storage_module_->GetAdapterConfig();

  if (!adapter_config.GetLeIdentityResolvingKey()) {

    auto mutation = storage_module_->Modify();

    mutation.Add(adapter_config.SetLeIdentityResolvingKey(bluetooth::os::GenerateRandom<16>()));

    mutation.Commit();

  }



  Address controllerAddress = controller_->GetMacAddress();

  if (!adapter_config.GetAddress() || adapter_config.GetAddress().value() != controllerAddress) {

    auto mutation = storage_module_->Modify();

    mutation.Add(adapter_config.SetAddress(controllerAddress));

    mutation.Commit();

  }



  local_identity_address_ =

      hci::AddressWithType(adapter_config.GetAddress().value(), hci::AddressType::PUBLIC_DEVICE_ADDRESS);

  local_identity_resolving_key_ = adapter_config.GetLeIdentityResolvingKey().value().bytes;



  hci::LeAddressManager::AddressPolicy address_policy = hci::LeAddressManager::AddressPolicy::USE_RESOLVABLE_ADDRESS;

  hci::AddressWithType address_with_type(hci::Address{}, hci::AddressType::RANDOM_DEVICE_ADDRESS);

  crypto_toolbox::Octet16 irk = {

      0x44, 0xfb, 0x4b, 0x8d, 0x6c, 0x58, 0x21, 0x0c, 0xf9, 0x3d, 0xda, 0xf1, 0x64, 0xa3, 0xbb, 0x7f};



  /* 7 minutes minimum, 15 minutes maximum for random address refreshing */

  auto minimum_rotation_time = std::chrono::minutes(7);

  auto maximum_rotation_time = std::chrono::minutes(15);



  acl_manager_->SetPrivacyPolicyForInitiatorAddress(

      address_policy, address_with_type, irk, minimum_rotation_time, maximum_rotation_time);

      address_policy, address_with_type, local_identity_resolving_key_, minimum_rotation_time, maximum_rotation_time);

}



void SecurityManagerImpl::CreateBond(hci::AddressWithType device) {
@@ -492,6 +509,8 @@ void SecurityManagerImpl::OnSmpCommandLe(hci::AddressWithType device) { 
    InitialInformations initial_informations{

        .my_role = my_role,

        .my_connection_address = channel->GetLinkOptions()->GetLocalAddress(),

        .my_identity_address = local_identity_address_,

        .my_identity_resolving_key = local_identity_resolving_key_,

        /*TODO: properly obtain capabilities from device-specific storage*/

        .myPairingCapabilities = {.io_capability = local_le_io_capability_,

                                  .oob_data_flag = local_le_oob_data_present_,
@@ -562,6 +581,8 @@ void SecurityManagerImpl::ConnectionIsReadyStartPairing(LeFixedChannelEntry* sto 
  InitialInformations initial_informations{

      .my_role = channel->GetLinkOptions()->GetRole(),

      .my_connection_address = channel->GetLinkOptions()->GetLocalAddress(),

      .my_identity_address = local_identity_address_,

      .my_identity_resolving_key = local_identity_resolving_key_,

      /*TODO: properly obtain capabilities from device-specific storage*/

      .myPairingCapabilities = {.io_capability = local_le_io_capability_,

                                .oob_data_flag = local_le_oob_data_present_,
@@ -624,6 +645,7 @@ SecurityManagerImpl::SecurityManagerImpl( 
    channel::SecurityManagerChannel* security_manager_channel,

    hci::HciLayer* hci_layer,

    hci::AclManager* acl_manager,

    hci::Controller* controller,

    storage::StorageModule* storage_module,

    neighbor::NameDbModule* name_db_module)

    : security_handler_(security_handler),
@@ -633,6 +655,7 @@ SecurityManagerImpl::SecurityManagerImpl( 
          hci_layer->GetLeSecurityInterface(security_handler_->BindOn(this, &SecurityManagerImpl::OnHciLeEvent))),

      security_manager_channel_(security_manager_channel),

      acl_manager_(acl_manager),

      controller_(controller),

      storage_module_(storage_module),

      security_record_storage_(storage_module, security_handler),

      security_database_(security_record_storage_),

system/gd/security/internal/security_manager_impl.h

+6 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <utility>



#include "hci/acl_manager.h"

#include "hci/controller.h"

#include "l2cap/classic/security_enforcement_interface.h"

#include "l2cap/le/l2cap_le_module.h"

#include "l2cap/le/security_enforcement_interface.h"
@@ -58,6 +59,7 @@ class SecurityManagerImpl : public channel::ISecurityManagerChannelListener, pub 
      channel::SecurityManagerChannel* security_manager_channel,

      hci::HciLayer* hci_layer,

      hci::AclManager* acl_manager,

      hci::Controller* controller,

      storage::StorageModule* storage_module,

      neighbor::NameDbModule* name_db_module);
@@ -217,6 +219,7 @@ class SecurityManagerImpl : public channel::ISecurityManagerChannelListener, pub 
  void OnPairingFinished(bluetooth::security::PairingResultOrFailure pairing_result);

  void OnHciLeEvent(hci::LeMetaEventView event);

  LeFixedChannelEntry* FindStoredLeChannel(const hci::AddressWithType& device);

  LeFixedChannelEntry* FindStoredLeChannel(uint8_t connection_handle);

  bool EraseStoredLeChannel(const hci::AddressWithType& device);

  void InternalEnforceSecurityPolicy(

      hci::AddressWithType remote,
@@ -233,6 +236,7 @@ class SecurityManagerImpl : public channel::ISecurityManagerChannelListener, pub 
  hci::LeSecurityInterface* hci_security_interface_le_ __attribute__((unused));

  channel::SecurityManagerChannel* security_manager_channel_;

  hci::AclManager* acl_manager_;

  hci::Controller* controller_;

  storage::StorageModule* storage_module_ __attribute__((unused));

  record::SecurityRecordStorage security_record_storage_;

  record::SecurityRecordDatabase security_database_;
@@ -250,6 +254,8 @@ class SecurityManagerImpl : public channel::ISecurityManagerChannelListener, pub 
  std::optional<crypto_toolbox::Octet16> remote_oob_data_le_sc_c_;

  std::optional<crypto_toolbox::Octet16> remote_oob_data_le_sc_r_;

  std::optional<FacadeDisconnectCallback> facade_disconnect_callback_;

  hci::AddressWithType local_identity_address_;

  crypto_toolbox::Octet16 local_identity_resolving_key_;



  struct PendingSecurityEnforcementEntry {

    l2cap::classic::SecurityPolicy policy_;

system/gd/security/pairing_handler_le.cc

+6 −4
Original line number Diff line number Diff line
@@ -208,7 +208,8 @@ void PairingHandlerLe::PairingMain(InitialInformations i) { 


  i.OnPairingFinished(PairingResult{

      .connection_address = i.remote_connection_address,

      .distributed_keys = std::get<DistributedKeys>(keyExchangeStatus),

      .distributed_keys = distributed_keys,

      .key_size = key_size,

  });



  LOG_INFO("Pairing finished successfully.");
@@ -340,9 +341,10 @@ DistributedKeysOrFailure PairingHandlerLe::DistributeKeys(const InitialInformati 
  uint16_t my_ediv = bluetooth::os::GenerateRandom();

  std::array<uint8_t, 8> my_rand = bluetooth::os::GenerateRandom<8>();



  Octet16 my_irk = {0x01};

  Address my_identity_address;

  AddrType my_identity_address_type = AddrType::PUBLIC;

  Octet16 my_irk = i.my_identity_resolving_key;

  Address my_identity_address = i.my_identity_address.GetAddress();

  AddrType my_identity_address_type =

      static_cast<bluetooth::security::AddrType>(i.my_identity_address.GetAddressType());

  Octet16 my_signature_key{0};



  if (IAmCentral(i)) {

system/gd/security/pairing_handler_le_unittest.cc

+9 −0
Original line number Diff line number Diff line
@@ -134,6 +134,9 @@ class PairingHandlerUnitTest : public testing::Test { 
InitialInformations initial_informations{

    .my_role = hci::Role::CENTRAL,

    .my_connection_address = {{}, hci::AddressType::PUBLIC_DEVICE_ADDRESS},

    .my_identity_address = {{}, hci::AddressType::PUBLIC_DEVICE_ADDRESS},

    .my_identity_resolving_key =

        {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},



    .myPairingCapabilities = {.io_capability = IoCapability::NO_INPUT_NO_OUTPUT,

                              .oob_data_flag = OobDataFlag::NOT_PRESENT,
@@ -271,6 +274,9 @@ TEST_F(PairingHandlerUnitTest, test_secure_connections_just_works) { 
InitialInformations initial_informations_trsi{

    .my_role = hci::Role::CENTRAL,

    .my_connection_address = hci::AddressWithType(),

    .my_identity_address = {{}, hci::AddressType::PUBLIC_DEVICE_ADDRESS},

    .my_identity_resolving_key =

        {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},



    .myPairingCapabilities = {.io_capability = IoCapability::NO_INPUT_NO_OUTPUT,

                              .oob_data_flag = OobDataFlag::NOT_PRESENT,
@@ -310,6 +316,9 @@ TEST_F(PairingHandlerUnitTest, test_remote_peripheral_initiating) { 
InitialInformations initial_informations_trmi{

    .my_role = hci::Role::PERIPHERAL,

    .my_connection_address = hci::AddressWithType(),

    .my_identity_address = {{}, hci::AddressType::PUBLIC_DEVICE_ADDRESS},

    .my_identity_resolving_key =

        {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},



    .myPairingCapabilities = {.io_capability = IoCapability::NO_INPUT_NO_OUTPUT,

                              .oob_data_flag = OobDataFlag::NOT_PRESENT,