vboot: expose vb2api_secdatak_check and vb2api_secdatak_create

Previously vb2api_secdatak_check and vb2api_secdatak_create had
headers in 2api.h, but no definitions.

Merge identical internal/external functions:
  vb2api_secdata_create, vb2_secdata_create_crc
  vb2api_secdata_check, vb2_secdata_check_crc
  vb2api_secdatak_create, vb2_secdatak_create_crc
  vb2api_secdatak_check, vb2_secdatak_check_crc

BUG=b:124141368, chromium:972956
TEST=make clean && make runtests
BRANCH=none

Change-Id: I64a14d65e5d856ca0f819ef3ded50b4719abc8b3
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1652874
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Commit-Queue: Julius Werner <jwerner@chromium.org>

10 files changed, 19 insertions, 19 deletions

diff --git a/tests/vb20_api_kernel_tests.c b/tests/vb20_api_kernel_tests.c
index 0d48c75c..64fb421f 100644
--- a/tests/vb20_api_kernel_tests.c
+++ b/tests/vb20_api_kernel_tests.c
@@ -64,7 +64,7 @@ static void reset_common_data(enum reset_type t)
 
 	vb2_nv_init(&ctx);
 
-	vb2_secdatak_create(&ctx);
+	vb2api_secdatak_create(&ctx);
 	vb2_secdatak_init(&ctx);
 	vb2_secdatak_set(&ctx, VB2_SECDATAK_VERSIONS, 0x20002);
 
diff --git a/tests/vb20_api_tests.c b/tests/vb20_api_tests.c
index 6c43391e..1c96efa1 100644
--- a/tests/vb20_api_tests.c
+++ b/tests/vb20_api_tests.c
@@ -66,7 +66,7 @@ static void reset_common_data(enum reset_type t)
 
 	vb2_nv_init(&ctx);
 
-	vb2_secdata_create(&ctx);
+	vb2api_secdata_create(&ctx);
 	vb2_secdata_init(&ctx);
 
 	retval_vb2_load_fw_keyblock = VB2_SUCCESS;
diff --git a/tests/vb20_kernel_tests.c b/tests/vb20_kernel_tests.c
index ec70f4bb..c798f862 100644
--- a/tests/vb20_kernel_tests.c
+++ b/tests/vb20_kernel_tests.c
@@ -90,7 +90,7 @@ static void reset_common_data(enum reset_type t)
 
 	vb2_nv_init(&ctx);
 
-	vb2_secdatak_create(&ctx);
+	vb2api_secdatak_create(&ctx);
 	vb2_secdatak_init(&ctx);
 
 	mock_read_res_fail_on_call = 0;
diff --git a/tests/vb20_misc_tests.c b/tests/vb20_misc_tests.c
index 4cd11b6f..9716ae2a 100644
--- a/tests/vb20_misc_tests.c
+++ b/tests/vb20_misc_tests.c
@@ -76,7 +76,7 @@ static void reset_common_data(enum reset_type t)
 
 	vb2_nv_init(&ctx);
 
-	vb2_secdata_create(&ctx);
+	vb2api_secdata_create(&ctx);
 	vb2_secdata_init(&ctx);
 
 	mock_read_res_fail_on_call = 0;
diff --git a/tests/vb21_api_tests.c b/tests/vb21_api_tests.c
index 18809400..cbe61086 100644
--- a/tests/vb21_api_tests.c
+++ b/tests/vb21_api_tests.c
@@ -81,7 +81,7 @@ static void reset_common_data(enum reset_type t)
 
 	vb2_nv_init(&ctx);
 
-	vb2_secdata_create(&ctx);
+	vb2api_secdata_create(&ctx);
 	vb2_secdata_init(&ctx);
 
 	memset(&hwcrypto_emulation_dc, 0, sizeof(hwcrypto_emulation_dc));
diff --git a/tests/vb21_misc_tests.c b/tests/vb21_misc_tests.c
index 7eaf0546..db7cd775 100644
--- a/tests/vb21_misc_tests.c
+++ b/tests/vb21_misc_tests.c
@@ -78,7 +78,7 @@ static void reset_common_data(enum reset_type t)
 
 	vb2_nv_init(&ctx);
 
-	vb2_secdata_create(&ctx);
+	vb2api_secdata_create(&ctx);
 	vb2_secdata_init(&ctx);
 
 	mock_read_res_fail_on_call = 0;
diff --git a/tests/vb2_api_tests.c b/tests/vb2_api_tests.c
index c261f963..144102a6 100644
--- a/tests/vb2_api_tests.c
+++ b/tests/vb2_api_tests.c
@@ -59,7 +59,7 @@ static void reset_common_data(enum reset_type t)
 
 	vb2_nv_init(&ctx);
 
-	vb2_secdata_create(&ctx);
+	vb2api_secdata_create(&ctx);
 	vb2_secdata_init(&ctx);
 
 	force_dev_mode = 0;
diff --git a/tests/vb2_misc_tests.c b/tests/vb2_misc_tests.c
index 3c262633..85a6e697 100644
--- a/tests/vb2_misc_tests.c
+++ b/tests/vb2_misc_tests.c
@@ -44,7 +44,7 @@ static void reset_common_data(void)
 
 	vb2_nv_init(&ctx);
 
-	vb2_secdata_create(&ctx);
+	vb2api_secdata_create(&ctx);
 	vb2_secdata_init(&ctx);
 
 	mock_tpm_clear_called = 0;
diff --git a/tests/vb2_secdata_tests.c b/tests/vb2_secdata_tests.c
index 460bf831..99d7788a 100644
--- a/tests/vb2_secdata_tests.c
+++ b/tests/vb2_secdata_tests.c
@@ -43,7 +43,7 @@ static void secdata_test(void)
 
 	/* Blank data is invalid */
 	memset(c.secdata, 0xa6, sizeof(c.secdata));
-	TEST_EQ(vb2_secdata_check_crc(&c),
+	TEST_EQ(vb2api_secdata_check(&c),
 		VB2_ERROR_SECDATA_CRC, "Check blank CRC");
 	TEST_EQ(vb2_secdata_init(&c),
 		 VB2_ERROR_SECDATA_CRC, "Init blank CRC");
@@ -53,19 +53,19 @@ static void secdata_test(void)
 	TEST_EQ(vb2_secdata_init(&c), VB2_ERROR_SECDATA_ZERO, "Zeroed buffer");
 
 	/* Create good data */
-	TEST_SUCC(vb2_secdata_create(&c), "Create");
-	TEST_SUCC(vb2_secdata_check_crc(&c), "Check created CRC");
+	TEST_SUCC(vb2api_secdata_create(&c), "Create");
+	TEST_SUCC(vb2api_secdata_check(&c), "Check created CRC");
 	TEST_SUCC(vb2_secdata_init(&c), "Init created CRC");
 	test_changed(&c, 1, "Create changes data");
 
 	/* Now corrupt it */
 	c.secdata[2]++;
-	TEST_EQ(vb2_secdata_check_crc(&c),
+	TEST_EQ(vb2api_secdata_check(&c),
 		VB2_ERROR_SECDATA_CRC, "Check invalid CRC");
 	TEST_EQ(vb2_secdata_init(&c),
 		 VB2_ERROR_SECDATA_CRC, "Init invalid CRC");
 
-	vb2_secdata_create(&c);
+	vb2api_secdata_create(&c);
 	c.flags = 0;
 
 	/* Read/write flags */
diff --git a/tests/vb2_secdatak_tests.c b/tests/vb2_secdatak_tests.c
index 6a4f9017..81eb0345 100644
--- a/tests/vb2_secdatak_tests.c
+++ b/tests/vb2_secdatak_tests.c
@@ -44,20 +44,20 @@ static void secdatak_test(void)
 
 	/* Blank data is invalid */
 	memset(c.secdatak, 0xa6, sizeof(c.secdatak));
-	TEST_EQ(vb2_secdatak_check_crc(&c),
+	TEST_EQ(vb2api_secdatak_check(&c),
 		VB2_ERROR_SECDATAK_CRC, "Check blank CRC");
 	TEST_EQ(vb2_secdatak_init(&c),
 		 VB2_ERROR_SECDATAK_CRC, "Init blank CRC");
 
 	/* Create good data */
-	TEST_SUCC(vb2_secdatak_create(&c), "Create");
-	TEST_SUCC(vb2_secdatak_check_crc(&c), "Check created CRC");
+	TEST_SUCC(vb2api_secdatak_create(&c), "Create");
+	TEST_SUCC(vb2api_secdatak_check(&c), "Check created CRC");
 	TEST_SUCC(vb2_secdatak_init(&c), "Init created CRC");
 	test_changed(&c, 1, "Create changes data");
 
 	/* Now corrupt it */
 	c.secdatak[2]++;
-	TEST_EQ(vb2_secdatak_check_crc(&c),
+	TEST_EQ(vb2api_secdatak_check(&c),
 		VB2_ERROR_SECDATAK_CRC, "Check invalid CRC");
 	TEST_EQ(vb2_secdatak_init(&c),
 		 VB2_ERROR_SECDATAK_CRC, "Init invalid CRC");
@@ -66,7 +66,7 @@ static void secdatak_test(void)
 	{
 		struct vb2_secdatak *sec = (struct vb2_secdatak *)c.secdatak;
 
-		vb2_secdatak_create(&c);
+		vb2api_secdatak_create(&c);
 		sec->uid++;
 		sec->crc8 = vb2_crc8(sec, offsetof(struct vb2_secdatak, crc8));
 
@@ -75,7 +75,7 @@ static void secdatak_test(void)
 	}
 
 	/* Read/write versions */
-	vb2_secdatak_create(&c);
+	vb2api_secdatak_create(&c);
 	c.flags = 0;
 	TEST_SUCC(vb2_secdatak_get(&c, VB2_SECDATAK_VERSIONS, &v),
 		  "Get versions");