diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/vb20_common3_tests.c | 14 | ||||
| -rw-r--r-- | tests/vboot_common2_tests.c | 7 |
2 files changed, 10 insertions, 11 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), diff --git a/tests/vboot_common2_tests.c b/tests/vboot_common2_tests.c index 2c0a8949..a867f723 100644 --- a/tests/vboot_common2_tests.c +++ b/tests/vboot_common2_tests.c @@ -133,11 +133,12 @@ static void VerifyKernelPreambleTest(const VbPublicKey *public_key, unsigned hsize; /* Create a dummy signature */ - VbSignature *body_sig = SignatureAlloc(56, 78); + struct vb2_signature *body_sig = vb2_alloc_signature(56, 78); rsa = PublicKeyToRSA(public_key); - hdr = CreateKernelPreamble(0x1234, 0x100000, 0x300000, 0x4000, body_sig, - 0, 0, 0, 0, private_key); + hdr = (VbKernelPreambleHeader *) + vb2_create_kernel_preamble(0x1234, 0x100000, 0x300000, 0x4000, + body_sig, 0, 0, 0, 0, private_key); TEST_NEQ(hdr && rsa, 0, "VerifyKernelPreamble() prerequisites"); if (!hdr) return; |