diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2016-07-06 09:01:05 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2016-07-08 00:34:59 +0000 |
| commit | c9eb061401fc5c8f3ed43fa3d0594cbeddc7cc95 (patch) | |
| tree | 12af2c49ea4c86cbe137dcd7ad72d69a5fc73218 | |
| parent | 3f4aeca05a357fe4e3df75bec35b276db836377d (diff) | |
| download | vboot-c9eb061401fc5c8f3ed43fa3d0594cbeddc7cc95.tar.gz | |
vb2api: pad digest buffers if they are larger than digest sizes
Extending tpm PCRs in case of TPM2 requires 32 bit values, some
digests pre-calculated in vboot source code are 20 bytes in size. To
make sure that PCR extension is consistent, pad remaining buffer space
when a 20 byte digest is returned in a 32 byte buffer.
BRANCH=none
BUG=chrome-os-partner:50645
TEST=did not verify much, made sure that PCR extension commands
triggered by coreboot succeed.
Change-Id: Ib16bdf782f18a6106eadb4b880cd1e67b56ad6db
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/358175
Reviewed-by: Randall Spangler <rspangler@chromium.org>
(cherry picked from commit cd341a0cd7d698b816b55a0f6e2e9ae9aeeea3bb)
Reviewed-on: https://chromium-review.googlesource.com/358933
Reviewed-by: Bernie Thompson <bhthompson@chromium.org>
Commit-Queue: Bernie Thompson <bhthompson@chromium.org>
Tested-by: Bernie Thompson <bhthompson@chromium.org>
| -rw-r--r-- | firmware/2lib/2api.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/firmware/2lib/2api.c b/firmware/2lib/2api.c index 059cb6c2..c12a8051 100644 --- a/firmware/2lib/2api.c +++ b/firmware/2lib/2api.c @@ -199,6 +199,9 @@ int vb2api_get_pcr_digest(struct vb2_context *ctx, return VB2_ERROR_API_PCR_DIGEST_BUF; memcpy(dest, digest, digest_size); + if (digest_size < *dest_size) + memset(dest + digest_size, 0, *dest_size - digest_size); + *dest_size = digest_size; return VB2_SUCCESS; |