diff options
| author | Randall Spangler <rspangler@chromium.org> | 2016-06-30 11:24:24 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-09-06 22:02:18 -0700 |
| commit | a62ffa8d61de19d8992c32a886e44c0aecb7e01b (patch) | |
| tree | a7141c1bf7db0dde09921c499b1b0a5e09545d8c /tests/vb20_common3_tests.c | |
| parent | 0efc4f3ee111d28cf22060a22ad591427dc7eb7f (diff) | |
| download | vboot-a62ffa8d61de19d8992c32a886e44c0aecb7e01b.tar.gz | |
vboot: replace CreateKernelPreamble() with vboot2 equivalent
Continued refactoring of host library to kernel style / vboot2 structs.
BUG=chromium:611535
BRANCH=none
TEST=make runtests
Change-Id: Ifed376812ed7690eea1ec0dfab958e836f7724a0
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/363951
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'tests/vb20_common3_tests.c')
| -rw-r--r-- | tests/vb20_common3_tests.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/tests/vb20_common3_tests.c b/tests/vb20_common3_tests.c index a89cead1..62a36e45 100644 --- a/tests/vb20_common3_tests.c +++ b/tests/vb20_common3_tests.c @@ -343,8 +343,6 @@ static void test_verify_kernel_preamble( const struct vb2_packed_key *public_key, const struct vb2_private_key *private_key) { - struct vb2_kernel_preamble *hdr; - struct vb2_kernel_preamble *h; struct vb2_public_key rsa; // TODO: how many workbuf bytes? uint8_t workbuf[VB2_VERIFY_FIRMWARE_PREAMBLE_WORKBUF_BYTES] @@ -361,17 +359,17 @@ static void test_verify_kernel_preamble( public_key->key_offset + public_key->key_size), "vb2_verify_kernel_preamble() prereq key"); - hdr = (struct vb2_kernel_preamble *) - CreateKernelPreamble(0x1234, 0x100000, 0x300000, 0x4000, - (VbSignature *)body_sig, - 0x304000, 0x10000, 0, 0, - private_key); + struct vb2_kernel_preamble *hdr = + vb2_create_kernel_preamble(0x1234, 0x100000, 0x300000, 0x4000, + body_sig, 0x304000, 0x10000, 0, 0, + private_key); TEST_PTR_NEQ(hdr, NULL, "vb2_verify_kernel_preamble() prereq test preamble"); if (!hdr) return; hsize = (uint32_t) hdr->preamble_size; - h = (struct vb2_kernel_preamble *)malloc(hsize + 16384); + struct vb2_kernel_preamble *h = + (struct vb2_kernel_preamble *)malloc(hsize + 16384); Memcpy(h, hdr, hsize); TEST_SUCC(vb2_verify_kernel_preamble(h, hsize, &rsa, &wb), |