diff options
| author | Joel Kitching <kitching@google.com> | 2019-06-25 16:21:09 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-06-26 14:24:47 +0000 |
| commit | 1851825b05d266509c4157d1413c0d853a9add28 (patch) | |
| tree | 2c67473639889bf0a58520c587921cf973df1bf7 /tests/vb2_common_tests.c | |
| parent | 98b00ae762cd99aec82757600185b2ae94cdb85f (diff) | |
| download | vboot-1851825b05d266509c4157d1413c0d853a9add28.tar.gz | |
vboot: remove VerifyMemberInside functionstabilize-12301.B
Use vboot2-style vb2_verify_member_inside instead.
Correct some strings in vboot2 tests to refer to new vboot2
functions instead.
BUG=b:124141368
TEST=make clean && make runtests
BRANCH=none
Change-Id: Idb3bcf1657c9d955acc6f93983c7b0c7f06427e3
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1675870
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'tests/vb2_common_tests.c')
| -rw-r--r-- | tests/vb2_common_tests.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/tests/vb2_common_tests.c b/tests/vb2_common_tests.c index acc904e9..2b44233b 100644 --- a/tests/vb2_common_tests.c +++ b/tests/vb2_common_tests.c @@ -173,52 +173,52 @@ static void test_helper_functions(void) { uint8_t *p = (uint8_t *)test_helper_functions; TEST_SUCC(vb2_verify_member_inside(p, 20, p, 6, 11, 3), - "MemberInside ok 1"); + "vb2_verify_member_inside() ok 1"); TEST_SUCC(vb2_verify_member_inside(p, 20, p+4, 4, 8, 4), - "MemberInside ok 2"); + "vb2_verify_member_inside() ok 2"); TEST_EQ(vb2_verify_member_inside(p, 20, p-4, 4, 8, 4), VB2_ERROR_INSIDE_MEMBER_OUTSIDE, - "MemberInside member before parent"); + "vb2_verify_member_inside() member before parent"); TEST_EQ(vb2_verify_member_inside(p, 20, p+20, 4, 8, 4), VB2_ERROR_INSIDE_MEMBER_OUTSIDE, - "MemberInside member after parent"); + "vb2_verify_member_inside() member after parent"); TEST_EQ(vb2_verify_member_inside(p, 20, p, 21, 0, 0), VB2_ERROR_INSIDE_MEMBER_OUTSIDE, - "MemberInside member too big"); + "vb2_verify_member_inside() member too big"); TEST_EQ(vb2_verify_member_inside(p, 20, p, 4, 21, 0), VB2_ERROR_INSIDE_DATA_OUTSIDE, - "MemberInside data after parent"); + "vb2_verify_member_inside() data after parent"); TEST_EQ(vb2_verify_member_inside(p, 20, p, 4, SIZE_MAX, 0), VB2_ERROR_INSIDE_DATA_OUTSIDE, - "MemberInside data before parent"); + "vb2_verify_member_inside() data before parent"); TEST_EQ(vb2_verify_member_inside(p, 20, p, 4, 4, 17), VB2_ERROR_INSIDE_DATA_OUTSIDE, - "MemberInside data too big"); + "vb2_verify_member_inside() data too big"); TEST_EQ(vb2_verify_member_inside(p, 20, p, 8, 4, 8), VB2_ERROR_INSIDE_DATA_OVERLAP, - "MemberInside data overlaps member"); + "vb2_verify_member_inside() data overlaps member"); TEST_EQ(vb2_verify_member_inside(p, -8, p, 12, 0, 0), VB2_ERROR_INSIDE_PARENT_WRAPS, - "MemberInside wraparound 1"); + "vb2_verify_member_inside() wraparound 1"); TEST_EQ(vb2_verify_member_inside(p, 20, p, -8, 0, 0), VB2_ERROR_INSIDE_MEMBER_WRAPS, - "MemberInside wraparound 2"); + "vb2_verify_member_inside() wraparound 2"); TEST_EQ(vb2_verify_member_inside(p, 20, p, 4, 4, -12), VB2_ERROR_INSIDE_DATA_WRAPS, - "MemberInside wraparound 3"); + "vb2_verify_member_inside() wraparound 3"); } { struct vb2_packed_key k = {.key_offset = sizeof(k), .key_size = 128}; TEST_SUCC(vb2_verify_packed_key_inside(&k, sizeof(k)+128, &k), - "PublicKeyInside ok 1"); + "vb2_packed_key_inside() ok 1"); TEST_SUCC(vb2_verify_packed_key_inside(&k - 1, 2*sizeof(k)+128, &k), - "PublicKeyInside ok 2"); + "vb2_packed_key_inside() ok 2"); TEST_EQ(vb2_verify_packed_key_inside(&k, 128, &k), VB2_ERROR_INSIDE_DATA_OUTSIDE, - "PublicKeyInside key too big"); + "vb2_packed_key_inside() key too big"); } { @@ -226,7 +226,7 @@ static void test_helper_functions(void) .key_size = 4}; TEST_EQ(vb2_verify_packed_key_inside(&k, 99, &k), VB2_ERROR_INSIDE_DATA_OUTSIDE, - "PublicKeyInside offset too big"); + "vb2_packed_key_inside() offset too big"); } } |