Add feature flag for CryptAuth v2 Enrollment
The flag added here will be used to eventually enable use of the
CryptAuth v2 Enrollment protocol (https://go/cryptauth2-enrollment). The
Chrome OS migration plan from CryptAuth v1 to v2 Enrollment is outlined
in the design document https://go/cryptauthv2-enrollment-migration-cros.
Bug: 899080
Change-Id: Ie84b33acb2fbf262ad2193a438a4bb61c633c49b
Reviewed-on: https://chromium-review.googlesource.com/c/1380339
Reviewed-by: Kyle Horimoto <[email protected]>
Reviewed-by: Avi Drissman <[email protected]>
Commit-Queue: Josh Nohle <[email protected]>
Cr-Commit-Position: refs/heads/master@{#617276}diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 9fa09ff7..143de50 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1568,6 +1568,9 @@
flag_descriptions::kAshEnableUnifiedDesktopName,
flag_descriptions::kAshEnableUnifiedDesktopDescription, kOsCrOS,
SINGLE_VALUE_TYPE(switches::kEnableUnifiedDesktop)},
+ {"cryptauth-v2-enrollment", flag_descriptions::kCryptAuthV2EnrollmentName,
+ flag_descriptions::kCryptAuthV2EnrollmentDescription, kOsCrOS,
+ FEATURE_VALUE_TYPE(chromeos::features::kCryptAuthV2Enrollment)},
{
"disable-office-editing-component-app",
flag_descriptions::kOfficeEditingComponentAppName,
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
index f653fcee..4f3f366 100644
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
@@ -472,6 +472,11 @@
"expiry_milestone": 76
},
{
+ "name": "cryptauth-v2-enrollment",
+ "owners": [ "jlklein", "khorimoto", "nohle" ],
+ "expiry_milestone": 76
+ },
+ {
"name": "data-saver-server-previews",
// "owners": [ "your-team" ],
"expiry_milestone": 76
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index 65ac6b1..08b36d45 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -3172,6 +3172,10 @@
const char kCrostiniUsbSupportDescription[] =
"Enable mounting Usb devices in Crostini.";
+const char kCryptAuthV2EnrollmentName[] = "CryptAuth v2 Enrollment";
+const char kCryptAuthV2EnrollmentDescription[] =
+ "Use the CryptAuth v2 Enrollment protocol.";
+
const char kDisableExplicitDmaFencesName[] = "Disable explicit dma-fences";
const char kDisableExplicitDmaFencesDescription[] =
"Always rely on implicit syncrhonization between GPU and display "
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index ab4fd58..90a32c3 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -1908,6 +1908,9 @@
extern const char kCrostiniUsbSupportName[];
extern const char kCrostiniUsbSupportDescription[];
+extern const char kCryptAuthV2EnrollmentName[];
+extern const char kCryptAuthV2EnrollmentDescription[];
+
extern const char kDisableExplicitDmaFencesName[];
extern const char kDisableExplicitDmaFencesDescription[];
