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

Commit 2355534b authored by Brian Delwiche's avatar Brian Delwiche Committed by Automerger Merge Worker
Browse files

Disallow connect with Secure Connections downgrade am: f20fdd9b am: 2f33281c 

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



Change-Id: Ia7cf4b3cdb51cb930ab220bfcf9841b0ef07440c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 750b3d44 2f33281c

system/stack/btm/btm_sec.cc

+17 −0
Original line number Diff line number Diff line
@@ -4112,6 +4112,13 @@ void btm_sec_link_key_notification(const RawAddress& p_bda, 
    }

  }



  if (p_dev_rec->is_bond_type_persistent() &&

      (p_dev_rec->is_device_type_br_edr() ||

       p_dev_rec->is_device_type_dual_mode())) {

    btm_sec_store_device_sc_support(p_dev_rec->get_br_edr_hci_handle(),

                                    p_dev_rec->SupportsSecureConnections());

  }



  /* If name is not known at this point delay calling callback until the name is

   */

  /* resolved. Unless it is a HID Device and we really need to send all link
@@ -5198,6 +5205,16 @@ void btm_sec_set_peer_sec_caps(uint16_t hci_handle, bool ssp_supported, 
  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev_by_handle(hci_handle);

  if (p_dev_rec == nullptr) return;



  // Drop the connection here if the remote attempts to downgrade from Secure

  // Connections mode.

  if (btm_sec_is_device_sc_downgrade(hci_handle, sc_supported)) {

    acl_set_disconnect_reason(HCI_ERR_HOST_REJECT_SECURITY);

    btm_sec_send_hci_disconnect(

        p_dev_rec, HCI_ERR_AUTH_FAILURE, hci_handle,

        "attempted to downgrade from Secure Connections mode");

    return;

  }



  p_dev_rec->remote_feature_received = true;

  p_dev_rec->remote_supports_hci_role_switch = hci_role_switch_supported;