vboot: deprecate fastboot support

BUG=b:124141368, chromium:995172
TEST=make clean && make runtests
BRANCH=none

Change-Id: I42e4ac8a21ac3be416d315a8a8cc914f997bab79
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1758148
Reviewed-by: Julius Werner <jwerner@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>

3 files changed, 0 insertions, 52 deletions

diff --git a/tests/vb2_misc_tests.c b/tests/vb2_misc_tests.c
index c2763e4e..8e96f1c0 100644
--- a/tests/vb2_misc_tests.c
+++ b/tests/vb2_misc_tests.c
@@ -368,9 +368,7 @@ static void dev_switch_tests(void)
 	vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_USB, 1);
 	vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_LEGACY, 1);
 	vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_SIGNED_ONLY, 1);
-	vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_FASTBOOT_FULL_CAP, 1);
 	vb2_nv_set(&ctx, VB2_NV_DEV_DEFAULT_BOOT, 1);
-	vb2_nv_set(&ctx, VB2_NV_FASTBOOT_UNLOCK_IN_FW, 1);
 	TEST_SUCC(vb2_check_dev_switch(&ctx), "dev mode off");
 	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DEV_BOOT_USB),
 		0, "  cleared dev boot usb");
@@ -378,12 +376,8 @@ static void dev_switch_tests(void)
 		0, "  cleared dev boot legacy");
 	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DEV_BOOT_SIGNED_ONLY),
 		0, "  cleared dev boot signed only");
-	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DEV_BOOT_FASTBOOT_FULL_CAP),
-		0, "  cleared dev boot fastboot full cap");
 	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DEV_DEFAULT_BOOT),
 		0, "  cleared dev default boot");
-	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_FASTBOOT_UNLOCK_IN_FW),
-		0, "  cleared dev boot fastboot unlock in fw");
 
 	/* Normal-dev transition clears TPM */
 	reset_common_data();
diff --git a/tests/vb2_nvstorage_tests.c b/tests/vb2_nvstorage_tests.c
index d47eaef7..1addc003 100644
--- a/tests/vb2_nvstorage_tests.c
+++ b/tests/vb2_nvstorage_tests.c
@@ -46,7 +46,6 @@ static struct nv_field nvfields[] = {
 	{VB2_NV_DEV_BOOT_USB, 0, 1, 0, "dev boot usb"},
 	{VB2_NV_DEV_BOOT_LEGACY, 0, 1, 0, "dev boot legacy"},
 	{VB2_NV_DEV_BOOT_SIGNED_ONLY, 0, 1, 0, "dev boot custom"},
-	{VB2_NV_DEV_BOOT_FASTBOOT_FULL_CAP, 0, 1, 0, "dev boot fb full cap"},
 	{VB2_NV_DEV_DEFAULT_BOOT, 0, 1, 2, "dev default boot"},
 	{VB2_NV_DIAG_REQUEST, 0, 1, 0, "diagnostic rom request"},
 	{VB2_NV_DISABLE_DEV_REQUEST, 0, 1, 0, "disable dev request"},
@@ -56,7 +55,6 @@ static struct nv_field nvfields[] = {
 	{VB2_NV_REQ_WIPEOUT, 0, 1, 0, "request wipeout"},
 	{VB2_NV_DISPLAY_REQUEST, 0, 1, 0, "oprom needed"},
 	{VB2_NV_BACKUP_NVRAM_REQUEST, 0, 1, 0, "backup nvram request"},
-	{VB2_NV_FASTBOOT_UNLOCK_IN_FW, 0, 1, 0, "fastboot unlock in fw"},
 	{VB2_NV_BOOT_ON_AC_DETECT, 0, 1, 0, "boot on ac detect"},
 	{VB2_NV_TRY_RO_SYNC, 0, 1, 0, "try read only software sync"},
 	{VB2_NV_BATTERY_CUTOFF_REQUEST, 0, 1, 0, "battery cutoff request"},
diff --git a/tests/vboot_api_kernel5_tests.c b/tests/vboot_api_kernel5_tests.c
index f07fc2d9..86195e3c 100644
--- a/tests/vboot_api_kernel5_tests.c
+++ b/tests/vboot_api_kernel5_tests.c
@@ -284,26 +284,6 @@ static void VerifyMemoryBootImageTest(void)
 		VBERROR_INVALID_KERNEL_FOUND, "Key verify failed");
 	TEST_EQ(hash_only_check, 0, "  hash check");
 
-	/* Key Block Hash Failure */
-	ResetMocks();
-	shared->flags = VBSD_BOOT_DEV_SWITCH_ON;
-	gbb.flags = VB2_GBB_FLAG_FORCE_DEV_BOOT_FASTBOOT_FULL_CAP;
-	key_block_verify_fail = 1;
-	TEST_EQ(VbVerifyMemoryBootImage(&ctx, shared, &kparams, kernel_buffer,
-					kernel_buffer_size),
-		VBERROR_INVALID_KERNEL_FOUND, "Key verify failed");
-	TEST_EQ(hash_only_check, 1, "  hash check");
-
-	/* Key Block Hash Failure -- VBNV */
-	ResetMocks();
-	shared->flags = VBSD_BOOT_DEV_SWITCH_ON;
-	key_block_verify_fail = 1;
-	vb2_nv_set(&ctx_nvram_backend, VB2_NV_DEV_BOOT_FASTBOOT_FULL_CAP, 1);
-	TEST_EQ(VbVerifyMemoryBootImage(&ctx, shared, &kparams, kernel_buffer,
-					kernel_buffer_size),
-		VBERROR_INVALID_KERNEL_FOUND, "Key verify failed");
-	TEST_EQ(hash_only_check, 1, "  hash check -- VBNV flag");
-
 	/* Developer flag mismatch - dev switch on */
 	ResetMocks();
 	kbh.key_block_flags = KEY_BLOCK_FLAG_DEVELOPER_0 |
@@ -315,30 +295,6 @@ static void VerifyMemoryBootImageTest(void)
 		VBERROR_INVALID_KERNEL_FOUND,
 		"Developer flag mismatch - dev switch on");
 
-	/* Developer flag mismatch - dev switch on with GBB override */
-	ResetMocks();
-	kbh.key_block_flags = KEY_BLOCK_FLAG_DEVELOPER_0 |
-		KEY_BLOCK_FLAG_RECOVERY_1;
-	copy_kbh();
-	gbb.flags = VB2_GBB_FLAG_FORCE_DEV_BOOT_FASTBOOT_FULL_CAP;
-	shared->flags = VBSD_BOOT_DEV_SWITCH_ON;
-	TEST_EQ(VbVerifyMemoryBootImage(&ctx, shared, &kparams, kernel_buffer,
-					kernel_buffer_size),
-		VB2_SUCCESS,
-		"Developer flag mismatch - dev switch on(gbb override)");
-
-	/* Recovery flag mismatch - dev switch on with GBB override */
-	ResetMocks();
-	kbh.key_block_flags = KEY_BLOCK_FLAG_DEVELOPER_0 |
-		KEY_BLOCK_FLAG_RECOVERY_0;
-	copy_kbh();
-	shared->flags = VBSD_BOOT_DEV_SWITCH_ON;
-	gbb.flags = VB2_GBB_FLAG_FORCE_DEV_BOOT_FASTBOOT_FULL_CAP;
-	TEST_EQ(VbVerifyMemoryBootImage(&ctx, shared, &kparams, kernel_buffer,
-					kernel_buffer_size),
-		VB2_SUCCESS,
-		"Recovery flag mismatch - dev switch on(gbb override)");
-
 	/* Developer flag mismatch - dev switch off */
 	ResetMocks();
 	kbh.key_block_flags = KEY_BLOCK_FLAG_DEVELOPER_1 |