diff options
Diffstat (limited to 'tests/vb21_misc_tests.c')
| -rw-r--r-- | tests/vb21_misc_tests.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/tests/vb21_misc_tests.c b/tests/vb21_misc_tests.c index d68cf3f8..d7cfbd26 100644 --- a/tests/vb21_misc_tests.c +++ b/tests/vb21_misc_tests.c @@ -114,7 +114,7 @@ static void reset_common_data(enum reset_type t) /* If verifying preamble, verify keyblock first to set up data key */ if (t == FOR_PREAMBLE) - vb2_load_fw_keyblock(&ctx); + vb21_load_fw_keyblock(&ctx); }; /* Mocked functions */ @@ -186,7 +186,7 @@ static void load_keyblock_tests(void) /* Test successful call */ reset_common_data(FOR_KEYBLOCK); wb_used_before = ctx.workbuf_used; - TEST_SUCC(vb2_load_fw_keyblock(&ctx), "keyblock verify"); + TEST_SUCC(vb21_load_fw_keyblock(&ctx), "keyblock verify"); TEST_EQ(sd->fw_version, 0x20000, "keyblock version"); TEST_EQ(sd->vblock_preamble_offset, sizeof(mock_vblock.k), "preamble offset"); @@ -216,69 +216,69 @@ static void load_keyblock_tests(void) /* Test failures */ reset_common_data(FOR_KEYBLOCK); ctx.workbuf_used = ctx.workbuf_size - sd->gbb_rootkey_size + 8; - TEST_EQ(vb2_load_fw_keyblock(&ctx), + TEST_EQ(vb21_load_fw_keyblock(&ctx), VB2_ERROR_FW_KEYBLOCK_WORKBUF_ROOT_KEY, "keyblock not enough workbuf for root key"); reset_common_data(FOR_KEYBLOCK); sd->gbb_rootkey_size = sizeof(mock_gbb); - TEST_EQ(vb2_load_fw_keyblock(&ctx), + TEST_EQ(vb21_load_fw_keyblock(&ctx), VB2_ERROR_EX_READ_RESOURCE_SIZE, "keyblock read root key"); reset_common_data(FOR_KEYBLOCK); mock_unpack_key_retval = VB2_ERROR_UNPACK_KEY_SIG_ALGORITHM; - TEST_EQ(vb2_load_fw_keyblock(&ctx), + TEST_EQ(vb21_load_fw_keyblock(&ctx), VB2_ERROR_UNPACK_KEY_SIG_ALGORITHM, "keyblock unpack root key"); reset_common_data(FOR_KEYBLOCK); ctx.workbuf_used = ctx.workbuf_size - sd->gbb_rootkey_size - 8; - TEST_EQ(vb2_load_fw_keyblock(&ctx), + TEST_EQ(vb21_load_fw_keyblock(&ctx), VB2_ERROR_READ_RESOURCE_OBJECT_BUF, "keyblock not enough workbuf for header"); reset_common_data(FOR_KEYBLOCK); mock_read_res_fail_on_call = 2; - TEST_EQ(vb2_load_fw_keyblock(&ctx), + TEST_EQ(vb21_load_fw_keyblock(&ctx), VB2_ERROR_EX_READ_RESOURCE_INDEX, "keyblock read keyblock header"); reset_common_data(FOR_KEYBLOCK); ctx.workbuf_used = ctx.workbuf_size - sd->gbb_rootkey_size - sizeof(struct vb21_keyblock); - TEST_EQ(vb2_load_fw_keyblock(&ctx), + TEST_EQ(vb21_load_fw_keyblock(&ctx), VB2_ERROR_READ_RESOURCE_OBJECT_BUF, "keyblock not enough workbuf for entire keyblock"); reset_common_data(FOR_KEYBLOCK); kb->c.total_size = sizeof(mock_vblock) + 1; - TEST_EQ(vb2_load_fw_keyblock(&ctx), + TEST_EQ(vb21_load_fw_keyblock(&ctx), VB2_ERROR_EX_READ_RESOURCE_SIZE, "keyblock read keyblock"); reset_common_data(FOR_KEYBLOCK); mock_verify_keyblock_retval = VB2_ERROR_KEYBLOCK_MAGIC; - TEST_EQ(vb2_load_fw_keyblock(&ctx), + TEST_EQ(vb21_load_fw_keyblock(&ctx), VB2_ERROR_KEYBLOCK_MAGIC, "keyblock verify keyblock"); reset_common_data(FOR_KEYBLOCK); dk->key_version = 0x10000; - TEST_EQ(vb2_load_fw_keyblock(&ctx), + TEST_EQ(vb21_load_fw_keyblock(&ctx), VB2_ERROR_FW_KEYBLOCK_VERSION_RANGE, "keyblock version range"); reset_common_data(FOR_KEYBLOCK); dk->key_version = 1; - TEST_EQ(vb2_load_fw_keyblock(&ctx), + TEST_EQ(vb21_load_fw_keyblock(&ctx), VB2_ERROR_FW_KEYBLOCK_VERSION_ROLLBACK, "keyblock rollback"); reset_common_data(FOR_KEYBLOCK); dk->key_version = 1; sd->gbb_flags |= VB2_GBB_FLAG_DISABLE_FW_ROLLBACK_CHECK; - TEST_SUCC(vb2_load_fw_keyblock(&ctx), "keyblock rollback + GBB flag"); + TEST_SUCC(vb21_load_fw_keyblock(&ctx), "keyblock rollback + GBB flag"); } static void load_preamble_tests(void) @@ -290,7 +290,7 @@ static void load_preamble_tests(void) /* Test successful call */ reset_common_data(FOR_PREAMBLE); data_key_offset_before = sd->workbuf_data_key_offset; - TEST_SUCC(vb2_load_fw_preamble(&ctx), "preamble good"); + TEST_SUCC(vb21_load_fw_preamble(&ctx), "preamble good"); TEST_EQ(sd->fw_version, 0x20002, "combined version"); TEST_EQ(sd->workbuf_preamble_offset, data_key_offset_before, "preamble offset"); @@ -304,67 +304,67 @@ static void load_preamble_tests(void) /* Expected failures */ reset_common_data(FOR_PREAMBLE); sd->workbuf_data_key_size = 0; - TEST_EQ(vb2_load_fw_preamble(&ctx), + TEST_EQ(vb21_load_fw_preamble(&ctx), VB2_ERROR_FW_PREAMBLE2_DATA_KEY, "preamble no data key"); reset_common_data(FOR_PREAMBLE); mock_unpack_key_retval = VB2_ERROR_UNPACK_KEY_HASH_ALGORITHM; - TEST_EQ(vb2_load_fw_preamble(&ctx), + TEST_EQ(vb21_load_fw_preamble(&ctx), VB2_ERROR_UNPACK_KEY_HASH_ALGORITHM, "preamble unpack data key"); reset_common_data(FOR_PREAMBLE); ctx.workbuf_used = ctx.workbuf_size - sizeof(struct vb21_fw_preamble) + 8; - TEST_EQ(vb2_load_fw_preamble(&ctx), + TEST_EQ(vb21_load_fw_preamble(&ctx), VB2_ERROR_READ_RESOURCE_OBJECT_BUF, "preamble not enough workbuf for header"); reset_common_data(FOR_PREAMBLE); sd->vblock_preamble_offset = sizeof(mock_vblock); - TEST_EQ(vb2_load_fw_preamble(&ctx), + TEST_EQ(vb21_load_fw_preamble(&ctx), VB2_ERROR_EX_READ_RESOURCE_SIZE, "preamble read header"); reset_common_data(FOR_PREAMBLE); ctx.workbuf_used = ctx.workbuf_size - sizeof(mock_vblock.p) + 8; - TEST_EQ(vb2_load_fw_preamble(&ctx), + TEST_EQ(vb21_load_fw_preamble(&ctx), VB2_ERROR_READ_RESOURCE_OBJECT_BUF, "preamble not enough workbuf"); reset_common_data(FOR_PREAMBLE); pre->c.total_size = sizeof(mock_vblock); - TEST_EQ(vb2_load_fw_preamble(&ctx), + TEST_EQ(vb21_load_fw_preamble(&ctx), VB2_ERROR_EX_READ_RESOURCE_SIZE, "preamble read full"); reset_common_data(FOR_PREAMBLE); mock_verify_preamble_retval = VB2_ERROR_PREAMBLE_SIG_INVALID; - TEST_EQ(vb2_load_fw_preamble(&ctx), + TEST_EQ(vb21_load_fw_preamble(&ctx), VB2_ERROR_PREAMBLE_SIG_INVALID, "preamble verify"); reset_common_data(FOR_PREAMBLE); pre->fw_version = 0x10000; - TEST_EQ(vb2_load_fw_preamble(&ctx), + TEST_EQ(vb21_load_fw_preamble(&ctx), VB2_ERROR_FW_PREAMBLE_VERSION_RANGE, "preamble version range"); reset_common_data(FOR_PREAMBLE); pre->fw_version = 1; - TEST_EQ(vb2_load_fw_preamble(&ctx), + TEST_EQ(vb21_load_fw_preamble(&ctx), VB2_ERROR_FW_PREAMBLE_VERSION_ROLLBACK, "preamble version rollback"); reset_common_data(FOR_PREAMBLE); pre->fw_version = 1; sd->gbb_flags |= VB2_GBB_FLAG_DISABLE_FW_ROLLBACK_CHECK; - TEST_SUCC(vb2_load_fw_preamble(&ctx), "version rollback with GBB flag"); + TEST_SUCC(vb21_load_fw_preamble(&ctx), "version rollback with GBB flag"); reset_common_data(FOR_PREAMBLE); pre->fw_version = 3; - TEST_SUCC(vb2_load_fw_preamble(&ctx), + TEST_SUCC(vb21_load_fw_preamble(&ctx), "preamble version roll forward"); vb2_secdata_get(&ctx, VB2_SECDATA_VERSIONS, &v); TEST_EQ(v, 0x20003, "roll forward"); @@ -373,7 +373,7 @@ static void load_preamble_tests(void) reset_common_data(FOR_PREAMBLE); pre->fw_version = 3; sd->last_fw_result = VB2_FW_RESULT_UNKNOWN; - TEST_SUCC(vb2_load_fw_preamble(&ctx), + TEST_SUCC(vb21_load_fw_preamble(&ctx), "preamble version no roll forward 1"); vb2_secdata_get(&ctx, VB2_SECDATA_VERSIONS, &v); TEST_EQ(v, 0x20002, "no roll forward"); @@ -382,7 +382,7 @@ static void load_preamble_tests(void) reset_common_data(FOR_PREAMBLE); pre->fw_version = 3; sd->last_fw_slot = 1; - TEST_SUCC(vb2_load_fw_preamble(&ctx), + TEST_SUCC(vb21_load_fw_preamble(&ctx), "preamble version no roll forward 2"); vb2_secdata_get(&ctx, VB2_SECDATA_VERSIONS, &v); TEST_EQ(v, 0x20002, "no roll forward"); |