diff options
| author | Joel Kitching <kitching@google.com> | 2019-10-02 00:06:29 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-10-21 04:48:33 +0000 |
| commit | 2abf0e7b7038b4ac12ea5edf7db00dad09a8e5c7 (patch) | |
| tree | eee999daff88272ef010bd2843d944b5a179480f /tests/vb2_misc_tests.c | |
| parent | f06f7551e16bb5e44b3b1f2fd5788ea86825cd7e (diff) | |
| download | vboot-2abf0e7b7038b4ac12ea5edf7db00dad09a8e5c7.tar.gz | |
vboot: update secdata accessors to match those of FWMP
Instead of returning vb2_error_t, use VB2_DIE to exit on error.
BUG=b:124141368, chromium:972956, chromium:1006689,
TEST=make clean && make runtests
BRANCH=none
Change-Id: I9497eebb0b8815734fdf875ba4f9ef5eda5e82fd
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1833365
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'tests/vb2_misc_tests.c')
| -rw-r--r-- | tests/vb2_misc_tests.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/tests/vb2_misc_tests.c b/tests/vb2_misc_tests.c index 5e1383cd..2b18b4ee 100644 --- a/tests/vb2_misc_tests.c +++ b/tests/vb2_misc_tests.c @@ -399,7 +399,7 @@ static void dev_switch_tests(void) VB2_SECDATA_FIRMWARE_FLAG_DEV_MODE); TEST_SUCC(vb2_check_dev_switch(&ctx), "to dev mode"); TEST_EQ(mock_tpm_clear_called, 1, " tpm clear"); - vb2_secdata_firmware_get(&ctx, VB2_SECDATA_FIRMWARE_FLAGS, &v); + v = vb2_secdata_firmware_get(&ctx, VB2_SECDATA_FIRMWARE_FLAGS); TEST_EQ(v, (VB2_SECDATA_FIRMWARE_FLAG_DEV_MODE | VB2_SECDATA_FIRMWARE_FLAG_LAST_BOOT_DEVELOPER), " last boot developer now"); @@ -410,7 +410,7 @@ static void dev_switch_tests(void) VB2_SECDATA_FIRMWARE_FLAG_LAST_BOOT_DEVELOPER); TEST_SUCC(vb2_check_dev_switch(&ctx), "from dev mode"); TEST_EQ(mock_tpm_clear_called, 1, " tpm clear"); - vb2_secdata_firmware_get(&ctx, VB2_SECDATA_FIRMWARE_FLAGS, &v); + v = vb2_secdata_firmware_get(&ctx, VB2_SECDATA_FIRMWARE_FLAGS); TEST_EQ(v, 0, " last boot not developer now"); /* Disable dev mode */ @@ -430,7 +430,7 @@ static void dev_switch_tests(void) gbb.flags |= VB2_GBB_FLAG_FORCE_DEV_SWITCH_ON; TEST_SUCC(vb2_check_dev_switch(&ctx), "dev on via gbb"); TEST_NEQ(sd->flags & VB2_SD_FLAG_DEV_MODE_ENABLED, 0, " sd in dev"); - vb2_secdata_firmware_get(&ctx, VB2_SECDATA_FIRMWARE_FLAGS, &v); + v = vb2_secdata_firmware_get(&ctx, VB2_SECDATA_FIRMWARE_FLAGS); TEST_EQ(v, VB2_SECDATA_FIRMWARE_FLAG_LAST_BOOT_DEVELOPER, " doesn't set dev on in secdata_firmware " "but does set last boot dev"); @@ -454,7 +454,7 @@ static void dev_switch_tests(void) TEST_EQ(vb2_check_dev_switch(&ctx), VB2_ERROR_EX_TPM_CLEAR_OWNER, "tpm clear fail"); TEST_EQ(mock_tpm_clear_called, 1, " tpm clear"); - vb2_secdata_firmware_get(&ctx, VB2_SECDATA_FIRMWARE_FLAGS, &v); + v = vb2_secdata_firmware_get(&ctx, VB2_SECDATA_FIRMWARE_FLAGS); TEST_EQ(v, VB2_SECDATA_FIRMWARE_FLAG_LAST_BOOT_DEVELOPER, " last boot still developer"); TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), @@ -463,20 +463,18 @@ static void dev_switch_tests(void) (uint8_t)VB2_ERROR_EX_TPM_CLEAR_OWNER, " recovery subcode"); /* - * Secdata failure in normal mode fails and shows dev=0 even if dev - * mode was on in the (inaccessible) secdata_firmware. + * secdata_firmware failure in normal mode fails and shows dev=0 even + * if dev mode was on in the (inaccessible) secdata_firmware. */ reset_common_data(); vb2_secdata_firmware_set(&ctx, VB2_SECDATA_FIRMWARE_FLAGS, VB2_SECDATA_FIRMWARE_FLAG_DEV_MODE); sd->status &= ~VB2_SD_STATUS_SECDATA_FIRMWARE_INIT; - TEST_EQ(vb2_check_dev_switch(&ctx), - VB2_ERROR_SECDATA_FIRMWARE_GET_UNINITIALIZED, - "secdata_firmware fail normal"); + TEST_ABORT(vb2_check_dev_switch(&ctx), "secdata_firmware fail normal"); TEST_EQ(sd->flags & VB2_SD_FLAG_DEV_MODE_ENABLED, 0, " sd not in dev"); TEST_EQ(ctx.flags & VB2_CONTEXT_DEVELOPER_MODE, 0, " ctx not in dev"); - /* Secdata failure in recovery mode continues */ + /* secdata_firmware failure in recovery mode continues */ reset_common_data(); ctx.flags |= VB2_CONTEXT_RECOVERY_MODE; sd->status &= ~VB2_SD_STATUS_SECDATA_FIRMWARE_INIT; |