From 76f93fa0ced1fea4ad566ec7a3aa31ff252a1e4b Mon Sep 17 00:00:00 2001
From: Hui Peng <phui@google.com>
Date: Fri, 19 Jan 2024 11:48:03 -0800
Subject: Add fix_le_oob_pairing_bypass flag

Bug: 321271585
Bug: 315241296
Test: m .
Ignore-AOSP-First: security
Change-Id: I1007f540278b72e9558b9e6b2371645c61c63db2
---
 flags/security.aconfig | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'flags/security.aconfig')

diff --git a/flags/security.aconfig b/flags/security.aconfig
index 85bedde180..c5092d58ab 100644
--- a/flags/security.aconfig
+++ b/flags/security.aconfig
@@ -14,3 +14,10 @@ flag {
     description: "Correct the pairing failure reason reported from remote"
     bug: "320745565"
 }
+
+flag {
+    name: "fix_le_oob_pairing_bypass"
+    namespace: "bluetooth"
+    description: "Fix oob bypassing bug in SMP"
+    bug: "321271585"
+}
-- 
cgit v1.2.3-59-g8ed1b


From f24f3183c4afc949383b5b8a292d3b0cc7c973b7 Mon Sep 17 00:00:00 2001
From: Brian Delwiche <delwiche@google.com>
Date: Thu, 11 Jan 2024 02:55:03 +0000
Subject: Add flag for BLUFFS mitigation

Test: m libbluetooth
Bug: 319541706
Bug: 315241296
Tag: #security
Ignore-AOSP-First: Security
Change-Id: Id3083812e831c84d9a9bb1224ac99475a02ff322
---
 flags/security.aconfig | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'flags/security.aconfig')

diff --git a/flags/security.aconfig b/flags/security.aconfig
index c5092d58ab..c33d99a93f 100644
--- a/flags/security.aconfig
+++ b/flags/security.aconfig
@@ -7,6 +7,12 @@ flag {
     bug: "319530790"
 }
 
+flag {
+    name: "bluffs_mitigation"
+    namespace: "bluetooth"
+    description: "Cache security values to mitigate BLUFFS"
+    bug: "314331379"
+}
 
 flag {
     name: "fix_pairing_failure_reason_from_remote"
-- 
cgit v1.2.3-59-g8ed1b


From 0357d53445cf90913d8cec868d17edb9589c417c Mon Sep 17 00:00:00 2001
From: Hui Peng <phui@google.com>
Date: Wed, 24 Jan 2024 02:06:10 -0800
Subject: Add fix_le_pairing_passkey_entry_bypass flag

Bug: 321300737
Bug: 315241296
Test: m .
Ignore-AOSP-First: security
Change-Id: I75f4a037c9a32c7db496363eeed66663844b7576
---
 flags/security.aconfig | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'flags/security.aconfig')

diff --git a/flags/security.aconfig b/flags/security.aconfig
index c33d99a93f..a56bae9639 100644
--- a/flags/security.aconfig
+++ b/flags/security.aconfig
@@ -27,3 +27,10 @@ flag {
     description: "Fix oob bypassing bug in SMP"
     bug: "321271585"
 }
+
+flag {
+    name: "fix_le_pairing_passkey_entry_bypass"
+    namespace: "bluetooth"
+    description: "Fix the passkey entry bypassing bug in SMP"
+    bug: "321300737"
+}
-- 
cgit v1.2.3-59-g8ed1b