commit d21cae0b23e206eef336136b23752b2653e58229
author Joel Kitching <kitching@google.com> Wed Jan 20 17:16:17 2021 +0800
committer Commit Bot <commit-bot@chromium.org> Thu Jan 28 03:52:07 2021 +0000
tree 4bf6e566977cfd9f8f9e6783e935e042ba67e433
parent 0b10eacf1fed2256d288dea9275a80e67d127eb6

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>

firmware/2lib/2secdata_kernel.c

diff --git a/firmware/2lib/2secdata_kernel.c b/firmware/2lib/2secdata_kernel.c
index de12ca0..0d4208f 100644
--- a/firmware/2lib/2secdata_kernel.c
+++ b/firmware/2lib/2secdata_kernel.c
@@ -22,7 +22,13 @@
 	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 @@
 	*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 @@
 	*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 @@
 	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 @@
 	}
 
 	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 @@
 	}
 
 	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;
 

firmware/lib/include/vboot_test.h

diff --git a/firmware/lib/include/vboot_test.h b/firmware/lib/include/vboot_test.h
index 9c84909..f66cfec 100644
--- a/firmware/lib/include/vboot_test.h
+++ b/firmware/lib/include/vboot_test.h
@@ -29,15 +29,4 @@
 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_ */