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 /futility/cmd_vbutil_keyblock.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 'futility/cmd_vbutil_keyblock.c')
| -rw-r--r-- | futility/cmd_vbutil_keyblock.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/futility/cmd_vbutil_keyblock.c b/futility/cmd_vbutil_keyblock.c index d526d553..b81da878 100644 --- a/futility/cmd_vbutil_keyblock.c +++ b/futility/cmd_vbutil_keyblock.c @@ -2,7 +2,7 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * - * Verified boot key block utility + * Verified boot keyblock utility */ #include <getopt.h> @@ -152,7 +152,7 @@ static int Pack(const char *outfile, const char *datapubkey, free(signing_key); if (VB2_SUCCESS != vb2_write_keyblock(outfile, block)) { - fprintf(stderr, "vbutil_keyblock: Error writing key block.\n"); + fprintf(stderr, "vbutil_keyblock: Error writing keyblock.\n"); return 1; } free(block); @@ -171,7 +171,7 @@ static int Unpack(const char *infile, const char *datapubkey, struct vb2_keyblock *block = vb2_read_keyblock(infile); if (!block) { - fprintf(stderr, "vbutil_keyblock: Error reading key block.\n"); + fprintf(stderr, "vbutil_keyblock: Error reading keyblock.\n"); return 1; } @@ -206,22 +206,22 @@ static int Unpack(const char *infile, const char *datapubkey, vb2_verify_keyblock(block, block->keyblock_size, &key, &wb)) { fprintf(stderr, "vbutil_keyblock:" - " Error verifying key block.\n"); + " Error verifying keyblock.\n"); return 1; } free(sign_key); } - printf("Key block file: %s\n", infile); + printf("Keyblock file: %s\n", infile); printf("Signature %s\n", sign_key ? "valid" : "ignored"); printf("Flags: %u ", block->keyblock_flags); - if (block->keyblock_flags & KEY_BLOCK_FLAG_DEVELOPER_0) + if (block->keyblock_flags & KEYBLOCK_FLAG_DEVELOPER_0) printf(" !DEV"); - if (block->keyblock_flags & KEY_BLOCK_FLAG_DEVELOPER_1) + if (block->keyblock_flags & KEYBLOCK_FLAG_DEVELOPER_1) printf(" DEV"); - if (block->keyblock_flags & KEY_BLOCK_FLAG_RECOVERY_0) + if (block->keyblock_flags & KEYBLOCK_FLAG_RECOVERY_0) printf(" !REC"); - if (block->keyblock_flags & KEY_BLOCK_FLAG_RECOVERY_1) + if (block->keyblock_flags & KEYBLOCK_FLAG_RECOVERY_1) printf(" REC"); printf("\n"); |