commit 0dd95628d61642fe4944839a82e1447830ea04e1
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 30 05:30:16 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 30 05:30:16 2021 +0000
tree 66cd43ed975b6e7ec2051bb5375c59b8cdc9aaeb
parent 848bb189fa18cfc1a84ca642c8ebfbed91df2f2e
parent d7620555621efac8111ede6498809e8f6557c672

Merge cherrypicks of [15151696, 15151717, 15151893, 15151895, 15151897, 15151898, 15150909, 15151854, 15151855, 15151385, 15151702, 15151705, 15151707] into security-aosp-pi-release

Change-Id: I5702bcca81f0eae9687535ce7c7661f89d5b6cc2

stack/smp/smp_act.cc

diff --git a/stack/smp/smp_act.cc b/stack/smp/smp_act.cc
index af15dbf..8335adc 100644
--- a/stack/smp/smp_act.cc
+++ b/stack/smp/smp_act.cc
@@ -675,8 +675,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");
     tSMP_INT_DATA smp;