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

Commit 39d44130 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix wrong BR/EDR link key downgrades (P_256->P_192)" am: efd5d998 

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

Change-Id: I5f0c8b945f0e1178b9885800dc1d48e56c6cab03
parents 495ce2c0 efd5d998

system/stack/btm/btm_sec.cc

+0 −16
Original line number Diff line number Diff line
@@ -3309,22 +3309,6 @@ void btm_sec_encrypt_change(uint16_t handle, tHCI_STATUS status, 
        BTM_TRACE_DEBUG("%s start SM over BR/EDR", __func__);

        SMP_BR_PairWith(p_dev_rec->bd_addr);

      }

    } else {

      // BR/EDR is successfully encrypted. Correct LK type if needed

      // (BR/EDR LK derived from LE LTK was used for encryption)

      if ((encr_enable == 1) && /* encryption is ON for SSP */

          /* LK type is for BR/EDR SC */

          (p_dev_rec->link_key_type == BTM_LKEY_TYPE_UNAUTH_COMB_P_256 ||

           p_dev_rec->link_key_type == BTM_LKEY_TYPE_AUTH_COMB_P_256)) {

        if (p_dev_rec->link_key_type == BTM_LKEY_TYPE_UNAUTH_COMB_P_256)

          p_dev_rec->link_key_type = BTM_LKEY_TYPE_UNAUTH_COMB;

        else /* BTM_LKEY_TYPE_AUTH_COMB_P_256 */

          p_dev_rec->link_key_type = BTM_LKEY_TYPE_AUTH_COMB;



        BTM_TRACE_DEBUG("updated link key type to %d",

                        p_dev_rec->link_key_type);

        btm_send_link_key_notif(p_dev_rec);

      }

    }

  }