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

Commit 839f7754 authored by Zach Johnson's avatar Zach Johnson
Browse files

this used to check for authorized 

BTM_SEC_IN_FLAGS was BTM_SEC_IN_AUTHENTICATE | BTM_SEC_IN_ENCRYPT |
BTM_SEC_IN_AUTHORIZE

authorized is gone now, so we only need the condition just above this
one

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Iec6e7550b29a72627a8f52d8b49ae918c3adadce
parent f82f9ccd

system/stack/btm/btm_sec.cc

+1 −25
Original line number Diff line number Diff line
@@ -94,8 +94,6 @@ tBTM_SEC_DEV_REC* btm_sec_find_dev_by_sec_state(uint8_t state); 
static bool btm_dev_authenticated(tBTM_SEC_DEV_REC* p_dev_rec);

static bool btm_dev_encrypted(tBTM_SEC_DEV_REC* p_dev_rec);

static bool btm_dev_authorized(tBTM_SEC_DEV_REC* p_dev_rec);

static bool btm_serv_trusted(tBTM_SEC_DEV_REC* p_dev_rec,

                             tBTM_SEC_SERV_REC* p_serv_rec);

static uint16_t btm_sec_set_serv_level4_flags(uint16_t cur_security,

                                              bool is_originator);
@@ -187,24 +185,6 @@ static bool btm_dev_16_digit_authenticated(tBTM_SEC_DEV_REC* p_dev_rec) { 
  return (false);

}



/*******************************************************************************

 *

 * Function         btm_serv_trusted

 *

 * Description      check service is trusted

 *

 * Returns          bool    true or false

 *

 ******************************************************************************/

static bool btm_serv_trusted(tBTM_SEC_DEV_REC* p_dev_rec,

                             tBTM_SEC_SERV_REC* p_serv_rec) {

  if (BTM_SEC_IS_SERVICE_TRUSTED(p_dev_rec->trusted_mask,

                                 p_serv_rec->service_id)) {

    return (true);

  }

  return (false);

}



/*******************************************************************************

 *

 * Function         BTM_SecRegister
@@ -1689,11 +1669,7 @@ tBTM_STATUS btm_sec_l2cap_access_req(const RawAddress& bd_addr, uint16_t psm, 
             btm_dev_authenticated(p_dev_rec)) ||

            (((security_required & BTM_SEC_IN_FLAGS) ==

              (BTM_SEC_IN_AUTHENTICATE | BTM_SEC_IN_ENCRYPT)) &&

             btm_dev_encrypted(p_dev_rec)) ||

            (((security_required & BTM_SEC_IN_FLAGS) == BTM_SEC_IN_FLAGS) &&

             btm_dev_encrypted(p_dev_rec) &&

             (btm_dev_authorized(p_dev_rec) ||

              btm_serv_trusted(p_dev_rec, p_serv_rec)))) {

             btm_dev_encrypted(p_dev_rec))) {

          // Check for 16 digits (or MITM)

          if (((security_required & BTM_SEC_IN_MIN_16_DIGIT_PIN) == 0) ||

              (((security_required & BTM_SEC_IN_MIN_16_DIGIT_PIN) ==