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

Commit 4c0ec113 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "RootCanal: Allow both sides to have OOB data" am: 5ed2e568 

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

Change-Id: I1494ba6173d1a220835ced65b8bcd2ec9450f187
parents fb993070 5ed2e568

system/vendor_libs/test_vendor_lib/model/controller/security_manager.cc

+4 −4
Original line number Diff line number Diff line
@@ -130,16 +130,16 @@ PairingType SecurityManager::GetSimplePairingType() { 
  bool peer_requires_mitm = (peer_authentication_requirements_ == AuthenticationType::NO_BONDING_MITM) ||

                            (peer_authentication_requirements_ == AuthenticationType::DEDICATED_BONDING_MITM) ||

                            (peer_authentication_requirements_ == AuthenticationType::GENERAL_BONDING_MITM);

  if (!(peer_requires_mitm || host_requires_mitm)) {

    return PairingType::AUTO_CONFIRMATION;

  }

  if (peer_oob_present_flag_ != 0 || host_oob_present_flag_ != 0) {

    if (peer_oob_present_flag_ != 0) {

    if (host_oob_present_flag_ == 0) {

      return PairingType::PEER_HAS_OUT_OF_BAND;

    } else {

      return PairingType::OUT_OF_BAND;

    }

  }

  if (!(peer_requires_mitm || host_requires_mitm)) {

    return PairingType::AUTO_CONFIRMATION;

  }

  LOG_INFO("%s: host does%s require peer does%s require MITM",

           peer_address_.ToString().c_str(), host_requires_mitm ? "" : "n't",

           peer_requires_mitm ? "" : "n't");