diff options
| author | Joel Kitching <kitching@google.com> | 2019-08-30 16:25:31 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-10-23 16:28:22 +0000 |
| commit | c07bcc833f49d31c95c45afd3872988deab24bfc (patch) | |
| tree | 84d82f8797b367a8bd3103a885d8f1bc4f74e462 | |
| parent | 1ed2dfff778285f36321d90f01d919b948182758 (diff) | |
| download | vboot-c07bcc833f49d31c95c45afd3872988deab24bfc.tar.gz | |
vboot: remove some unused pre-historic functions
BUG=b:124141368
TEST=make clean && make runtests
BRANCH=none
Change-Id: I5643176ff6979408a81df5fce6de6a002f025a60
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1776293
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
| -rw-r--r-- | firmware/lib/include/vboot_common.h | 21 | ||||
| -rw-r--r-- | firmware/lib/vboot_common.c | 27 |
2 files changed, 0 insertions, 48 deletions
diff --git a/firmware/lib/include/vboot_common.h b/firmware/lib/include/vboot_common.h index a0d07d89..6a63cac6 100644 --- a/firmware/lib/include/vboot_common.h +++ b/firmware/lib/include/vboot_common.h @@ -47,27 +47,6 @@ int PublicKeyCopy(struct vb2_packed_key *dest, const struct vb2_packed_key *src); /** - * Retrieve the 16-bit vmlinuz header address and size from the kernel preamble - * if there is one. These are only available in Kernel Preamble Header version - * >= 2.1. If given a header 2.0 or lower, will set address and size to 0 (this - * is not considered an error). - * - * Returns VB2_SUCCESS if successful. - */ -vb2_error_t VbGetKernelVmlinuzHeader(const VbKernelPreambleHeader *preamble, - uint64_t *vmlinuz_header_address, - uint64_t *vmlinuz_header_size); - -/** - * Checks if the kernel preamble has flags field. This is available only if the - * Kernel Preamble Header version >=2.2. If give a header of 2.1 or lower, it - * will return VBOOT_KERNEL_PREAMBLE_NO_FLAGS. - * - * Returns VB2_SUCCESS if version is >=2.2. - */ -vb2_error_t VbKernelHasFlags(const VbKernelPreambleHeader *preamble); - -/** * Verify that the Vmlinuz Header is contained inside of the kernel blob. * * Returns VB2_SUCCESS or VBOOT_PREAMBLE_INVALID on error diff --git a/firmware/lib/vboot_common.c b/firmware/lib/vboot_common.c index d6e0c41d..88385c74 100644 --- a/firmware/lib/vboot_common.c +++ b/firmware/lib/vboot_common.c @@ -79,33 +79,6 @@ int PublicKeyCopy(struct vb2_packed_key *dest, const struct vb2_packed_key *src) return 0; } -vb2_error_t VbGetKernelVmlinuzHeader(const VbKernelPreambleHeader *preamble, - uint64_t *vmlinuz_header_address, - uint64_t *vmlinuz_header_size) -{ - *vmlinuz_header_address = 0; - *vmlinuz_header_size = 0; - if (preamble->header_version_minor > 0) { - /* - * Set header and size only if the preamble header version is > - * 2.1 as they don't exist in version 2.0 (Note that we don't - * need to check header_version_major; if that's not 2 then - * VerifyKernelPreamble() would have already failed. - */ - *vmlinuz_header_address = preamble->vmlinuz_header_address; - *vmlinuz_header_size = preamble->vmlinuz_header_size; - } - return VB2_SUCCESS; -} - -vb2_error_t VbKernelHasFlags(const VbKernelPreambleHeader *preamble) -{ - if (preamble->header_version_minor > 1) - return VB2_SUCCESS; - - return VBOOT_KERNEL_PREAMBLE_NO_FLAGS; -} - vb2_error_t VerifyVmlinuzInsideKBlob(uint64_t kblob, uint64_t kblob_size, uint64_t header, uint64_t header_size) { |