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

Commit 17affc9c authored by Hui Peng's avatar Hui Peng
Browse files

Reland "Enforce authentication if encryption is required" 

While aosp/2863686 was rebased on internal security
fixes, aosp/2865187 was dropped, re-apply it.

Bug: 316244428
Test: m com.android.btservices
Flag: EXEMPT, tested/verfied on internal branches
Change-Id: I319dcfbc9bb9603c515ac0c2c647155211f95e26
parent 92371552

system/stack/btm/btm_sec.cc

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

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

      if (p_dev_rec->IsLocallyInitiated()) {

        if (p_dev_rec->sec_rec.security_required & BTM_SEC_OUT_AUTHENTICATE) {

          LOG_DEBUG("Outgoing authentication Required");

        if (p_dev_rec->sec_rec.security_required &

            (BTM_SEC_OUT_AUTHENTICATE | BTM_SEC_OUT_ENCRYPT)) {

          LOG_DEBUG("Outgoing authentication/encryption Required");

          start_auth = true;

        }

      } else {

        if (p_dev_rec->sec_rec.security_required & BTM_SEC_IN_AUTHENTICATE) {

          LOG_DEBUG("Incoming authentication Required");

        if (p_dev_rec->sec_rec.security_required &

            (BTM_SEC_IN_AUTHENTICATE | BTM_SEC_IN_ENCRYPT)) {

          LOG_DEBUG("Incoming authentication/encryption Required");

          start_auth = true;

        }

      }