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

Commit 27a3bac7 authored by Himanshu Rawat's avatar Himanshu Rawat
Browse files

Remove const qualifier for the output argument 

Payload with SMP_IO_CAP_REQ_EVT event has output arguments but
tSMP_EVT_DATA is declared a const in tSMP_CALLBACK.

Test: mmm packages/modules/Bluetooth
Flag: EXEMPT refactor
Bug: 286334644
Change-Id: If72ecdbc1abdcb9957fcedcd268046bbb51fff71
parent c2fd7e68

system/bta/dm/bta_dm_sec.cc

+1 −2
Original line number Diff line number Diff line
@@ -658,7 +658,7 @@ static void ble_io_req(const RawAddress& bd_addr, tBTM_IO_CAP* p_io_cap, tBTM_OO 
static tBTM_STATUS bta_dm_ble_smp_cback(tBTM_LE_EVT event, const RawAddress& bda,

                                        tBTM_LE_EVT_DATA* p_data) {

  tBTM_STATUS status = tBTM_STATUS::BTM_SUCCESS;

  tBTA_DM_SEC sec_event;

  tBTA_DM_SEC sec_event = {};



  log::debug("addr:{},event:{}", bda, ble_evt_to_text(event));
@@ -666,7 +666,6 @@ static tBTM_STATUS bta_dm_ble_smp_cback(tBTM_LE_EVT event, const RawAddress& bda 
    return tBTM_STATUS::BTM_NOT_AUTHORIZED;

  }



  memset(&sec_event, 0, sizeof(tBTA_DM_SEC));

  switch (event) {

    case BTM_LE_IO_REQ_EVT:

      ble_io_req(bda, &p_data->io_req.io_cap, &p_data->io_req.oob_data, &p_data->io_req.auth_req,

system/stack/btm/btm_ble_sec.cc

+9 −9
Original line number Diff line number Diff line
@@ -1657,8 +1657,7 @@ static tBTM_STATUS btm_ble_sirk_verification_req(const RawAddress& bd_addr) { 
 *  Description     This function is the SMP callback handler.

 *

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

tBTM_STATUS btm_proc_smp_cback(tSMP_EVT event, const RawAddress& bd_addr,

                               const tSMP_EVT_DATA* p_data) {

tBTM_STATUS btm_proc_smp_cback(tSMP_EVT event, const RawAddress& bd_addr, tSMP_EVT_DATA* p_data) {

  log::verbose("bd_addr:{}, event={}", bd_addr, smp_evt_to_text(event));



  if (event == SMP_SC_LOC_OOB_DATA_UP_EVT) {
@@ -1676,11 +1675,11 @@ tBTM_STATUS btm_proc_smp_cback(tSMP_EVT event, const RawAddress& bd_addr, 
  tBTM_STATUS status = tBTM_STATUS::BTM_SUCCESS;

  switch (event) {

    case SMP_IO_CAP_REQ_EVT:

      btm_ble_io_capabilities_req(p_dev_rec, (tBTM_LE_IO_REQ*)&p_data->io_req);

      btm_ble_io_capabilities_req(p_dev_rec, reinterpret_cast<tBTM_LE_IO_REQ*>(&p_data->io_req));

      break;



    case SMP_BR_KEYS_REQ_EVT:

      btm_ble_br_keys_req(p_dev_rec, (tBTM_LE_IO_REQ*)&p_data->io_req);

      btm_ble_br_keys_req(p_dev_rec, reinterpret_cast<tBTM_LE_IO_REQ*>(&p_data->io_req));

      break;



    case SMP_PASSKEY_REQ_EVT:
@@ -1689,23 +1688,24 @@ tBTM_STATUS btm_proc_smp_cback(tSMP_EVT event, const RawAddress& bd_addr, 
    case SMP_NC_REQ_EVT:

    case SMP_SC_OOB_REQ_EVT:

      btm_ble_user_confirmation_req(bd_addr, p_dev_rec, static_cast<tBTM_LE_EVT>(event),

                                    (tBTM_LE_EVT_DATA*)p_data);

                                    reinterpret_cast<tBTM_LE_EVT_DATA*>(p_data));

      break;



    case SMP_SEC_REQUEST_EVT:

      btm_ble_sec_req(bd_addr, p_dev_rec, (tBTM_LE_EVT_DATA*)p_data);

      btm_ble_sec_req(bd_addr, p_dev_rec, reinterpret_cast<tBTM_LE_EVT_DATA*>(p_data));

      break;



    case SMP_CONSENT_REQ_EVT:

      btm_ble_consent_req(bd_addr, (tBTM_LE_EVT_DATA*)p_data);

      btm_ble_consent_req(bd_addr, reinterpret_cast<tBTM_LE_EVT_DATA*>(p_data));

      break;



    case SMP_COMPLT_EVT:

      btm_ble_complete_evt(bd_addr, p_dev_rec, (tBTM_LE_EVT_DATA*)p_data);

      btm_ble_complete_evt(bd_addr, p_dev_rec, reinterpret_cast<tBTM_LE_EVT_DATA*>(p_data));

      break;



    case SMP_LE_ADDR_ASSOC_EVT:

      BTM_BLE_SEC_CALLBACK(static_cast<tBTM_LE_EVT>(event), bd_addr, (tBTM_LE_EVT_DATA*)p_data);

      BTM_BLE_SEC_CALLBACK(static_cast<tBTM_LE_EVT>(event), bd_addr,

                           reinterpret_cast<tBTM_LE_EVT_DATA*>(p_data));

      break;



    case SMP_SIRK_VERIFICATION_REQ_EVT:

system/stack/btm/btm_ble_sec.h

+1 −2
Original line number Diff line number Diff line
@@ -49,8 +49,7 @@ inline std::string btm_ble_sec_req_act_text(const tBTM_BLE_SEC_REQ_ACT& action) 
void btm_ble_link_sec_check(const RawAddress& bd_addr, tBTM_LE_AUTH_REQ auth_req,

                            tBTM_BLE_SEC_REQ_ACT* p_sec_req_act);

void btm_ble_ltk_request_reply(const RawAddress& bda, bool use_stk, const Octet16& stk);

tBTM_STATUS btm_proc_smp_cback(tSMP_EVT event, const RawAddress& bd_addr,

                               const tSMP_EVT_DATA* p_data);

tBTM_STATUS btm_proc_smp_cback(tSMP_EVT event, const RawAddress& bd_addr, tSMP_EVT_DATA* p_data);

tBTM_STATUS btm_ble_set_encryption(const RawAddress& bd_addr, tBTM_BLE_SEC_ACT sec_act,

                                   uint8_t link_role);

tBTM_STATUS btm_ble_start_encrypt(const RawAddress& bda, bool use_stk, Octet16* p_stk);

system/stack/fuzzers/smp_fuzzer.cc

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ uint8_t oob_data[] = {0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 
                      0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF, 0x00};

tSMP_IO_REQ io_req = {};



tBTM_STATUS smp_callback(tSMP_EVT event, const RawAddress& bd_addr, const tSMP_EVT_DATA* p_data) {

tBTM_STATUS smp_callback(tSMP_EVT event, const RawAddress& bd_addr, tSMP_EVT_DATA* p_data) {

  switch (event) {

    case SMP_IO_CAP_REQ_EVT:

    case SMP_BR_KEYS_REQ_EVT: {

system/stack/include/smp_api_types.h

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ typedef struct { 
/* Security Manager events - Called by the stack when Security Manager related

 * events occur.*/

typedef tBTM_STATUS(tSMP_CALLBACK)(tSMP_EVT event, const RawAddress& bd_addr,

                                   const tSMP_EVT_DATA* p_data);

                                   tSMP_EVT_DATA* p_data);

/* Security Manager SIRK verification event - Called by the stack when Security

 * Manager requires verification from CSIP.*/

typedef tBTM_STATUS(tSMP_SIRK_CALLBACK)(const RawAddress& bd_addr);