summaryrefslogtreecommitdiff
path: root/tests/vb2_secdatak_tests.c
diff options
context:
space:
mode:
authorJoel Kitching <kitching@google.com>2019-06-11 16:27:08 +0800
committerCommit Bot <commit-bot@chromium.org>2019-06-13 19:45:59 +0000
commitd15663d4f594e2c82ec73570b2a6772e719c0c3f (patch)
tree5122a60b34ae4a0fd53f93df6f74318195a8f541 /tests/vb2_secdatak_tests.c
parent70b3753d22dc0a1fead6f1cb65bc6e69e29a771e (diff)
downloadvboot-d15663d4f594e2c82ec73570b2a6772e719c0c3f.tar.gz
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>
Diffstat (limited to 'tests/vb2_secdatak_tests.c')
-rw-r--r--tests/vb2_secdatak_tests.c12
1 files changed, 6 insertions, 6 deletions
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");