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

Commit 02a8e526 authored by Hemant Gupta's avatar Hemant Gupta Committed by Andre Eisenbach
Browse files

BLE: Don't set SC bit in AuthReq for Legacy Devices 

Disable SC bit for legacy LE devices (< 4.2) since as per earlier
spec, this BIT should be 0 and ignored by remote device. Some remote
legacy devices which don't follow the approach of ignoring these bits
(if set) go in bad state and result in SMP pairing failure.

Test: Pairing succeeds with remote device after resettings SC bit.

Fixes: 70259025
Change-Id: I35838c60fb08916a141f764b3e1922d277b99f28
parent 6c56039b

system/stack/smp/smp_act.cc

+7 −5
Original line number Diff line number Diff line
@@ -165,15 +165,17 @@ void smp_send_app_cback(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { 


          p_cb->secure_connections_only_mode_required =

              (btm_cb.security_mode == BTM_SEC_MODE_SC) ? true : false;



          /* just for PTS, force SC bit */

          if (p_cb->secure_connections_only_mode_required) {

            p_cb->loc_auth_req |= SMP_SC_SUPPORT_BIT;

          }



          if (!(p_cb->loc_auth_req & SMP_SC_SUPPORT_BIT) ||

          if (!p_cb->secure_connections_only_mode_required &&

              (!(p_cb->loc_auth_req & SMP_SC_SUPPORT_BIT) ||

               lmp_version_below(p_cb->pairing_bda, HCI_PROTO_VERSION_4_2) ||

               interop_match_addr(INTEROP_DISABLE_LE_SECURE_CONNECTIONS,

                                 (const RawAddress*)&p_cb->pairing_bda)) {

                                  (const RawAddress*)&p_cb->pairing_bda))) {

            p_cb->loc_auth_req &= ~SMP_SC_SUPPORT_BIT;

            p_cb->loc_auth_req &= ~SMP_KP_SUPPORT_BIT;

            p_cb->local_i_key &= ~SMP_SEC_KEY_TYPE_LK;

            p_cb->local_r_key &= ~SMP_SEC_KEY_TYPE_LK;