From 166a07d1d64a9aed1bfecc8ba0cd73354a8dbd60 Mon Sep 17 00:00:00 2001 From: Joel Kitching Date: Mon, 29 Jul 2019 18:55:59 +0800 Subject: vboot: replace VBERROR_SIMULATED with VB2_ERROR_MOCK Replace vboot1-style VBERROR_SIMULATED with VB2_ERROR_MOCK. BUG=b:124141368, chromium:988410 TEST=make clean && make runtests BRANCH=none Change-Id: I9f7a21b957097672883a428a5210c14a27852085 Signed-off-by: Joel Kitching Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1722917 Commit-Queue: Joel Kitching Tested-by: Joel Kitching Reviewed-by: Julius Werner --- firmware/2lib/include/2return_codes.h | 2 -- tests/ec_sync_tests.c | 14 +++++++------- tests/tlcl_tests.c | 10 +++++----- tests/vboot_api_kernel2_tests.c | 4 ++-- tests/vboot_api_kernel4_tests.c | 18 +++++++++--------- tests/vboot_api_kernel6_tests.c | 2 +- tests/vboot_detach_menu_tests.c | 12 ++++++------ tests/vboot_kernel_tests.c | 4 ++-- 8 files changed, 32 insertions(+), 34 deletions(-) diff --git a/firmware/2lib/include/2return_codes.h b/firmware/2lib/include/2return_codes.h index 7c6551e8..adfd3fcc 100644 --- a/firmware/2lib/include/2return_codes.h +++ b/firmware/2lib/include/2return_codes.h @@ -80,8 +80,6 @@ enum vb2_return_code { VBERROR_INVALID_BMPFV = 0x10014, /* Invalid screen index */ VBERROR_INVALID_SCREEN_INDEX = 0x10015, - /* Simulated (test) error */ - VBERROR_SIMULATED = 0x10016, /* Invalid parameter */ VBERROR_INVALID_PARAMETER = 0x10017, /* VbExBeep() can't make sounds at all */ diff --git a/tests/ec_sync_tests.c b/tests/ec_sync_tests.c index 7e5df6c3..9249b11a 100644 --- a/tests/ec_sync_tests.c +++ b/tests/ec_sync_tests.c @@ -175,7 +175,7 @@ vb2_error_t VbExEcHashImage(int devidx, enum VbSelectFirmware_t select, mock_ec_ro_hash : mock_ec_rw_hash; *hash_size = select == VB_SELECT_FIRMWARE_READONLY ? mock_ec_ro_hash_size : mock_ec_rw_hash_size; - return *hash_size ? VB2_SUCCESS : VBERROR_SIMULATED; + return *hash_size ? VB2_SUCCESS : VB2_ERROR_MOCK; } vb2_error_t VbExEcGetExpectedImage(int devidx, enum VbSelectFirmware_t select, @@ -194,7 +194,7 @@ vb2_error_t VbExEcGetExpectedImageHash(int devidx, *hash = want_ec_hash; *hash_size = want_ec_hash_size; - return want_ec_hash_size ? VB2_SUCCESS : VBERROR_SIMULATED; + return want_ec_hash_size ? VB2_SUCCESS : VB2_ERROR_MOCK; } vb2_error_t VbExEcUpdateImage(int devidx, enum VbSelectFirmware_t select, @@ -254,7 +254,7 @@ static void VbSoftwareSyncTest(void) { /* AP-RO cases */ ResetMocks(); - in_rw_retval = VBERROR_SIMULATED; + in_rw_retval = VB2_ERROR_MOCK; test_ssync(VBERROR_EC_REBOOT_TO_RO_REQUIRED, VB2_RECOVERY_EC_UNKNOWN_IMAGE, "Unknown EC image"); @@ -357,7 +357,7 @@ static void VbSoftwareSyncTest(void) ResetMocks(); mock_ec_rw_hash[0]++; - update_retval = VBERROR_SIMULATED; + update_retval = VB2_ERROR_MOCK; test_ssync(VBERROR_EC_REBOOT_TO_RO_REQUIRED, VB2_RECOVERY_EC_UPDATE, "Update failed"); @@ -408,7 +408,7 @@ static void VbSoftwareSyncTest(void) TEST_EQ(ec_ro_updated, 0, " ec ro updated"); ResetMocks(); - run_retval = VBERROR_SIMULATED; + run_retval = VB2_ERROR_MOCK; test_ssync(VBERROR_EC_REBOOT_TO_RO_REQUIRED, VB2_RECOVERY_EC_JUMP_RW, "Jump to RW fail"); @@ -418,8 +418,8 @@ static void VbSoftwareSyncTest(void) 0, "Jump to RW fail because locked"); ResetMocks(); - protect_retval = VBERROR_SIMULATED; - test_ssync(VBERROR_SIMULATED, + protect_retval = VB2_ERROR_MOCK; + test_ssync(VB2_ERROR_MOCK, VB2_RECOVERY_EC_PROTECT, "Protect error"); /* No longer check for shutdown requested */ diff --git a/tests/tlcl_tests.c b/tests/tlcl_tests.c index a699135c..7e8d2311 100644 --- a/tests/tlcl_tests.c +++ b/tests/tlcl_tests.c @@ -115,14 +115,14 @@ static void TlclTest(void) TEST_EQ(TlclLibInit(), VB2_SUCCESS, "Init"); ResetMocks(); - mock_retval = VBERROR_SIMULATED; + mock_retval = VB2_ERROR_MOCK; TEST_EQ(TlclLibInit(), mock_retval, "Init bad"); ResetMocks(); TEST_EQ(TlclLibClose(), VB2_SUCCESS, "Close"); ResetMocks(); - mock_retval = VBERROR_SIMULATED; + mock_retval = VB2_ERROR_MOCK; TEST_EQ(TlclLibClose(), mock_retval, "Close bad"); ResetMocks(); @@ -136,9 +136,9 @@ static void TlclTest(void) TEST_EQ(calls[0].req_size, 10, "SendReceive size"); ResetMocks(); - calls[0].retval = VBERROR_SIMULATED; + calls[0].retval = VB2_ERROR_MOCK; ToTpmUint32(buf + 2, 10); - TEST_EQ(TlclSendReceive(buf, buf2, sizeof(buf2)), VBERROR_SIMULATED, + TEST_EQ(TlclSendReceive(buf, buf2, sizeof(buf2)), VB2_ERROR_MOCK, "SendReceive fail"); ResetMocks(); @@ -207,7 +207,7 @@ static void SendCommandTest(void) TEST_EQ(TlclIsOwned(), 0, "IsOwned"); TEST_EQ(calls[0].req_cmd, TPM_ORD_ReadPubek, " cmd"); ResetMocks(); - calls[0].retval = VBERROR_SIMULATED; + calls[0].retval = VB2_ERROR_MOCK; TEST_NEQ(TlclIsOwned(), 0, "IsOwned"); ResetMocks(); diff --git a/tests/vboot_api_kernel2_tests.c b/tests/vboot_api_kernel2_tests.c index c23f87fc..2469512e 100644 --- a/tests/vboot_api_kernel2_tests.c +++ b/tests/vboot_api_kernel2_tests.c @@ -204,7 +204,7 @@ vb2_error_t VbExDiskGetInfo(VbDiskInfo **infos_ptr, uint32_t *count, { if (mock_num_disks_count < ARRAY_SIZE(mock_num_disks)) { if (mock_num_disks[mock_num_disks_count] == -1) - return VBERROR_SIMULATED; + return VB2_ERROR_MOCK; else *count = mock_num_disks[mock_num_disks_count++]; } else { @@ -1358,7 +1358,7 @@ static void VbBootRecTest(void) mock_keypress[0] = VB_KEY_CTRL('D'); mock_keypress[1] = VB_KEY_ENTER; mock_keyflags[1] = VB_KEY_FLAG_TRUSTED_KEYBOARD; - virtdev_retval = VBERROR_SIMULATED; + virtdev_retval = VB2_ERROR_MOCK; TEST_EQ(VbBootRecovery(&ctx), VBERROR_TPM_SET_BOOT_MODE_STATE, "Ctrl+D todev failure"); diff --git a/tests/vboot_api_kernel4_tests.c b/tests/vboot_api_kernel4_tests.c index d0098164..1304aaf0 100644 --- a/tests/vboot_api_kernel4_tests.c +++ b/tests/vboot_api_kernel4_tests.c @@ -132,7 +132,7 @@ vb2_error_t VbTryLoadKernel(struct vb2_context *c, uint32_t get_info_flags) shared->kernel_version_tpm = new_version; if (vbboot_retval == -1) - return VBERROR_SIMULATED; + return VB2_ERROR_MOCK; return vbboot_retval; } @@ -142,7 +142,7 @@ vb2_error_t VbBootDeveloper(struct vb2_context *c) shared->kernel_version_tpm = new_version; if (vbboot_retval == -2) - return VBERROR_SIMULATED; + return VB2_ERROR_MOCK; return vbboot_retval; } @@ -152,7 +152,7 @@ vb2_error_t VbBootRecovery(struct vb2_context *c) shared->kernel_version_tpm = new_version; if (vbboot_retval == -3) - return VBERROR_SIMULATED; + return VB2_ERROR_MOCK; return vbboot_retval; } @@ -160,7 +160,7 @@ vb2_error_t VbBootRecovery(struct vb2_context *c) vb2_error_t VbBootDiagnostic(struct vb2_context *c) { if (vbboot_retval == -4) - return VBERROR_SIMULATED; + return VB2_ERROR_MOCK; return vbboot_retval; } @@ -260,7 +260,7 @@ static void VbSlkTest(void) /* Boot normal */ ResetMocks(); vbboot_retval = -1; - test_slk(VBERROR_SIMULATED, 0, "Normal boot bad"); + test_slk(VB2_ERROR_MOCK, 0, "Normal boot bad"); /* Check that NV_DIAG_REQUEST triggers diagnostic UI */ if (DIAGNOSTIC_UI) { @@ -268,7 +268,7 @@ static void VbSlkTest(void) mock_switches[1] = VB_SWITCH_FLAG_PHYS_PRESENCE_PRESSED; vb2_nv_set(&ctx_nvram_backend, VB2_NV_DIAG_REQUEST, 1); vbboot_retval = -4; - test_slk(VBERROR_SIMULATED, 0, + test_slk(VB2_ERROR_MOCK, 0, "Normal boot with diag"); TEST_EQ(vb2_nv_get(&ctx_nvram_backend, VB2_NV_DIAG_REQUEST), 0, " diag not requested"); @@ -278,7 +278,7 @@ static void VbSlkTest(void) ResetMocks(); shared->flags |= VBSD_BOOT_DEV_SWITCH_ON; vbboot_retval = -2; - test_slk(VBERROR_SIMULATED, 0, "Dev boot bad"); + test_slk(VB2_ERROR_MOCK, 0, "Dev boot bad"); ResetMocks(); shared->flags |= VBSD_BOOT_DEV_SWITCH_ON; @@ -290,7 +290,7 @@ static void VbSlkTest(void) ResetMocks(); shared->recovery_reason = 123; vbboot_retval = -3; - test_slk(VBERROR_SIMULATED, 0, "Recovery boot bad"); + test_slk(VB2_ERROR_MOCK, 0, "Recovery boot bad"); ResetMocks(); shared->recovery_reason = 123; @@ -300,7 +300,7 @@ static void VbSlkTest(void) ResetMocks(); shared->recovery_reason = 123; - rkr_retval = rkw_retval = rkl_retval = VBERROR_SIMULATED; + rkr_retval = rkw_retval = rkl_retval = VB2_ERROR_MOCK; test_slk(0, 0, "Recovery ignore TPM errors"); ResetMocks(); diff --git a/tests/vboot_api_kernel6_tests.c b/tests/vboot_api_kernel6_tests.c index 553a7797..63aff75d 100644 --- a/tests/vboot_api_kernel6_tests.c +++ b/tests/vboot_api_kernel6_tests.c @@ -30,7 +30,7 @@ static void ResetMocks(void) vb2_error_t SetVirtualDevMode(int val) { if (virtual_dev_mode_fail) - return VBERROR_SIMULATED; + return VB2_ERROR_MOCK; return VB2_SUCCESS; } diff --git a/tests/vboot_detach_menu_tests.c b/tests/vboot_detach_menu_tests.c index f1a43aa8..613c8ef5 100644 --- a/tests/vboot_detach_menu_tests.c +++ b/tests/vboot_detach_menu_tests.c @@ -1018,7 +1018,7 @@ static void VbBootDevTest(void) vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_USB, 1); mock_keypress[0] = VB_BUTTON_VOL_UP_LONG_PRESS; mock_keypress[1] = VB_BUTTON_VOL_UP_LONG_PRESS; - vbtlk_retval[0] = VBERROR_SIMULATED - VB_DISK_FLAG_REMOVABLE; + vbtlk_retval[0] = VB2_ERROR_MOCK - VB_DISK_FLAG_REMOVABLE; vbtlk_retval[1] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE; TEST_EQ(VbBootDeveloperMenu(&ctx), VB2_SUCCESS, "VolUp USB valid after invalid"); @@ -1404,7 +1404,7 @@ static void VbBootRecTest(void) /* INSERT boots without screens if we have a valid image on first try */ ResetMocksForManualRecovery(); vbtlk_retval[0] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE; - vbtlk_retval[1] = VBERROR_SIMULATED - VB_DISK_FLAG_REMOVABLE; + vbtlk_retval[1] = VB2_ERROR_MOCK - VB_DISK_FLAG_REMOVABLE; TEST_EQ(VbBootRecoveryMenu(&ctx), VB2_SUCCESS, "INSERT boots without screens if valid on first try"); TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); @@ -1434,7 +1434,7 @@ static void VbBootRecTest(void) /* invalid image, then remove, then valid image */ ResetMocksForManualRecovery(); - vbtlk_retval[0] = VBERROR_SIMULATED - VB_DISK_FLAG_REMOVABLE; + vbtlk_retval[0] = VB2_ERROR_MOCK - VB_DISK_FLAG_REMOVABLE; vbtlk_retval[1] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; vbtlk_retval[2] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; vbtlk_retval[3] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; @@ -1720,7 +1720,7 @@ static void VbBootRecTest(void) mock_keyflags[i] = VB_KEY_FLAG_TRUSTED_KEYBOARD; mock_keypress[i++] = VB_BUTTON_VOL_UP_SHORT_PRESS; // confirm enabling mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; - virtdev_retval = VBERROR_SIMULATED; + virtdev_retval = VB2_ERROR_MOCK; TEST_EQ(VbBootRecoveryMenu(&ctx), VBERROR_TPM_SET_BOOT_MODE_STATE, "todev TPM failure"); TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); @@ -1771,7 +1771,7 @@ static void VbBootRecTest(void) mock_keypress[55] = VB_BUTTON_VOL_UP_SHORT_PRESS; // enter OPTIONS mock_keypress[56] = VB_BUTTON_VOL_DOWN_SHORT_PRESS; // power off mock_keypress[57] = VB_BUTTON_POWER_SHORT_PRESS; - vbtlk_retval[0] = VBERROR_SIMULATED - VB_DISK_FLAG_REMOVABLE; + vbtlk_retval[0] = VB2_ERROR_MOCK - VB_DISK_FLAG_REMOVABLE; vbtlk_retval[1] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; TEST_EQ(VbBootRecoveryMenu(&ctx), VBERROR_SHUTDOWN_REQUESTED, "Drop back to INSERT from TO_DEV when removing invalid USB"); @@ -1800,7 +1800,7 @@ static void VbBootRecTest(void) mock_keypress[2] = VB_BUTTON_VOL_DOWN_SHORT_PRESS; // language mock_keypress[3] = VB_BUTTON_POWER_SHORT_PRESS; vbtlk_retval[0] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; - vbtlk_retval[1] = VBERROR_SIMULATED - VB_DISK_FLAG_REMOVABLE; + vbtlk_retval[1] = VB2_ERROR_MOCK - VB_DISK_FLAG_REMOVABLE; TEST_EQ(VbBootRecoveryMenu(&ctx), VBERROR_SHUTDOWN_REQUESTED, "Drop back to NOGOOD from LANGUAGE when inserting invalid USB"); TEST_EQ(shutdown_request_calls_left, 0, " timed out"); diff --git a/tests/vboot_kernel_tests.c b/tests/vboot_kernel_tests.c index f47904a8..da169cd4 100644 --- a/tests/vboot_kernel_tests.c +++ b/tests/vboot_kernel_tests.c @@ -223,7 +223,7 @@ vb2_error_t VbExDiskRead(VbExDiskHandle_t h, uint64_t lba_start, LOGCALL("VbExDiskRead(h, %d, %d)\n", (int)lba_start, (int)lba_count); if ((int)lba_start == disk_read_to_fail) - return VBERROR_SIMULATED; + return VB2_ERROR_MOCK; memcpy(buffer, &mock_disk[lba_start * MOCK_SECTOR_SIZE], lba_count * MOCK_SECTOR_SIZE); @@ -237,7 +237,7 @@ vb2_error_t VbExDiskWrite(VbExDiskHandle_t h, uint64_t lba_start, LOGCALL("VbExDiskWrite(h, %d, %d)\n", (int)lba_start, (int)lba_count); if ((int)lba_start == disk_write_to_fail) - return VBERROR_SIMULATED; + return VB2_ERROR_MOCK; memcpy(&mock_disk[lba_start * MOCK_SECTOR_SIZE], buffer, lba_count * MOCK_SECTOR_SIZE); -- cgit v1.2.1