aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHansong Zhang <hsz@google.com>2021-06-25 00:26:04 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-06-25 00:26:04 +0000
commitfb9f699d79084b90537b2cae3f733962ab59159f (patch)
tree0598eb9114d6fe15a93c6cf8ef2e6f3eef16a609
parentebe70e97c9280cd9dcfd93f3e5ec519f4903434e (diff)
parentcf11884e7c1dda2fdf199f153f402fbacb1b5fae (diff)
downloadbt-fb9f699d79084b90537b2cae3f733962ab59159f.tar.gz
SMP: Reject pairing if public_key.x match am: 9fbf77d1a8 am: 6dd3a7aa69 am: 351d594583 am: cf11884e7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/15081352 Change-Id: Ife13fd9bc5326d8ada38cb2f762a70ba79d35752
-rw-r--r--stack/smp/smp_act.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/stack/smp/smp_act.cc b/stack/smp/smp_act.cc
index ba7cbce8a..03d73f781 100644
--- a/stack/smp/smp_act.cc
+++ b/stack/smp/smp_act.cc
@@ -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;