commit a847bb2bee1db8e087bafe0cfb2bfa1be32a6f62
author Maarten Derks <maarten@fairphone.com> Fri Aug 06 10:56:17 2021 +0200
committer Maarten Derks <maarten@fairphone.com> Fri Aug 06 10:56:17 2021 +0200
tree 23eadebba42be314c4b27f64f966b415b2f43703
parent 3c64016a1aa6c7feeaae21f2377491b6c3b3b704
parent 0dd95628d61642fe4944839a82e1447830ea04e1

Merge the 2021-09-05 SPL branch from AOSP-Partner

* security-aosp-pi-release:
  SMP: Reject pairing if public_key.x match

Change-Id: If4afbfbde2e3f8b7aaec819bca3bc3d3c96f112f

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;