From 5bfa62aea00d22b48e60960a2f481447a4e54ec7 Mon Sep 17 00:00:00 2001
From: Thomas Girardier <girardier@google.com>
Date: Mon, 8 Apr 2024 19:06:14 +0000
Subject: [PATCH] Revert "Fix an authentication bypass bug in SMP"
This reverts commit bac3e50fbab5290423d909e4501f7f5bc2dfd13d.
Reason for revert: b/331855635
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:34ee990ee72693cd534d7d696f3a52c9c5a5bfd8)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e214741ee05dd6bad9bf1d7a62c1448c7eee4332)
Merged-In: I471269cb5ecd4aef32c6648ad575baea44b562d1
Change-Id: I471269cb5ecd4aef32c6648ad575baea44b562d1
---
system/stack/smp/smp_act.cc | 8 --------
1 file changed, 8 deletions(-)
diff --git a/system/stack/smp/smp_act.cc b/system/stack/smp/smp_act.cc
index 5f46896caec..b11a064dd47 100644
--- a/system/stack/smp/smp_act.cc
+++ b/system/stack/smp/smp_act.cc
@@ -1977,14 +1977,6 @@ void smp_process_secure_connection_oob_data(tSMP_CB* p_cb,
if (!p_sc_oob_data->peer_oob_data.present) {
log::verbose("peer OOB data is absent");
-
- if (IS_FLAG_ENABLED(fix_le_oob_pairing_bypass)) {
- tSMP_INT_DATA smp_int_data{};
- smp_int_data.status = SMP_OOB_FAIL;
- smp_sm_event(p_cb, SMP_AUTH_CMPL_EVT, &smp_int_data);
- return;
- }
-
p_cb->peer_random = {0};
} else {
p_cb->peer_random = p_sc_oob_data->peer_oob_data.randomizer;
--
GitLab