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

Commit 0589042d authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Cert: Add IRK to LeAclManagerFacade am: c0877014 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/18513612



Change-Id: Ib8d461b95224056ac4814fed3a0043d43ad91cbd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 92caecf5 c0877014

system/blueberry/facade/hci/le_acl_manager_facade.proto

+7 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ service LeAclManagerFacade { 
  rpc SendAclData(LeAclData) returns (google.protobuf.Empty) {}

  rpc FetchAclData(LeHandleMsg) returns (stream LeAclData) {}

  rpc FetchIncomingConnection(google.protobuf.Empty) returns (stream LeConnectionEvent) {}

  rpc AddDeviceToResolvingList(IrkMsg) returns (google.protobuf.Empty) {}

}



message LeHandleMsg {
@@ -37,3 +38,9 @@ message CreateConnectionMsg { 
  bool is_direct = 2;

}



message IrkMsg {

  blueberry.facade.BluetoothAddressWithType peer = 1;

  bytes peer_irk = 2;

  bytes local_irk = 3;

}

system/gd/hci/facade/le_acl_manager_facade.cc

+30 −0
Original line number Diff line number Diff line
@@ -169,6 +169,36 @@ class LeAclManagerFacadeService : public LeAclManagerFacade::Service, public LeC 
    return incoming_connection_events_->RunLoop(context, writer);

  }



  ::grpc::Status AddDeviceToResolvingList(

      ::grpc::ServerContext* context, const IrkMsg* request, ::google::protobuf::Empty* response) override {

    Address peer_address;

    ASSERT(Address::FromString(request->peer().address().address(), peer_address));

    AddressWithType peer(peer_address, static_cast<AddressType>(request->peer().type()));



    auto request_peer_irk_length = request->peer_irk().end() - request->peer_irk().begin();



    if (request_peer_irk_length != crypto_toolbox::OCTET16_LEN) {

      return ::grpc::Status(::grpc::StatusCode::INVALID_ARGUMENT, "Invalid Peer IRK");

    }



    auto request_local_irk_length = request->local_irk().end() - request->local_irk().begin();

    if (request_local_irk_length != crypto_toolbox::OCTET16_LEN) {

      return ::grpc::Status(::grpc::StatusCode::INVALID_ARGUMENT, "Invalid Local IRK");

    }



    crypto_toolbox::Octet16 peer_irk = {};

    crypto_toolbox::Octet16 local_irk = {};



    std::vector<uint8_t> peer_irk_data(request->peer_irk().begin(), request->peer_irk().end());

    std::copy_n(peer_irk_data.begin(), crypto_toolbox::OCTET16_LEN, peer_irk.begin());



    std::vector<uint8_t> local_irk_data(request->local_irk().begin(), request->local_irk().end());

    std::copy_n(local_irk_data.begin(), crypto_toolbox::OCTET16_LEN, local_irk.begin());



    acl_manager_->AddDeviceToResolvingList(peer, peer_irk, local_irk);

    return ::grpc::Status::OK;

  }



  ::grpc::Status SendAclData(

      ::grpc::ServerContext* context, const LeAclData* request, ::google::protobuf::Empty* response) override {

    std::promise<void> promise;