commit 6697cf3ee0e93908b4f60c73d9f979240cfb4c30
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 30 05:30:02 2021
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 30 05:30:02 2021
tree 72115dcce2095de88251920f6ad39e12d0b01b31
parent f8c5cf284a822205cf338a353da6989536e77787
parent 93e11ccd1757ccb4ccf993ce26edad88c04ed369

Merge cherrypicks of [15151695, 15151716, 15151891, 15151892, 15151894, 15151896, 15150908, 15151384, 15151699, 15151700, 15151701] into security-aosp-oc-mr1-release

Change-Id: I07a270d0a23fc67e04431324c998be28a25b3658

stack/smp/smp_act.cc

diff --git a/stack/smp/smp_act.cc b/stack/smp/smp_act.cc
index b7ba0d8..7b6ae6f 100644
--- a/stack/smp/smp_act.cc
+++ b/stack/smp/smp_act.cc
@@ -661,8 +661,7 @@
   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");
     reason = SMP_PAIR_AUTH_FAIL;