diff options
| author | Joel Kitching <kitching@google.com> | 2019-09-04 14:12:42 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-10-23 16:28:16 +0000 |
| commit | d3b2117f9abe2f7413f6315867ae3c3dbfaf5db1 (patch) | |
| tree | d25a53c589d3547d25edfc299d68df55cc472652 /tests/vb20_kernel_tests.c | |
| parent | 53ce884528f734958d4845f6528809957b09934c (diff) | |
| download | vboot-d3b2117f9abe2f7413f6315867ae3c3dbfaf5db1.tar.gz | |
vboot: standardize on "keyblock" as one word
Stardardize on inconsistency between "keyblock" and "key block"
both in code, comments, and textual output.
BUG=b:124141368, chromium:968464
TEST=make clean && make runtests
BRANCH=none
Change-Id: Ib8819a2426c1179286663f21f0d254f3de9d94a4
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1786385
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'tests/vb20_kernel_tests.c')
| -rw-r--r-- | tests/vb20_kernel_tests.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/vb20_kernel_tests.c b/tests/vb20_kernel_tests.c index 1beec5fd..90f7e5ff 100644 --- a/tests/vb20_kernel_tests.c +++ b/tests/vb20_kernel_tests.c @@ -109,13 +109,13 @@ static void reset_common_data(enum reset_type t) mock_gbb.recovery_key.key_size = sizeof(mock_gbb.recovery_key_data); kb->keyblock_size = sizeof(mock_vblock.k); - memcpy(kb->magic, KEY_BLOCK_MAGIC, KEY_BLOCK_MAGIC_SIZE); + memcpy(kb->magic, KEYBLOCK_MAGIC, KEYBLOCK_MAGIC_SIZE); - kb->keyblock_flags = VB2_KEY_BLOCK_FLAG_DEVELOPER_1 | - VB2_KEY_BLOCK_FLAG_DEVELOPER_0 | - VB2_KEY_BLOCK_FLAG_RECOVERY_1 | VB2_KEY_BLOCK_FLAG_RECOVERY_0; - kb->header_version_major = KEY_BLOCK_HEADER_VERSION_MAJOR; - kb->header_version_minor = KEY_BLOCK_HEADER_VERSION_MINOR; + kb->keyblock_flags = VB2_KEYBLOCK_FLAG_DEVELOPER_1 | + VB2_KEYBLOCK_FLAG_DEVELOPER_0 | + VB2_KEYBLOCK_FLAG_RECOVERY_1 | VB2_KEYBLOCK_FLAG_RECOVERY_0; + kb->header_version_major = KEYBLOCK_HEADER_VERSION_MAJOR; + kb->header_version_minor = KEYBLOCK_HEADER_VERSION_MINOR; kb->data_key.algorithm = 7; kb->data_key.key_version = 2; kb->data_key.key_offset = @@ -322,35 +322,35 @@ static void load_kernel_keyblock_tests(void) /* Test keyblock flags matching mode */ reset_common_data(FOR_KEYBLOCK); - kb->keyblock_flags &= ~VB2_KEY_BLOCK_FLAG_DEVELOPER_0; + kb->keyblock_flags &= ~VB2_KEYBLOCK_FLAG_DEVELOPER_0; TEST_EQ(vb2_load_kernel_keyblock(&ctx), VB2_ERROR_KERNEL_KEYBLOCK_DEV_FLAG, "Kernel keyblock dev only"); reset_common_data(FOR_KEYBLOCK); - kb->keyblock_flags &= ~VB2_KEY_BLOCK_FLAG_RECOVERY_0; + kb->keyblock_flags &= ~VB2_KEYBLOCK_FLAG_RECOVERY_0; TEST_EQ(vb2_load_kernel_keyblock(&ctx), VB2_ERROR_KERNEL_KEYBLOCK_REC_FLAG, "Kernel keyblock rec only"); reset_common_data(FOR_KEYBLOCK); - kb->keyblock_flags &= ~VB2_KEY_BLOCK_FLAG_RECOVERY_1; + kb->keyblock_flags &= ~VB2_KEYBLOCK_FLAG_RECOVERY_1; ctx.flags |= VB2_CONTEXT_RECOVERY_MODE; TEST_EQ(vb2_load_kernel_keyblock(&ctx), VB2_ERROR_KERNEL_KEYBLOCK_REC_FLAG, "Kernel keyblock not rec"); reset_common_data(FOR_KEYBLOCK); - kb->keyblock_flags &= ~VB2_KEY_BLOCK_FLAG_DEVELOPER_0; - kb->keyblock_flags &= ~VB2_KEY_BLOCK_FLAG_RECOVERY_0; + kb->keyblock_flags &= ~VB2_KEYBLOCK_FLAG_DEVELOPER_0; + kb->keyblock_flags &= ~VB2_KEYBLOCK_FLAG_RECOVERY_0; ctx.flags |= VB2_CONTEXT_RECOVERY_MODE; TEST_EQ(vb2_load_kernel_keyblock(&ctx), VB2_ERROR_KERNEL_KEYBLOCK_DEV_FLAG, "Kernel keyblock rec but not dev+rec"); reset_common_data(FOR_KEYBLOCK); - kb->keyblock_flags &= ~VB2_KEY_BLOCK_FLAG_DEVELOPER_0; - kb->keyblock_flags &= ~VB2_KEY_BLOCK_FLAG_RECOVERY_0; + kb->keyblock_flags &= ~VB2_KEYBLOCK_FLAG_DEVELOPER_0; + kb->keyblock_flags &= ~VB2_KEYBLOCK_FLAG_RECOVERY_0; ctx.flags |= VB2_CONTEXT_DEVELOPER_MODE | VB2_CONTEXT_RECOVERY_MODE; TEST_SUCC(vb2_load_kernel_keyblock(&ctx), "Kernel keyblock flags dev+rec"); |