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

Commit 09eb5860 authored by Bill Yi's avatar Bill Yi
Browse files

Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE 

Merged-In: Ie8b320c12ce9b9f3c2859f8fa3abc290ee016eed
Merged-In: Icee5adad537a43beb4e7342731e4b3163b21e833
Merged-In: Icee5adad537a43beb4e7342731e4b3163b21e833
Change-Id: Iea5fb04e5b18bdf83cc89bb2f586e64c09fa09ac
parents d9c8c5cc c01a2259

system/stack/smp/smp_act.cc

+1 −2
Original line number Diff line number Diff line
@@ -706,8 +706,7 @@ void smp_process_pairing_public_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { 
  memcpy(pt.x, p_cb->peer_publ_key.x, BT_OCTET32_LEN);

  memcpy(pt.y, p_cb->peer_publ_key.y, BT_OCTET32_LEN);



  if (!memcmp(p_cb->peer_publ_key.x, p_cb->loc_publ_key.x, BT_OCTET32_LEN) &&

      !memcmp(p_cb->peer_publ_key.y, p_cb->loc_publ_key.y, BT_OCTET32_LEN)) {

  if (!memcmp(p_cb->peer_publ_key.x, p_cb->loc_publ_key.x, BT_OCTET32_LEN)) {

    android_errorWriteLog(0x534e4554, "174886838");

    SMP_TRACE_WARNING("Remote and local public keys can't match");

    tSMP_INT_DATA smp;