diff options
author | Joel Kitching <kitching@google.com> | 2019-05-17 12:24:55 +0800 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2019-05-17 18:36:50 -0700 |
commit | 2bca3d876c9ebaf8e682b377b0b66366d97a6807 (patch) | |
tree | 29e0f1fd3beca93c3a8284e79eebf48095093148 /tests/vb20_api_tests.c | |
parent | 6c06245fb820807ec8c91014ca537df9a86d58d5 (diff) | |
download | vboot-2bca3d876c9ebaf8e682b377b0b66366d97a6807.tar.gz |
vboot: standardize on vb2_context identifiers in tests
Use `ctx` for global vb2_context variable, and `c` for argument
to functions. This avoids shadowing the `ctx` identifier, which
was recently disallowed by enabling -Wshadow in CL:1598721.
BUG=b:124141368
TEST=make clean && make runtests
BRANCH=none
Change-Id: I9db97fd4945694e6f54abc5b0c04ed5533789300
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1616872
Commit-Ready: Joel Kitching <kitching@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Youcheng Syu <youcheng@chromium.org>
Diffstat (limited to 'tests/vb20_api_tests.c')
-rw-r--r-- | tests/vb20_api_tests.c | 122 |
1 files changed, 61 insertions, 61 deletions
diff --git a/tests/vb20_api_tests.c b/tests/vb20_api_tests.c index 3a5d4968..6c43391e 100644 --- a/tests/vb20_api_tests.c +++ b/tests/vb20_api_tests.c @@ -19,7 +19,7 @@ /* Common context for tests */ static uint8_t workbuf[VB2_FIRMWARE_WORKBUF_RECOMMENDED_SIZE] __attribute__ ((aligned (VB2_WORKBUF_ALIGN))); -static struct vb2_context cc; +static struct vb2_context ctx; static struct vb2_shared_data *sd; const char mock_body[320] = "Mock body"; @@ -57,29 +57,29 @@ static void reset_common_data(enum reset_type t) memset(workbuf, 0xaa, sizeof(workbuf)); - memset(&cc, 0, sizeof(cc)); - cc.workbuf = workbuf; - cc.workbuf_size = sizeof(workbuf); + memset(&ctx, 0, sizeof(ctx)); + ctx.workbuf = workbuf; + ctx.workbuf_size = sizeof(workbuf); - vb2_init_context(&cc); - sd = vb2_get_sd(&cc); + vb2_init_context(&ctx); + sd = vb2_get_sd(&ctx); - vb2_nv_init(&cc); + vb2_nv_init(&ctx); - vb2_secdata_create(&cc); - vb2_secdata_init(&cc); + vb2_secdata_create(&ctx); + vb2_secdata_init(&ctx); retval_vb2_load_fw_keyblock = VB2_SUCCESS; retval_vb2_load_fw_preamble = VB2_SUCCESS; retval_vb2_digest_finalize = VB2_SUCCESS; retval_vb2_verify_digest = VB2_SUCCESS; - sd->workbuf_preamble_offset = cc.workbuf_used; + sd->workbuf_preamble_offset = ctx.workbuf_used; sd->workbuf_preamble_size = sizeof(*pre); - vb2_set_workbuf_used(&cc, sd->workbuf_preamble_offset + vb2_set_workbuf_used(&ctx, sd->workbuf_preamble_offset + sd->workbuf_preamble_size); pre = (struct vb2_fw_preamble *) - (cc.workbuf + sd->workbuf_preamble_offset); + (ctx.workbuf + sd->workbuf_preamble_offset); pre->body_signature.data_size = mock_body_size; pre->body_signature.sig_size = mock_sig_size; if (hwcrypto_state == HWCRYPTO_FORBIDDEN) @@ -87,19 +87,19 @@ static void reset_common_data(enum reset_type t) else pre->flags = 0; - sd->workbuf_data_key_offset = cc.workbuf_used; + sd->workbuf_data_key_offset = ctx.workbuf_used; sd->workbuf_data_key_size = sizeof(*k) + 8; - vb2_set_workbuf_used(&cc, sd->workbuf_data_key_offset + + vb2_set_workbuf_used(&ctx, sd->workbuf_data_key_offset + sd->workbuf_data_key_size); k = (struct vb2_packed_key *) - (cc.workbuf + sd->workbuf_data_key_offset); + (ctx.workbuf + sd->workbuf_data_key_offset); k->algorithm = mock_algorithm; if (t == FOR_EXTEND_HASH || t == FOR_CHECK_HASH) - vb2api_init_hash(&cc, VB2_HASH_TAG_FW_BODY, NULL); + vb2api_init_hash(&ctx, VB2_HASH_TAG_FW_BODY, NULL); if (t == FOR_CHECK_HASH) - vb2api_extend_hash(&cc, mock_body, mock_body_size); + vb2api_extend_hash(&ctx, mock_body, mock_body_size); /* Always clear out the digest result. */ memset(digest_result, 0, digest_result_size); @@ -107,12 +107,12 @@ static void reset_common_data(enum reset_type t) /* Mocked functions */ -int vb2_load_fw_keyblock(struct vb2_context *ctx) +int vb2_load_fw_keyblock(struct vb2_context *c) { return retval_vb2_load_fw_keyblock; } -int vb2_load_fw_preamble(struct vb2_context *ctx) +int vb2_load_fw_preamble(struct vb2_context *c) { return retval_vb2_load_fw_preamble; } @@ -233,18 +233,18 @@ int vb2_rsa_verify_digest(const struct vb2_public_key *key, static void phase3_tests(void) { reset_common_data(FOR_MISC); - TEST_SUCC(vb2api_fw_phase3(&cc), "phase3 good"); + TEST_SUCC(vb2api_fw_phase3(&ctx), "phase3 good"); reset_common_data(FOR_MISC); retval_vb2_load_fw_keyblock = VB2_ERROR_MOCK; - TEST_EQ(vb2api_fw_phase3(&cc), VB2_ERROR_MOCK, "phase3 keyblock"); - TEST_EQ(vb2_nv_get(&cc, VB2_NV_RECOVERY_REQUEST), + TEST_EQ(vb2api_fw_phase3(&ctx), VB2_ERROR_MOCK, "phase3 keyblock"); + TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), VB2_RECOVERY_RO_INVALID_RW, " recovery reason"); reset_common_data(FOR_MISC); retval_vb2_load_fw_preamble = VB2_ERROR_MOCK; - TEST_EQ(vb2api_fw_phase3(&cc), VB2_ERROR_MOCK, "phase3 keyblock"); - TEST_EQ(vb2_nv_get(&cc, VB2_NV_RECOVERY_REQUEST), + TEST_EQ(vb2api_fw_phase3(&ctx), VB2_ERROR_MOCK, "phase3 keyblock"); + TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), VB2_RECOVERY_RO_INVALID_RW, " recovery reason"); } @@ -256,58 +256,58 @@ static void init_hash_tests(void) /* For now, all we support is body signature hash */ reset_common_data(FOR_MISC); - wb_used_before = cc.workbuf_used; - TEST_SUCC(vb2api_init_hash(&cc, VB2_HASH_TAG_FW_BODY, &size), + wb_used_before = ctx.workbuf_used; + TEST_SUCC(vb2api_init_hash(&ctx, VB2_HASH_TAG_FW_BODY, &size), "init hash good"); TEST_EQ(sd->workbuf_hash_offset, wb_used_before, "hash context offset"); TEST_EQ(sd->workbuf_hash_size, sizeof(struct vb2_digest_context), "hash context size"); - TEST_EQ(cc.workbuf_used, + TEST_EQ(ctx.workbuf_used, vb2_wb_round_up(sd->workbuf_hash_offset + sd->workbuf_hash_size), "hash uses workbuf"); TEST_EQ(sd->hash_tag, VB2_HASH_TAG_FW_BODY, "hash tag"); TEST_EQ(sd->hash_remaining_size, mock_body_size, "hash remaining"); - wb_used_before = cc.workbuf_used; - TEST_SUCC(vb2api_init_hash(&cc, VB2_HASH_TAG_FW_BODY, NULL), + wb_used_before = ctx.workbuf_used; + TEST_SUCC(vb2api_init_hash(&ctx, VB2_HASH_TAG_FW_BODY, NULL), "init hash again"); - TEST_EQ(cc.workbuf_used, wb_used_before, "init hash reuses context"); + TEST_EQ(ctx.workbuf_used, wb_used_before, "init hash reuses context"); reset_common_data(FOR_MISC); - TEST_EQ(vb2api_init_hash(&cc, VB2_HASH_TAG_INVALID, &size), + TEST_EQ(vb2api_init_hash(&ctx, VB2_HASH_TAG_INVALID, &size), VB2_ERROR_API_INIT_HASH_TAG, "init hash invalid tag"); reset_common_data(FOR_MISC); sd->workbuf_preamble_size = 0; - TEST_EQ(vb2api_init_hash(&cc, VB2_HASH_TAG_FW_BODY, &size), + TEST_EQ(vb2api_init_hash(&ctx, VB2_HASH_TAG_FW_BODY, &size), VB2_ERROR_API_INIT_HASH_PREAMBLE, "init hash preamble"); reset_common_data(FOR_MISC); - TEST_EQ(vb2api_init_hash(&cc, VB2_HASH_TAG_FW_BODY + 1, &size), + TEST_EQ(vb2api_init_hash(&ctx, VB2_HASH_TAG_FW_BODY + 1, &size), VB2_ERROR_API_INIT_HASH_TAG, "init hash unknown tag"); reset_common_data(FOR_MISC); - cc.workbuf_used = cc.workbuf_size + VB2_WORKBUF_ALIGN - + ctx.workbuf_used = ctx.workbuf_size + VB2_WORKBUF_ALIGN - vb2_wb_round_up(sizeof(struct vb2_digest_context)); - TEST_EQ(vb2api_init_hash(&cc, VB2_HASH_TAG_FW_BODY, &size), + TEST_EQ(vb2api_init_hash(&ctx, VB2_HASH_TAG_FW_BODY, &size), VB2_ERROR_API_INIT_HASH_WORKBUF, "init hash workbuf"); reset_common_data(FOR_MISC); sd->workbuf_data_key_size = 0; - TEST_EQ(vb2api_init_hash(&cc, VB2_HASH_TAG_FW_BODY, &size), + TEST_EQ(vb2api_init_hash(&ctx, VB2_HASH_TAG_FW_BODY, &size), VB2_ERROR_API_INIT_HASH_DATA_KEY, "init hash data key"); reset_common_data(FOR_MISC); sd->workbuf_data_key_size--; - TEST_EQ(vb2api_init_hash(&cc, VB2_HASH_TAG_FW_BODY, &size), + TEST_EQ(vb2api_init_hash(&ctx, VB2_HASH_TAG_FW_BODY, &size), VB2_ERROR_UNPACK_KEY_SIZE, "init hash data key size"); reset_common_data(FOR_MISC); - k = (struct vb2_packed_key *)(cc.workbuf + sd->workbuf_data_key_offset); + k = (struct vb2_packed_key *)(ctx.workbuf + sd->workbuf_data_key_offset); k->algorithm--; - TEST_EQ(vb2api_init_hash(&cc, VB2_HASH_TAG_FW_BODY, &size), + TEST_EQ(vb2api_init_hash(&ctx, VB2_HASH_TAG_FW_BODY, &size), VB2_ERROR_SHA_INIT_ALGORITHM, "init hash algorithm"); } @@ -316,33 +316,33 @@ static void extend_hash_tests(void) struct vb2_digest_context *dc; reset_common_data(FOR_EXTEND_HASH); - TEST_SUCC(vb2api_extend_hash(&cc, mock_body, 32), + TEST_SUCC(vb2api_extend_hash(&ctx, mock_body, 32), "hash extend good"); TEST_EQ(sd->hash_remaining_size, mock_body_size - 32, "hash extend remaining"); - TEST_SUCC(vb2api_extend_hash(&cc, mock_body, mock_body_size - 32), + TEST_SUCC(vb2api_extend_hash(&ctx, mock_body, mock_body_size - 32), "hash extend again"); TEST_EQ(sd->hash_remaining_size, 0, "hash extend remaining 2"); reset_common_data(FOR_EXTEND_HASH); sd->workbuf_hash_size = 0; - TEST_EQ(vb2api_extend_hash(&cc, mock_body, mock_body_size), + TEST_EQ(vb2api_extend_hash(&ctx, mock_body, mock_body_size), VB2_ERROR_API_EXTEND_HASH_WORKBUF, "hash extend no workbuf"); reset_common_data(FOR_EXTEND_HASH); - TEST_EQ(vb2api_extend_hash(&cc, mock_body, mock_body_size + 1), + TEST_EQ(vb2api_extend_hash(&ctx, mock_body, mock_body_size + 1), VB2_ERROR_API_EXTEND_HASH_SIZE, "hash extend too much"); reset_common_data(FOR_EXTEND_HASH); - TEST_EQ(vb2api_extend_hash(&cc, mock_body, 0), + TEST_EQ(vb2api_extend_hash(&ctx, mock_body, 0), VB2_ERROR_API_EXTEND_HASH_SIZE, "hash extend empty"); if (hwcrypto_state != HWCRYPTO_ENABLED) { reset_common_data(FOR_EXTEND_HASH); dc = (struct vb2_digest_context *) - (cc.workbuf + sd->workbuf_hash_offset); + (ctx.workbuf + sd->workbuf_hash_offset); dc->hash_alg = mock_hash_alg + 1; - TEST_EQ(vb2api_extend_hash(&cc, mock_body, mock_body_size), + TEST_EQ(vb2api_extend_hash(&ctx, mock_body, mock_body_size), VB2_ERROR_SHA_EXTEND_ALGORITHM, "hash extend fail"); } } @@ -353,17 +353,17 @@ static void check_hash_tests(void) const uint32_t digest_value = 0x0a0a0a0a; reset_common_data(FOR_CHECK_HASH); - TEST_SUCC(vb2api_check_hash(&cc), "check hash good"); + TEST_SUCC(vb2api_check_hash(&ctx), "check hash good"); reset_common_data(FOR_CHECK_HASH); - TEST_SUCC(vb2api_check_hash_get_digest(&cc, digest_result, + TEST_SUCC(vb2api_check_hash_get_digest(&ctx, digest_result, digest_result_size), "check hash good with result"); /* Check the first 4 bytes to ensure it was copied over. */ TEST_SUCC(memcmp(digest_result, &digest_value, sizeof(digest_value)), "check digest value"); reset_common_data(FOR_CHECK_HASH); - TEST_EQ(vb2api_check_hash_get_digest(&cc, digest_result, + TEST_EQ(vb2api_check_hash_get_digest(&ctx, digest_result, digest_result_size - 1), VB2_ERROR_API_CHECK_DIGEST_SIZE, "check digest size"); TEST_NEQ(memcmp(digest_result, &digest_value, sizeof(digest_value)), 0, @@ -371,53 +371,53 @@ static void check_hash_tests(void) reset_common_data(FOR_CHECK_HASH); sd->workbuf_preamble_size = 0; - TEST_EQ(vb2api_check_hash(&cc), + TEST_EQ(vb2api_check_hash(&ctx), VB2_ERROR_API_CHECK_HASH_PREAMBLE, "check hash preamble"); reset_common_data(FOR_CHECK_HASH); sd->workbuf_hash_size = 0; - TEST_EQ(vb2api_check_hash(&cc), + TEST_EQ(vb2api_check_hash(&ctx), VB2_ERROR_API_CHECK_HASH_WORKBUF, "check hash no workbuf"); reset_common_data(FOR_CHECK_HASH); sd->hash_remaining_size = 1; - TEST_EQ(vb2api_check_hash(&cc), + TEST_EQ(vb2api_check_hash(&ctx), VB2_ERROR_API_CHECK_HASH_SIZE, "check hash size"); reset_common_data(FOR_CHECK_HASH); - cc.workbuf_used = cc.workbuf_size; - TEST_EQ(vb2api_check_hash(&cc), + ctx.workbuf_used = ctx.workbuf_size; + TEST_EQ(vb2api_check_hash(&ctx), VB2_ERROR_API_CHECK_HASH_WORKBUF_DIGEST, "check hash workbuf"); reset_common_data(FOR_CHECK_HASH); retval_vb2_digest_finalize = VB2_ERROR_MOCK; - TEST_EQ(vb2api_check_hash(&cc), VB2_ERROR_MOCK, "check hash finalize"); + TEST_EQ(vb2api_check_hash(&ctx), VB2_ERROR_MOCK, "check hash finalize"); reset_common_data(FOR_CHECK_HASH); sd->hash_tag = VB2_HASH_TAG_INVALID; - TEST_EQ(vb2api_check_hash(&cc), + TEST_EQ(vb2api_check_hash(&ctx), VB2_ERROR_API_CHECK_HASH_TAG, "check hash tag"); reset_common_data(FOR_CHECK_HASH); sd->workbuf_data_key_size = 0; - TEST_EQ(vb2api_check_hash(&cc), + TEST_EQ(vb2api_check_hash(&ctx), VB2_ERROR_API_CHECK_HASH_DATA_KEY, "check hash data key"); reset_common_data(FOR_CHECK_HASH); sd->workbuf_data_key_size--; - TEST_EQ(vb2api_check_hash(&cc), + TEST_EQ(vb2api_check_hash(&ctx), VB2_ERROR_UNPACK_KEY_SIZE, "check hash data key size"); reset_common_data(FOR_CHECK_HASH); pre = (struct vb2_fw_preamble *) - (cc.workbuf + sd->workbuf_preamble_offset); + (ctx.workbuf + sd->workbuf_preamble_offset); pre->body_signature.sig_size++; - TEST_EQ(vb2api_check_hash(&cc), + TEST_EQ(vb2api_check_hash(&ctx), VB2_ERROR_VDATA_SIG_SIZE, "check hash sig size"); reset_common_data(FOR_CHECK_HASH); retval_vb2_digest_finalize = VB2_ERROR_RSA_VERIFY_DIGEST; - TEST_EQ(vb2api_check_hash(&cc), + TEST_EQ(vb2api_check_hash(&ctx), VB2_ERROR_RSA_VERIFY_DIGEST, "check hash finalize"); } |