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

Commit 12ec3562 authored by Chris Manton's avatar Chris Manton
Browse files

[19/24] Canonical form tBTM_STATUS::BTM_NOT_AUTHENTICATED. 

Prepare for class enum-ify tBTM_STATUS

Bug: 358402071
Test: m .
Flag: EXEMPT, Mechanical Refactor

Change-Id: I14d22fe2ef73ecf8b6b234334697a910388b3e35
parent 84ef39b1

system/stack/btm/btm_ble_sec.cc

+2 −2
Original line number Diff line number Diff line
@@ -744,9 +744,9 @@ tBTM_STATUS btm_ble_start_sec_check(const RawAddress& bd_addr, uint16_t psm, boo 
      return BTM_NOT_ENCRYPTED;

    } else if ((p_serv_rec->security_flags & BTM_SEC_IN_AUTHENTICATE) &&

               !(is_link_key_authed || is_authenticated)) {

      log::error("BTM_NOT_AUTHENTICATED. service security_flags=0x{:x}",

      log::error("tBTM_STATUS::BTM_NOT_AUTHENTICATED. service security_flags=0x{:x}",

                 p_serv_rec->security_flags);

      return BTM_NOT_AUTHENTICATED;

      return tBTM_STATUS::BTM_NOT_AUTHENTICATED;

    }

    /* TODO: When security is required, then must check that the key size of our

       service is equal or smaller than the incoming connection key size. */

system/stack/l2cap/l2c_ble.cc

+1 −1
Original line number Diff line number Diff line
@@ -1348,7 +1348,7 @@ tL2CAP_LE_RESULT_CODE l2ble_sec_access_req(const RawAddress& bd_addr, uint16_t p 
      return L2CAP_LE_RESULT_CONN_OK;

    case tBTM_STATUS::BTM_ILLEGAL_VALUE:

      return L2CAP_LE_RESULT_NO_PSM;

    case BTM_NOT_AUTHENTICATED:

    case tBTM_STATUS::BTM_NOT_AUTHENTICATED:

      return L2CAP_LE_RESULT_INSUFFICIENT_AUTHENTICATION;

    case BTM_NOT_ENCRYPTED:

      return L2CAP_LE_RESULT_INSUFFICIENT_ENCRYP;