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 | |
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')
-rw-r--r-- | futility/cmd_show.c | 12 | ||||
-rw-r--r-- | futility/cmd_vbutil_firmware.c | 18 | ||||
-rw-r--r-- | futility/cmd_vbutil_kernel.c | 10 | ||||
-rw-r--r-- | futility/cmd_vbutil_keyblock.c | 18 | ||||
-rw-r--r-- | futility/dump_kernel_config_lib.c | 2 | ||||
-rw-r--r-- | futility/updater.c | 10 | ||||
-rw-r--r-- | futility/vb1_helper.c | 18 |
7 files changed, 44 insertions, 44 deletions
diff --git a/futility/cmd_show.c b/futility/cmd_show.c index a0e2bb62..cf747f89 100644 --- a/futility/cmd_show.c +++ b/futility/cmd_show.c @@ -57,20 +57,20 @@ static void show_keyblock(struct vb2_keyblock *keyblock, const char *name, int sign_key, int good_sig) { if (name) - printf("Key block: %s\n", name); + printf("Keyblock: %s\n", name); else - printf("Key block:\n"); + printf("Keyblock:\n"); printf(" Signature: %s\n", sign_key ? (good_sig ? "valid" : "invalid") : "ignored"); printf(" Size: %#x\n", keyblock->keyblock_size); printf(" Flags: %d ", keyblock->keyblock_flags); - if (keyblock->keyblock_flags & VB2_KEY_BLOCK_FLAG_DEVELOPER_0) + if (keyblock->keyblock_flags & VB2_KEYBLOCK_FLAG_DEVELOPER_0) printf(" !DEV"); - if (keyblock->keyblock_flags & VB2_KEY_BLOCK_FLAG_DEVELOPER_1) + if (keyblock->keyblock_flags & VB2_KEYBLOCK_FLAG_DEVELOPER_1) printf(" DEV"); - if (keyblock->keyblock_flags & VB2_KEY_BLOCK_FLAG_RECOVERY_0) + if (keyblock->keyblock_flags & VB2_KEYBLOCK_FLAG_RECOVERY_0) printf(" !REC"); - if (keyblock->keyblock_flags & VB2_KEY_BLOCK_FLAG_RECOVERY_1) + if (keyblock->keyblock_flags & VB2_KEYBLOCK_FLAG_RECOVERY_1) printf(" REC"); printf("\n"); diff --git a/futility/cmd_vbutil_firmware.c b/futility/cmd_vbutil_firmware.c index b8e9bc63..1c954aef 100644 --- a/futility/cmd_vbutil_firmware.c +++ b/futility/cmd_vbutil_firmware.c @@ -60,7 +60,7 @@ static void print_help(int argc, char *argv[]) "\n" "For '--vblock <file>', required OPTIONS are:\n" "\n" - " --keyblock <file> Key block in .keyblock format\n" + " --keyblock <file> Keyblock in .keyblock format\n" " --signprivate <file>" " Signing private key in .vbprivk format\n" " --version <number> Firmware version\n" @@ -109,10 +109,10 @@ static int do_vblock(const char *outfile, const char *keyblock_file, goto vblock_cleanup; } - /* Read the key block and keys */ + /* Read the keyblock and keys */ keyblock = vb2_read_keyblock(keyblock_file); if (!keyblock) { - FATAL("Error reading key block.\n"); + FATAL("Error reading keyblock.\n"); goto vblock_cleanup; } @@ -230,17 +230,17 @@ static int do_verify(const char *infile, const char *signpubkey, goto verify_cleanup; } - /* Verify key block */ + /* Verify keyblock */ struct vb2_keyblock *keyblock = (struct vb2_keyblock *)blob; if (VB2_SUCCESS != vb2_verify_keyblock(keyblock, blob_size, &sign_key, &wb)) { - FATAL("Error verifying key block.\n"); + FATAL("Error verifying keyblock.\n"); goto verify_cleanup; } now += keyblock->keyblock_size; - printf("Key block:\n"); + printf("Keyblock:\n"); printf(" Size: %d\n", keyblock->keyblock_size); printf(" Flags: %d (ignored)\n", keyblock->keyblock_flags); @@ -327,7 +327,7 @@ static int do_vbutil_firmware(int argc, char *argv[]) { char *filename = NULL; - char *key_block_file = NULL; + char *keyblock_file = NULL; char *signpubkey = NULL; char *signprivate = NULL; uint32_t version = 0; @@ -357,7 +357,7 @@ static int do_vbutil_firmware(int argc, char *argv[]) break; case OPT_KEYBLOCK: - key_block_file = optarg; + keyblock_file = optarg; break; case OPT_SIGNPUBKEY: @@ -401,7 +401,7 @@ static int do_vbutil_firmware(int argc, char *argv[]) switch (mode) { case OPT_MODE_VBLOCK: - return do_vblock(filename, key_block_file, signprivate, version, + return do_vblock(filename, keyblock_file, signprivate, version, fv_file, kernelkey_file, preamble_flags); case OPT_MODE_VERIFY: return do_verify(filename, signpubkey, fv_file, kernelkey_file); diff --git a/futility/cmd_vbutil_kernel.c b/futility/cmd_vbutil_kernel.c index cdcce0b1..125debb4 100644 --- a/futility/cmd_vbutil_kernel.c +++ b/futility/cmd_vbutil_kernel.c @@ -91,7 +91,7 @@ static const char usage[] = "Usage: " MYNAME " %s --pack <file> [PARAMETERS]\n" "\n" " Required parameters:\n" - " --keyblock <file> Key block in .keyblock format\n" + " --keyblock <file> Keyblock in .keyblock format\n" " --signprivate <file> Private key to sign kernel data,\n" " in .vbprivk format\n" " --version <number> Kernel version\n" @@ -115,7 +115,7 @@ static const char usage[] = " (including verfication blob)\n" "\n" " Optional:\n" - " --keyblock <file> Key block in .keyblock format\n" + " --keyblock <file> Keyblock in .keyblock format\n" " --config <file> New command line file\n" " --version <number> Kernel version\n" " --kloadaddr <address> Assign kernel body load address\n" @@ -129,7 +129,7 @@ static const char usage[] = " Public key to verify kernel keyblock,\n" " in .vbpubk format\n" " --verbose Print a more detailed report\n" - " --keyblock <file> Outputs the verified key block,\n" + " --keyblock <file> Outputs the verified keyblock,\n" " in .keyblock format\n" " --pad <number> Verification padding size in bytes\n" " --minversion <number> Minimum combined kernel key version\n" @@ -392,7 +392,7 @@ static int do_vbutil_kernel(int argc, char *argv[]) t_keyblock = (struct vb2_keyblock *)ReadFile(keyblock_file, 0); if (!t_keyblock) - FATAL("Error reading key block.\n"); + FATAL("Error reading keyblock.\n"); if (!signprivkey_file) FATAL("Missing required signprivate file.\n"); @@ -523,7 +523,7 @@ static int do_vbutil_kernel(int argc, char *argv[]) t_keyblock = (struct vb2_keyblock *) ReadFile(keyblock_file, 0); if (!t_keyblock) - FATAL("Error reading key block.\n"); + FATAL("Error reading keyblock.\n"); } /* Reuse previous body size */ 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"); diff --git a/futility/dump_kernel_config_lib.c b/futility/dump_kernel_config_lib.c index 83800565..2315a0ab 100644 --- a/futility/dump_kernel_config_lib.c +++ b/futility/dump_kernel_config_lib.c @@ -66,7 +66,7 @@ static char *FindKernelConfigFromStream(void *ctx, ReadFullyFn read_fn, uint32_t now = 0; uint32_t offset = 0; - /* Skip the key block */ + /* Skip the keyblock */ if (read_fn(ctx, &keyblock, sizeof(keyblock)) != sizeof(keyblock)) { FATAL("not enough data to fill keyblock header\n"); return NULL; diff --git a/futility/updater.c b/futility/updater.c index d7ac2ab1..18fc339f 100644 --- a/futility/updater.c +++ b/futility/updater.c @@ -1220,7 +1220,7 @@ static const struct vb2_packed_key *get_rootkey( } /* - * Returns a key block key from given image section, or NULL on failure. + * Returns a keyblock key from given image section, or NULL on failure. */ static const struct vb2_keyblock *get_keyblock( const struct firmware_image *image, @@ -1239,8 +1239,8 @@ static const struct vb2_keyblock *get_keyblock( } /* - * Duplicates a key block and returns the duplicated block. - * The caller must free the returned key block after being used. + * Duplicates a keyblock and returns the duplicated block. + * The caller must free the returned keyblock after being used. */ static struct vb2_keyblock *dupe_keyblock(const struct vb2_keyblock *block) { @@ -1283,7 +1283,7 @@ static int verify_keyblock(const struct vb2_keyblock *block, free(new_block); if (r != VB2_SUCCESS) { - ERROR("Failed verifying key block.\n"); + ERROR("Failed verifying keyblock.\n"); return -1; } return 0; @@ -1292,7 +1292,7 @@ static int verify_keyblock(const struct vb2_keyblock *block, /* * Gets the data key and firmware version from a section on firmware image. * The section should contain a vb2_keyblock and a vb2_fw_preamble immediately - * after key block so we can decode and save the data key and firmware version + * after keyblock so we can decode and save the data key and firmware version * into argument `data_key_version` and `firmware_version`. * Returns 0 for success, otherwise failure. */ diff --git a/futility/vb1_helper.c b/futility/vb1_helper.c index 66f0b5dc..a106b5b8 100644 --- a/futility/vb1_helper.c +++ b/futility/vb1_helper.c @@ -521,30 +521,30 @@ int VerifyKernelBlob(uint8_t *kernel_blob, if (VB2_SUCCESS != vb2_verify_keyblock(g_keyblock, g_keyblock->keyblock_size, &pubkey, &wb)) { - fprintf(stderr, "Error verifying key block.\n"); + fprintf(stderr, "Error verifying keyblock.\n"); goto done; } } else if (VB2_SUCCESS != vb2_verify_keyblock_hash(g_keyblock, g_keyblock->keyblock_size, &wb)) { - fprintf(stderr, "Error verifying key block.\n"); + fprintf(stderr, "Error verifying keyblock.\n"); goto done; } - printf("Key block:\n"); + printf("Keyblock:\n"); struct vb2_packed_key *data_key = &g_keyblock->data_key; printf(" Signature: %s\n", signpub_key ? "valid" : "ignored"); printf(" Size: %#x\n", g_keyblock->keyblock_size); printf(" Flags: %u ", g_keyblock->keyblock_flags); - if (g_keyblock->keyblock_flags & KEY_BLOCK_FLAG_DEVELOPER_0) + if (g_keyblock->keyblock_flags & KEYBLOCK_FLAG_DEVELOPER_0) printf(" !DEV"); - if (g_keyblock->keyblock_flags & KEY_BLOCK_FLAG_DEVELOPER_1) + if (g_keyblock->keyblock_flags & KEYBLOCK_FLAG_DEVELOPER_1) printf(" DEV"); - if (g_keyblock->keyblock_flags & KEY_BLOCK_FLAG_RECOVERY_0) + if (g_keyblock->keyblock_flags & KEYBLOCK_FLAG_RECOVERY_0) printf(" !REC"); - if (g_keyblock->keyblock_flags & KEY_BLOCK_FLAG_RECOVERY_1) + if (g_keyblock->keyblock_flags & KEYBLOCK_FLAG_RECOVERY_1) printf(" REC"); printf("\n"); printf(" Data key algorithm: %u %s\n", data_key->algorithm, @@ -557,12 +557,12 @@ int VerifyKernelBlob(uint8_t *kernel_blob, FILE *f = NULL; f = fopen(keyblock_outfile, "wb"); if (!f) { - fprintf(stderr, "Can't open key block file %s: %s\n", + fprintf(stderr, "Can't open keyblock file %s: %s\n", keyblock_outfile, strerror(errno)); goto done; } if (1 != fwrite(g_keyblock, g_keyblock->keyblock_size, 1, f)) { - fprintf(stderr, "Can't write key block file %s: %s\n", + fprintf(stderr, "Can't write keyblock file %s: %s\n", keyblock_outfile, strerror(errno)); fclose(f); goto done; |