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 /firmware/lib20/kernel.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 'firmware/lib20/kernel.c')
| -rw-r--r-- | firmware/lib20/kernel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/lib20/kernel.c b/firmware/lib20/kernel.c index 809e1b66..f5632e58 100644 --- a/firmware/lib20/kernel.c +++ b/firmware/lib20/kernel.c @@ -122,7 +122,7 @@ int vb2_load_kernel_keyblock(struct vb2_context *ctx) /* Unpack the kernel key */ key_data = ctx->workbuf + sd->workbuf_kernel_key_offset; key_size = sd->workbuf_kernel_key_size; - rv = vb2_unpack_key(&kernel_key, key_data, key_size); + rv = vb2_unpack_key_buffer(&kernel_key, key_data, key_size); if (rv) return rv; @@ -374,7 +374,7 @@ int vb2_load_kernel_preamble(struct vb2_context *ctx) if (!sd->workbuf_data_key_size) return VB2_ERROR_KERNEL_PREAMBLE2_DATA_KEY; - rv = vb2_unpack_key(&data_key, key_data, key_size); + rv = vb2_unpack_key_buffer(&data_key, key_data, key_size); if (rv) return rv; |