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

Commit 81cfafff authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Streamline stack/btm/btm_sec::BTM_SetEncryption" am: 63a911a9 am:... 

Merge "Streamline stack/btm/btm_sec::BTM_SetEncryption" am: 63a911a9 am: a0f8ace5 am: 096cef44 am: 87e8b189

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2075282



Change-Id: I7a28556d880ff14cc3fed29215b5d9fbd99cc831
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b81bcc7a 87e8b189

system/stack/btm/btm_sec.cc

+93 −51
Original line number Diff line number Diff line
@@ -1045,42 +1045,71 @@ tBTM_STATUS BTM_SetEncryption(const RawAddress& bd_addr, 
                                              p_ref_data, sec_act);

  }



  tBTM_STATUS rc = BTM_SUCCESS;



  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(bd_addr);

  if (!p_dev_rec ||

      (transport == BT_TRANSPORT_BR_EDR &&

       p_dev_rec->hci_handle == HCI_INVALID_HANDLE) ||

      (transport == BT_TRANSPORT_LE &&

       p_dev_rec->ble_hci_handle == HCI_INVALID_HANDLE)) {

    /* Connection should be up and runnning */

    BTM_TRACE_WARNING("Security Manager: BTM_SetEncryption not connected");

  if (p_dev_rec == nullptr) {

    LOG_ERROR("Unable to set encryption for unknown device");

    return BTM_WRONG_MODE;

  }



  switch (transport) {

    case BT_TRANSPORT_BR_EDR:

      if (p_dev_rec->hci_handle == HCI_INVALID_HANDLE) {

        LOG_WARN(

            "Security Manager: BTM_SetEncryption not connected peer:%s "

            "transport:%s",

            PRIVATE_ADDRESS(bd_addr), bt_transport_text(transport).c_str());

        if (p_callback)

          (*p_callback)(&bd_addr, transport, p_ref_data, BTM_WRONG_MODE);



    return (BTM_WRONG_MODE);

        return BTM_WRONG_MODE;

      }

      if (p_dev_rec->sec_flags & BTM_SEC_ENCRYPTED) {

        LOG_DEBUG(

            "Security Manager: BTM_SetEncryption already encrypted peer:%s "

            "transport:%s",

            PRIVATE_ADDRESS(bd_addr), bt_transport_text(transport).c_str());

        if (*p_callback)

          (*p_callback)(&bd_addr, transport, p_ref_data, BTM_SUCCESS);

        return BTM_SUCCESS;

      }

      break;



  if (transport == BT_TRANSPORT_BR_EDR &&

      (p_dev_rec->sec_flags & BTM_SEC_ENCRYPTED)) {

    BTM_TRACE_EVENT("Security Manager: BTM_SetEncryption already encrypted");

    case BT_TRANSPORT_LE:

      if (p_dev_rec->ble_hci_handle == HCI_INVALID_HANDLE) {

        LOG_WARN(

            "Security Manager: BTM_SetEncryption not connected peer:%s "

            "transport:%s",

            PRIVATE_ADDRESS(bd_addr), bt_transport_text(transport).c_str());

        if (p_callback)

          (*p_callback)(&bd_addr, transport, p_ref_data, BTM_WRONG_MODE);



        return BTM_WRONG_MODE;

      }

      if (p_dev_rec->sec_flags & BTM_SEC_LE_ENCRYPTED) {

        LOG_DEBUG(

            "Security Manager: BTM_SetEncryption already encrypted peer:%s "

            "transport:%s",

            PRIVATE_ADDRESS(bd_addr), bt_transport_text(transport).c_str());

        if (*p_callback)

          (*p_callback)(&bd_addr, transport, p_ref_data, BTM_SUCCESS);



    return (BTM_SUCCESS);

        return BTM_SUCCESS;

      }

      break;



    default:

      LOG_ERROR("Unknown transport");

      break;

  }



  /* enqueue security request if security is active */

  if (p_dev_rec->p_callback || (p_dev_rec->sec_state != BTM_SEC_STATE_IDLE)) {

    BTM_TRACE_WARNING(

        "Security Manager: BTM_SetEncryption busy, enqueue request");



    LOG_WARN("Security Manager: BTM_SetEncryption busy, enqueue request");

    if (btm_sec_queue_encrypt_request(bd_addr, transport, p_callback,

                                      p_ref_data, sec_act)) {

      LOG_INFO("Queued start encryption");

      return BTM_CMD_STARTED;

    } else {

      LOG_WARN("Unable to enqueue start encryption request");

      if (p_callback)

        (*p_callback)(&bd_addr, transport, p_ref_data, BTM_NO_RESOURCES);

      return BTM_NO_RESOURCES;
@@ -1093,38 +1122,51 @@ tBTM_STATUS BTM_SetEncryption(const RawAddress& bd_addr, 
      (BTM_SEC_IN_AUTHENTICATE | BTM_SEC_IN_ENCRYPT);

  p_dev_rec->is_originator = false;



  BTM_TRACE_API(

      "Security Manager: BTM_SetEncryption Handle:%d State:%d Flags:0x%x "

      "Required:0x%x, p_dev_rec=%p, p_callback=%p",

      p_dev_rec->hci_handle, p_dev_rec->sec_state, p_dev_rec->sec_flags,

      p_dev_rec->security_required, p_dev_rec, p_callback);

  LOG_DEBUG(

      "Security Manager: BTM_SetEncryption classic_handle:0x%04x "

      "ble_handle:0x%04x state:%d flags:0x%x "

      "required:0x%x p_callback=%c",

      p_dev_rec->hci_handle, p_dev_rec->ble_hci_handle, p_dev_rec->sec_state,

      p_dev_rec->sec_flags, p_dev_rec->security_required,

      (p_callback) ? 'T' : 'F');



  if (transport == BT_TRANSPORT_LE) {

  tBTM_STATUS rc = BTM_SUCCESS;

  switch (transport) {

    case BT_TRANSPORT_LE:

      if (BTM_IsAclConnectionUp(bd_addr, BT_TRANSPORT_LE)) {

        rc = btm_ble_set_encryption(bd_addr, sec_act,

                                    L2CA_GetBleConnRole(bd_addr));

      } else {

        rc = BTM_WRONG_MODE;

      BTM_TRACE_WARNING("%s: cannot call btm_ble_set_encryption, p is NULL",

                        __func__);

        LOG_WARN("cannot call btm_ble_set_encryption, p is NULL");

      }

  } else {

      break;



    case BT_TRANSPORT_BR_EDR:

      rc = btm_sec_execute_procedure(p_dev_rec);

      break;



    default:

      LOG_ERROR("Unknown transport");

      break;

  }



  if (rc != BTM_CMD_STARTED && rc != BTM_BUSY) {

  switch (rc) {

    case BTM_CMD_STARTED:

    case BTM_BUSY:

      break;



    default:

      if (p_callback) {

      BTM_TRACE_DEBUG(

          "%s: clearing p_callback=%p, p_dev_rec=%p, transport=%d, "

          "bd_addr=%s",

          __func__, p_callback, p_dev_rec, transport,

          bd_addr.ToString().c_str());

      p_dev_rec->p_callback = NULL;

        LOG_DEBUG("Executing encryption callback peer:%s transport:%s",

                  PRIVATE_ADDRESS(bd_addr),

                  bt_transport_text(transport).c_str());

        p_dev_rec->p_callback = nullptr;

        (*p_callback)(&bd_addr, transport, p_dev_rec->p_ref_data, rc);

      }

      break;

  }



  return (rc);

  return rc;

}



bool BTM_SecIsSecurityPending(const RawAddress& bd_addr) {

system/stack/test/btm/stack_btm_test.cc

+22 −0
Original line number Diff line number Diff line
@@ -334,3 +334,25 @@ TEST_F(StackBtmWithInitFreeTest, btm_sec_encrypt_change) { 


  wipe_secrets_and_remove(device_record);

}



TEST_F(StackBtmWithInitFreeTest, BTM_SetEncryption) {

  const RawAddress bd_addr = RawAddress({0x11, 0x22, 0x33, 0x44, 0x55, 0x66});

  const tBT_TRANSPORT transport{BT_TRANSPORT_LE};

  tBTM_SEC_CALLBACK* p_callback{nullptr};

  tBTM_BLE_SEC_ACT sec_act{BTM_BLE_SEC_ENCRYPT};



  // No device

  ASSERT_EQ(BTM_WRONG_MODE, BTM_SetEncryption(bd_addr, transport, p_callback,

                                              nullptr, sec_act));



  // With device

  tBTM_SEC_DEV_REC* device_record = btm_sec_allocate_dev_rec();

  ASSERT_NE(nullptr, device_record);

  device_record->bd_addr = bd_addr;

  device_record->hci_handle = 0x1234;



  ASSERT_EQ(BTM_WRONG_MODE, BTM_SetEncryption(bd_addr, transport, p_callback,

                                              nullptr, sec_act));



  wipe_secrets_and_remove(device_record);

}