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

Commit 6584357f authored by Hansong Zhang's avatar Hansong Zhang Committed by Android Build Coastguard Worker
Browse files

SMP: Reject pairing if public_key.x match 

Bug: 189329824
Test: POC
Test: pair an LE device
Change-Id: If6d8a72075f0cf657cadfab033cacffeb22868cb
Tag: #security
(cherry picked from commit 92a777a7)
parent 48c3919c

system/stack/smp/smp_act.cc

+1 −2
Original line number Diff line number Diff line
@@ -689,8 +689,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;