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

Commit b78a735e authored by Hui Peng's avatar Hui Peng Committed by Automerger Merge Worker
Browse files

Enforce authentication if encryption is required am: 0a8c39cd 

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



Change-Id: Ifa1633f73a7b44c2b700e92e2432bc49edde0fd8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 14f581e9 0a8c39cd

system/stack/btm/btm_sec.cc

+6 −4
Original line number Original line Diff line number Diff line
@@ -4418,13 +4418,15 @@ tBTM_STATUS btm_sec_execute_procedure(tBTM_SEC_DEV_REC* p_dev_rec) { 
    // Check link status of BR/EDR

    // Check link status of BR/EDR

    if (!(p_dev_rec->sec_flags & BTM_SEC_AUTHENTICATED)) {

    if (!(p_dev_rec->sec_flags & BTM_SEC_AUTHENTICATED)) {

      if (p_dev_rec->IsLocallyInitiated()) {

      if (p_dev_rec->IsLocallyInitiated()) {

        if (p_dev_rec->security_required & BTM_SEC_OUT_AUTHENTICATE) {

        if (p_dev_rec->security_required &

          LOG_DEBUG("Outgoing authentication Required");

            (BTM_SEC_OUT_AUTHENTICATE | BTM_SEC_OUT_ENCRYPT)) {

          LOG_DEBUG("Outgoing authentication/encryption Required");

          start_auth = true;

          start_auth = true;

        }

        }

      } else {

      } else {

        if (p_dev_rec->security_required & BTM_SEC_IN_AUTHENTICATE) {

        if (p_dev_rec->security_required &

          LOG_DEBUG("Incoming authentication Required");

            (BTM_SEC_IN_AUTHENTICATE | BTM_SEC_IN_ENCRYPT)) {

          LOG_DEBUG("Incoming authentication/encryption Required");

          start_auth = true;

          start_auth = true;

        }

        }

      }

      }