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

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

Merge "Store LE device keys when bonded" am: 9115dbe9 

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

Change-Id: I3017c883fce238567ddb4bcac940962e6633e720
parents 5c3fcbf8 9115dbe9

system/gd/security/internal/security_manager_impl.cc

+15 −1
Original line number Diff line number Diff line
@@ -665,10 +665,24 @@ void SecurityManagerImpl::OnPairingFinished(security::PairingResultOrFailure pai 


  auto result = std::get<PairingResult>(pairing_result);

  LOG_INFO("Pairing with %s was successful", result.connection_address.ToString().c_str());



  // TODO: ensure that the security level is not weaker than what we already have.

  auto record = this->security_database_.FindOrCreate(result.connection_address);

  record->identity_address_ = result.distributed_keys.identity_address;

  record->ltk = result.distributed_keys.ltk;

  record->ediv = result.distributed_keys.ediv;

  record->rand = result.distributed_keys.rand;

  record->irk = result.distributed_keys.irk;

  record->signature_key = result.distributed_keys.signature_key;

  if (result.distributed_keys.link_key)

    record->SetLinkKey(*result.distributed_keys.link_key, hci::KeyType::AUTHENTICATED_P256);

  security_database_.SaveRecordsToStorage();



  NotifyDeviceBonded(result.connection_address);

  // We also notify bond complete using identity address. That's what old stack used to do.

  if (result.distributed_keys.identity_address) NotifyDeviceBonded(*result.distributed_keys.identity_address);



  security_handler_->CallOn(this, &SecurityManagerImpl::WipeLePairingHandler);

  security_database_.SaveRecordsToStorage();

}



void SecurityManagerImpl::WipeLePairingHandler() {