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

Commit 77cf38a3 authored by Hui Peng's avatar Hui Peng Committed by Gerrit Code Review
Browse files

Merge "Backport "Enforce authentication if encryption is required"" into main

parents cc8e2e39 f3cd05d1

system/stack/btm/btm_sec.cc

+6 −4
Original line number Original line Diff line number Diff line
@@ -4517,13 +4517,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;

        }

        }

      }

      }