diff options
| author | Joel Kitching <kitching@google.com> | 2021-01-20 17:16:17 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-01-28 03:52:07 +0000 |
| commit | d21cae0b23e206eef336136b23752b2653e58229 (patch) | |
| tree | 4bf6e566977cfd9f8f9e6783e935e042ba67e433 | |
| parent | 0b10eacf1fed2256d288dea9275a80e67d127eb6 (diff) | |
| download | vboot-d21cae0b23e206eef336136b23752b2653e58229.tar.gz | |
vboot: convert secdata_kernel_crc to static function
Function is only used in 2secdata_kernel.c. Convert to
a static function, and remove its header.
BUG=b:124141368, chromium:968464
TEST=make clean && make runtests
BRANCH=none
Signed-off-by: Joel Kitching <kitching@google.com>
Change-Id: Ib45abe68f0d4d025160c800c91dd2d2525dd1e3e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2641343
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
| -rw-r--r-- | firmware/2lib/2secdata_kernel.c | 20 | ||||
| -rw-r--r-- | firmware/lib/include/vboot_test.h | 11 |
2 files changed, 13 insertions, 18 deletions
diff --git a/firmware/2lib/2secdata_kernel.c b/firmware/2lib/2secdata_kernel.c index de12ca04..0d4208fa 100644 --- a/firmware/2lib/2secdata_kernel.c +++ b/firmware/2lib/2secdata_kernel.c @@ -22,7 +22,13 @@ static inline int is_v0(struct vb2_context *ctx) return MAJOR_VER(sec->struct_version) == 0; } -uint8_t vb2_secdata_kernel_crc(struct vb2_context *ctx) +/** + * Calculate crc8 of kernel secure storage. + * + * @param ctx Context pointer + * @return Calculated crc8 value. + */ +static uint8_t secdata_kernel_crc(struct vb2_context *ctx) { size_t offset, size; @@ -54,7 +60,7 @@ static vb2_error_t secdata_kernel_check_v0(struct vb2_context *ctx, *size = VB2_SECDATA_KERNEL_SIZE_V02; /* Verify CRC */ - if (sec->crc8 != vb2_secdata_kernel_crc(ctx)) { + if (sec->crc8 != secdata_kernel_crc(ctx)) { VB2_DEBUG("secdata_kernel: bad CRC\n"); return VB2_ERROR_SECDATA_KERNEL_CRC; } @@ -101,7 +107,7 @@ static vb2_error_t secdata_kernel_check_v1(struct vb2_context *ctx, *size = sec->struct_size; /* Verify CRC */ - if (sec->crc8 != vb2_secdata_kernel_crc(ctx)) { + if (sec->crc8 != secdata_kernel_crc(ctx)) { VB2_DEBUG("secdata_kernel: bad CRC\n"); return VB2_ERROR_SECDATA_KERNEL_CRC; } @@ -131,7 +137,7 @@ uint32_t vb2api_secdata_kernel_create(struct vb2_context *ctx) memset(sec, 0, sizeof(*sec)); sec->struct_version = VB2_SECDATA_KERNEL_VERSION_LATEST; sec->struct_size = sizeof(*sec); - sec->crc8 = vb2_secdata_kernel_crc(ctx); + sec->crc8 = secdata_kernel_crc(ctx); /* Mark as changed */ ctx->flags |= VB2_CONTEXT_SECDATA_KERNEL_CHANGED; @@ -256,9 +262,9 @@ void vb2_secdata_kernel_set(struct vb2_context *ctx, } if (is_v0(ctx)) - v0->crc8 = vb2_secdata_kernel_crc(ctx); + v0->crc8 = secdata_kernel_crc(ctx); else - v1->crc8 = vb2_secdata_kernel_crc(ctx); + v1->crc8 = secdata_kernel_crc(ctx); ctx->flags |= VB2_CONTEXT_SECDATA_KERNEL_CHANGED; return; @@ -300,7 +306,7 @@ void vb2_secdata_kernel_set_ec_hash(struct vb2_context *ctx, } memcpy(sec->ec_hash, sha256, sizeof(sec->ec_hash)); - sec->crc8 = vb2_secdata_kernel_crc(ctx); + sec->crc8 = secdata_kernel_crc(ctx); ctx->flags |= VB2_CONTEXT_SECDATA_KERNEL_CHANGED; diff --git a/firmware/lib/include/vboot_test.h b/firmware/lib/include/vboot_test.h index 9c849099..f66cfece 100644 --- a/firmware/lib/include/vboot_test.h +++ b/firmware/lib/include/vboot_test.h @@ -29,15 +29,4 @@ vb2_error_t vb2_check_padding(const uint8_t *sig, struct LoadKernelParams; struct LoadKernelParams *VbApiKernelGetParams(void); -/**************************************************************************** - * 2secdata_kernel.c */ - -/** - * Calculate crc8 of kernel secure storage. - * - * @param ctx Context pointer - * @return Calculated crc8 value. - */ -uint8_t vb2_secdata_kernel_crc(struct vb2_context *ctx); - #endif /* VBOOT_REFERENCE_TEST_API_H_ */ |