diff options
| author | Joel Kitching <kitching@google.com> | 2020-02-12 19:00:48 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-02-14 11:51:41 +0000 |
| commit | 92af7d9f9e04b7acc6e0bea42a7482f65951ef27 (patch) | |
| tree | 06e625cb66d7ed0e4fe20deafadb0280f272d7d4 /firmware/lib/vboot_display.c | |
| parent | ac77cdb75bc00b9daf9109480333fde7e12b5a82 (diff) | |
| download | vboot-92af7d9f9e04b7acc6e0bea42a7482f65951ef27.tar.gz | |
vboot/vboot_display: fetch subkey from vboot2 struct
Since CL:1651221, the kernel subkey is stored in vb2_shared_data
and vboot2 workbuf. Update vboot_display.c to read from this
location accordingly.
BUG=b:124141368, chromium:1038260
TEST=make clean && make runtests
BRANCH=none
Change-Id: Id287ff595bc394d23837e946c0f711b79d2f19ab
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2051892
Reviewed-by: Julius Werner <jwerner@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'firmware/lib/vboot_display.c')
| -rw-r--r-- | firmware/lib/vboot_display.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c index f0e2e806..0211a92b 100644 --- a/firmware/lib/vboot_display.c +++ b/firmware/lib/vboot_display.c @@ -334,8 +334,11 @@ vb2_error_t VbDisplayDebugInfo(struct vb2_context *ctx) } /* If we're in dev-mode, show the kernel subkey that we expect, too. */ - if (0 == sd->recovery_reason && sd->vbsd) { - FillInSha1Sum(sha1sum, &sd->vbsd->kernel_subkey); + if (sd->recovery_reason == VB2_RECOVERY_NOT_REQUESTED && + sd->kernel_key_offset) { + struct vb2_packed_key *key = + vb2_member_of(sd, sd->kernel_key_offset); + FillInSha1Sum(sha1sum, key); used += StrnAppend(buf + used, "\nkernel_subkey: ", DEBUG_INFO_SIZE - used); used += StrnAppend(buf + used, sha1sum, DEBUG_INFO_SIZE - used); |