diff options
| author | Randall Spangler <rspangler@chromium.org> | 2016-06-21 15:23:32 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-08-10 15:30:33 -0700 |
| commit | 939cc3a5c25a3333fadafc7fc341d7e320f72fab (patch) | |
| tree | bd7197c8950f44440459fc50531037d50719d3b7 /futility/cmd_vbutil_firmware.c | |
| parent | 814aaf09ceecddb16a01e1cbe0df4299b83b5699 (diff) | |
| download | vboot-939cc3a5c25a3333fadafc7fc341d7e320f72fab.tar.gz | |
futility: Use only vboot 2.0 APIs for keyblocks
This refactors futility and the host library to use only vboot 2.0 APIs
to create and verify keyblocks.
BUG=chromium:611535
BRANCH=none
TEST=make runtests
Change-Id: Ia3cc1e24971b94f01bcb4890c8666a3af6f84841
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/356129
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'futility/cmd_vbutil_firmware.c')
| -rw-r--r-- | futility/cmd_vbutil_firmware.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/futility/cmd_vbutil_firmware.c b/futility/cmd_vbutil_firmware.c index b187d270..253add55 100644 --- a/futility/cmd_vbutil_firmware.c +++ b/futility/cmd_vbutil_firmware.c @@ -92,8 +92,6 @@ static int Vblock(const char *outfile, const char *keyblock_file, VbPrivateKey *signing_key; VbPublicKey *kernel_subkey; - VbKeyBlockHeader *key_block; - uint64_t key_block_size; uint8_t *fv_data; uint64_t fv_size; FILE *f; @@ -113,9 +111,8 @@ static int Vblock(const char *outfile, const char *keyblock_file, } /* Read the key block and keys */ - key_block = - (VbKeyBlockHeader *) ReadFile(keyblock_file, &key_block_size); - if (!key_block) { + struct vb2_keyblock *keyblock = vb2_read_keyblock(keyblock_file); + if (!keyblock) { VbExError("Error reading key block.\n"); return 1; } @@ -170,7 +167,7 @@ static int Vblock(const char *outfile, const char *keyblock_file, VbExError("Can't open output file %s\n", outfile); return 1; } - i = ((1 != fwrite(key_block, key_block_size, 1, f)) || + i = ((1 != fwrite(keyblock, keyblock->keyblock_size, 1, f)) || (1 != fwrite(preamble, preamble->preamble_size, 1, f))); fclose(f); if (i) { |