diff options
| author | 2024-09-06 10:46:43 -0700 | |
|---|---|---|
| committer | 2024-09-18 14:54:04 -0700 | |
| commit | 387c18f07089e0c2d7f799fd505a276b0d86b9d8 (patch) | |
| tree | 80218ed0258abd7cb3d673930831ad1c8bcae245 | |
| parent | f608f9654f6186786652e2bf32e36d5767ec2598 (diff) | |
24q2 flag clean: fix_le_pairing_passkey_entry_bypass
Bug: 321300737
Fix: 321300737
Test: m Bluetooth
Flag: com.android.bluetooth.flags.fix_le_pairing_passkey_entry_bypass
Change-Id: I6303ecbc65ec6a6980f1fcd7c0ec1279ac9f2953
| -rw-r--r-- | flags/security.aconfig | 7 | ||||
| -rw-r--r-- | system/stack/smp/smp_act.cc | 19 |
2 files changed, 8 insertions, 18 deletions
diff --git a/flags/security.aconfig b/flags/security.aconfig index 5dae24b17f..c014a2a16d 100644 --- a/flags/security.aconfig +++ b/flags/security.aconfig @@ -16,13 +16,6 @@ flag { } flag { - name: "fix_le_pairing_passkey_entry_bypass" - namespace: "bluetooth" - description: "Fix the passkey entry bypassing bug in SMP" - bug: "321300737" -} - -flag { name: "bta_av_setconfig_rej_type_confusion" namespace: "bluetooth" description: "Use stream control block for bta_av_setconfig_rej instead of a possibly incorrect union type" diff --git a/system/stack/smp/smp_act.cc b/system/stack/smp/smp_act.cc index e297afa5e4..655a2061e5 100644 --- a/system/stack/smp/smp_act.cc +++ b/system/stack/smp/smp_act.cc @@ -681,17 +681,14 @@ void smp_proc_rand(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { return; } - if (com::android::bluetooth::flags::fix_le_pairing_passkey_entry_bypass()) { - if (!((p_cb->loc_auth_req & SMP_SC_SUPPORT_BIT) && - (p_cb->peer_auth_req & SMP_SC_SUPPORT_BIT)) && - !(p_cb->flags & SMP_PAIR_FLAGS_CMD_CONFIRM_SENT)) { - // in legacy pairing, the peer should send its rand after - // we send our confirm - tSMP_INT_DATA smp_int_data{}; - smp_int_data.status = SMP_INVALID_PARAMETERS; - smp_sm_event(p_cb, SMP_AUTH_CMPL_EVT, &smp_int_data); - return; - } + if (!((p_cb->loc_auth_req & SMP_SC_SUPPORT_BIT) && (p_cb->peer_auth_req & SMP_SC_SUPPORT_BIT)) && + !(p_cb->flags & SMP_PAIR_FLAGS_CMD_CONFIRM_SENT)) { + // in legacy pairing, the peer should send its rand after + // we send our confirm + tSMP_INT_DATA smp_int_data{}; + smp_int_data.status = SMP_INVALID_PARAMETERS; + smp_sm_event(p_cb, SMP_AUTH_CMPL_EVT, &smp_int_data); + return; } /* save the SRand for comparison */ |