diff options
| author | Randall Spangler <rspangler@chromium.org> | 2016-10-18 15:09:21 -0700 |
|---|---|---|
| committer | Randall Spangler <rspangler@chromium.org> | 2016-11-06 02:34:03 +0000 |
| commit | 6e3931d1f609fc23b3ca8c7f6e563926e4f38b69 (patch) | |
| tree | a026366a822ad7300b2b76a14c8e5df77305e564 /tests/vb20_common3_tests.c | |
| parent | 559a110f33b7ebe8d950f1c2de6b3b89791f862b (diff) | |
| download | vboot-6e3931d1f609fc23b3ca8c7f6e563926e4f38b69.tar.gz | |
vboot: Add vb2_unpack_key_buffer
Previously, vb2_unpack_key() actually unpacked a key buffer. Callers
that had a vb2_packed_key had to typecast it back to a uint8_t buffer to
unpack it. Rename vb2_unpack_key() to vb2_unpack_key_buffer(), and make
vb2_unpack_key() unpack a vb2_packed_key.
BUG=chromium:611535
BRANCH=none
TEST=make runtests; emerge-kevin coreboot depthcharge;
emerge-samus and boot it
Change-Id: I9ee38a819c59cc58a72ead78cf5ddf3d0f301ae7
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/400906
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'tests/vb20_common3_tests.c')
| -rw-r--r-- | tests/vb20_common3_tests.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/vb20_common3_tests.c b/tests/vb20_common3_tests.c index e5538673..b5ad1ebe 100644 --- a/tests/vb20_common3_tests.c +++ b/tests/vb20_common3_tests.c @@ -216,8 +216,7 @@ static void test_verify_fw_preamble(struct vb2_packed_key *public_key, /* Create a dummy signature */ struct vb2_signature *body_sig = vb2_alloc_signature(56, 78); - TEST_SUCC(vb2_unpack_key(&rsa, (uint8_t *)public_key, - public_key->key_offset + public_key->key_size), + TEST_SUCC(vb2_unpack_key(&rsa, public_key), "vb2_verify_fw_preamble() prereq key"); hdr = vb2_create_fw_preamble(0x1234, kernel_subkey, body_sig, @@ -359,8 +358,7 @@ static void test_verify_kernel_preamble( /* Create a dummy signature */ struct vb2_signature *body_sig = vb2_alloc_signature(56, 0x214000); - TEST_SUCC(vb2_unpack_key(&rsa, (uint8_t *)public_key, - public_key->key_offset + public_key->key_size), + TEST_SUCC(vb2_unpack_key(&rsa, public_key), "vb2_verify_kernel_preamble() prereq key"); struct vb2_kernel_preamble *hdr = @@ -563,7 +561,7 @@ int test_permutation(int signing_key_algorithm, int data_key_algorithm, /* Unpack public key */ struct vb2_public_key signing_public_key2; if (VB2_SUCCESS != - vb2_unpack_key(&signing_public_key2, + vb2_unpack_key_buffer(&signing_public_key2, (uint8_t *)signing_public_key, signing_public_key->key_offset + signing_public_key->key_size)) { |