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

Commit 28e52f8a authored by Chris Manton's avatar Chris Manton
Browse files

Use proper types tSMP_STATUS 

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: Ie0851299d1d4467c4beb60b73405269cf174036a
parent e46cce34

system/bta/test/common/mock_stack_btm_ble.cc

+3 −3
Original line number Diff line number Diff line
@@ -132,10 +132,10 @@ uint8_t btm_ble_read_sec_key_size(const RawAddress& bd_addr) { 
  mock_function_count_map[__func__]++;

  return 0;

}

uint8_t btm_proc_smp_cback(tSMP_EVT event, const RawAddress& bd_addr,

tSMP_STATUS btm_proc_smp_cback(tSMP_EVT event, const RawAddress& bd_addr,

                               tSMP_EVT_DATA* p_data) {

  mock_function_count_map[__func__]++;

  return 0;

  return SMP_SUCCESS;

}

void BTM_BleConfirmReply(const RawAddress& bd_addr, uint8_t res) {

  mock_function_count_map[__func__]++;

system/stack/btm/btm_ble.cc

+4 −4
Original line number Diff line number Diff line
@@ -1723,10 +1723,10 @@ void btm_ble_connected_from_address_with_type( 
 *  Description     This function is the SMP callback handler.

 *

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

uint8_t btm_proc_smp_cback(tSMP_EVT event, const RawAddress& bd_addr,

tBTM_STATUS btm_proc_smp_cback(tSMP_EVT event, const RawAddress& bd_addr,

                               tSMP_EVT_DATA* p_data) {

  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(bd_addr);

  uint8_t res = 0;

  tBTM_STATUS res = BTM_SUCCESS;



  BTM_TRACE_DEBUG("btm_proc_smp_cback event = %d", event);
@@ -1845,7 +1845,7 @@ uint8_t btm_proc_smp_cback(tSMP_EVT event, const RawAddress& bd_addr, 
    BTM_TRACE_ERROR("btm_proc_smp_cback received for unknown device");

  }



  return 0;

  return BTM_SUCCESS;

}



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

system/stack/include/smp_api.h

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ extern bool SMP_PairCancel(const RawAddress& bd_addr); 
 * Returns          None

 *

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

extern void SMP_SecurityGrant(const RawAddress& bd_addr, uint8_t res);

extern void SMP_SecurityGrant(const RawAddress& bd_addr, tSMP_STATUS res);



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

 *

system/stack/smp/smp_act.cc

+8 −5
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ const tSMP_ACT smp_distribute_act[] = { 
};



static bool pts_test_send_authentication_complete_failure(tSMP_CB* p_cb) {

  uint8_t reason = p_cb->cert_failure;

  tSMP_STATUS reason = p_cb->cert_failure;

  if (reason == SMP_PAIR_AUTH_FAIL || reason == SMP_PAIR_FAIL_UNKNOWN ||

      reason == SMP_PAIR_NOT_SUPPORT || reason == SMP_PASSKEY_ENTRY_FAIL ||

      reason == SMP_REPEATED_ATTEMPTS) {
@@ -98,7 +98,7 @@ static void smp_update_key_mask(tSMP_CB* p_cb, uint8_t key_type, bool recv) { 
 ******************************************************************************/

void smp_send_app_cback(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {

  tSMP_EVT_DATA cb_data;

  tSMP_STATUS callback_rc;

  tBTM_STATUS callback_rc;

  uint8_t remote_lmp_version = 0;

  if (p_cb->p_callback && p_cb->cb_evt != 0) {

    switch (p_cb->cb_evt) {
@@ -139,7 +139,7 @@ void smp_send_app_cback(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { 
    callback_rc =

        (*p_cb->p_callback)(p_cb->cb_evt, p_cb->pairing_bda, &cb_data);



    if (callback_rc == SMP_SUCCESS) {

    if (callback_rc == BTM_SUCCESS) {

      switch (p_cb->cb_evt) {

        case SMP_IO_CAP_REQ_EVT:

          p_cb->loc_auth_req = cb_data.io_req.auth_req;
@@ -1950,8 +1950,11 @@ void smp_link_encrypted(const RawAddress& bda, uint8_t encr_enable) { 
      btm_ble_update_sec_key_size(bda, p_cb->loc_enc_size);

    }



    tSMP_INT_DATA smp_int_data;

    smp_int_data.status = encr_enable;

    tSMP_INT_DATA smp_int_data = {

        // TODO This is not a tSMP_STATUS

        .status = static_cast<tSMP_STATUS>(encr_enable),

    };



    smp_sm_event(&smp_cb, SMP_ENCRYPTED_EVT, &smp_int_data);

  }

}

system/stack/smp/smp_api.cc

+3 −3
Original line number Diff line number Diff line
@@ -70,8 +70,8 @@ void SMP_Init(void) { 
  p_256_init_curve();



  /* Initialize failure case for certification */

  smp_cb.cert_failure =

      stack_config_get_interface()->get_pts_smp_failure_case();

  smp_cb.cert_failure = static_cast<tSMP_STATUS>(

      stack_config_get_interface()->get_pts_smp_failure_case());

  if (smp_cb.cert_failure)

    SMP_TRACE_ERROR("%s PTS FAILURE MODE IN EFFECT (CASE %d)", __func__,

                    smp_cb.cert_failure);
@@ -264,7 +264,7 @@ bool SMP_PairCancel(const RawAddress& bd_addr) { 
 * Returns          None

 *

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

void SMP_SecurityGrant(const RawAddress& bd_addr, uint8_t res) {

void SMP_SecurityGrant(const RawAddress& bd_addr, tSMP_STATUS res) {

  LOG_ASSERT(!bluetooth::shim::is_gd_shim_enabled())

      << "Legacy SMP API should not be invoked when GD Security is used";