diff options
| -rw-r--r-- | firmware/lib/vboot_common.c | 4 | ||||
| -rw-r--r-- | tests/vboot_api_kernel2_tests.c | 12 | ||||
| -rw-r--r-- | tests/vboot_detach_menu_tests.c | 12 |
3 files changed, 13 insertions, 15 deletions
diff --git a/firmware/lib/vboot_common.c b/firmware/lib/vboot_common.c index 60483b2c..d3851940 100644 --- a/firmware/lib/vboot_common.c +++ b/firmware/lib/vboot_common.c @@ -213,10 +213,6 @@ int VbSharedDataSetKernelKey(VbSharedDataHeader *header, const VbPublicKey *src) int vb2_allow_recovery(uint32_t flags) { - /* In dev mode, unconditionally allowed. */ - if (flags & VBSD_BOOT_DEV_SWITCH_ON) - return 1; - /* * If EC is in RW, it implies recovery wasn't manually requested. * On some platforms, EC_IN_RW can't be reset by the EC, thus, this may diff --git a/tests/vboot_api_kernel2_tests.c b/tests/vboot_api_kernel2_tests.c index 6c3c814a..2a714baa 100644 --- a/tests/vboot_api_kernel2_tests.c +++ b/tests/vboot_api_kernel2_tests.c @@ -579,7 +579,7 @@ static void VbBootRecTest(void) VBERROR_SHUTDOWN_REQUESTED, "Shutdown requested by keyboard"); - /* Remove disks */ + /* Broken screen */ ResetMocks(); shutdown_request_calls_left = 100; mock_num_disks[0] = 1; @@ -588,11 +588,11 @@ static void VbBootRecTest(void) vbtlk_retval = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; TEST_EQ(VbBootRecovery(&ctx), VBERROR_SHUTDOWN_REQUESTED, - "Remove"); + "Broken"); TEST_EQ(screens_displayed[0], VB_SCREEN_OS_BROKEN, " broken screen"); - /* No removal if dev switch is on */ + /* Broken screen even if dev switch is on */ ResetMocks(); shutdown_request_calls_left = 100; mock_num_disks[0] = 1; @@ -601,9 +601,9 @@ static void VbBootRecTest(void) vbtlk_retval = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; TEST_EQ(VbBootRecovery(&ctx), VBERROR_SHUTDOWN_REQUESTED, - "No remove in dev"); - TEST_EQ(screens_displayed[0], VB_SCREEN_RECOVERY_INSERT, - " insert screen"); + "Broken (dev)"); + TEST_EQ(screens_displayed[0], VB_SCREEN_OS_BROKEN, + " broken screen"); /* No removal if recovery button physically pressed */ ResetMocks(); diff --git a/tests/vboot_detach_menu_tests.c b/tests/vboot_detach_menu_tests.c index 06e2be37..3d30683a 100644 --- a/tests/vboot_detach_menu_tests.c +++ b/tests/vboot_detach_menu_tests.c @@ -1304,16 +1304,18 @@ static void VbBootRecTest(void) TEST_EQ(screens_count, 2, " no extra screens"); TEST_EQ(beeps_count, 0, " no beep on shutdown"); - /* go to INSERT if dev switch is on */ + /* BROKEN screen even if dev switch is on */ ResetMocks(); - vbtlk_retval[0] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; + vbtlk_retval[0] = VBERROR_SUCCESS - VB_DISK_FLAG_REMOVABLE; + vbtlk_retval[1] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; + vbtlk_retval[2] = VBERROR_SUCCESS - VB_DISK_FLAG_REMOVABLE; shared->flags |= VBSD_BOOT_DEV_SWITCH_ON; TEST_EQ(VbBootRecoveryMenu(&ctx), VBERROR_SHUTDOWN_REQUESTED, - "Shutdown requested in INSERT with dev switch"); + "Shutdown requested in BROKEN with dev switch"); TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); - TEST_EQ(screens_displayed[0], VB_SCREEN_RECOVERY_INSERT, - " insert screen"); + TEST_EQ(screens_displayed[0], VB_SCREEN_OS_BROKEN, + " broken screen"); TEST_EQ(screens_displayed[1], VB_SCREEN_BLANK, " final blank screen"); TEST_EQ(screens_count, 2, " no extra screens"); TEST_EQ(beeps_count, 0, " no beep on shutdown"); |