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/vboot_common_tests.c | |
| parent | 98b00ae762cd99aec82757600185b2ae94cdb85f (diff) | |
| download | vboot-stabilize-12301.B.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/vboot_common_tests.c')
| -rw-r--r-- | tests/vboot_common_tests.c | 45 |
1 files changed, 8 insertions, 37 deletions
diff --git a/tests/vboot_common_tests.c b/tests/vboot_common_tests.c index 277a44a0..9bbfba69 100644 --- a/tests/vboot_common_tests.c +++ b/tests/vboot_common_tests.c @@ -60,48 +60,19 @@ static void VerifyHelperFunctions(void) } { - uint8_t *p = (uint8_t *)VerifyHelperFunctions; - TEST_EQ(VerifyMemberInside(p, 20, p, 6, 11, 3), 0, - "MemberInside ok 1"); - TEST_EQ(VerifyMemberInside(p, 20, p+4, 4, 8, 4), 0, - "MemberInside ok 2"); - TEST_EQ(VerifyMemberInside(p, 20, p-4, 4, 8, 4), 1, - "MemberInside member before parent"); - TEST_EQ(VerifyMemberInside(p, 20, p+20, 4, 8, 4), 1, - "MemberInside member after parent"); - TEST_EQ(VerifyMemberInside(p, 20, p, 21, 0, 0), 1, - "MemberInside member too big"); - TEST_EQ(VerifyMemberInside(p, 20, p, 4, 21, 0), 1, - "MemberInside data after parent"); - TEST_EQ(VerifyMemberInside(p, 20, p, 4, (uint64_t)-1, 0), 1, - "MemberInside data before parent"); - TEST_EQ(VerifyMemberInside(p, 20, p, 4, 4, 17), 1, - "MemberInside data too big"); - TEST_EQ(VerifyMemberInside(p, (uint64_t)-1, - p+(uint64_t)-10, 12, 5, 0), 1, - "MemberInside wraparound 1"); - TEST_EQ(VerifyMemberInside(p, (uint64_t)-1, - p+(uint64_t)-10, 5, 12, 0), 1, - "MemberInside wraparound 2"); - TEST_EQ(VerifyMemberInside(p, (uint64_t)-1, - p+(uint64_t)-10, 5, 0, 12), 1, - "MemberInside wraparound 3"); - } - - { VbPublicKey k = {sizeof(k), 128, 0, 0}; TEST_EQ(VerifyPublicKeyInside(&k, sizeof(k)+128, &k), 0, "PublicKeyInside ok 1"); TEST_EQ(VerifyPublicKeyInside(&k - 1, 2*sizeof(k)+128, &k), 0, "PublicKeyInside ok 2"); - TEST_EQ(VerifyPublicKeyInside(&k, 128, &k), 1, - "PublicKeyInside key too big"); + TEST_NEQ(VerifyPublicKeyInside(&k, 128, &k), 0, + "PublicKeyInside key too big"); } { VbPublicKey k = {100, 4, 0, 0}; - TEST_EQ(VerifyPublicKeyInside(&k, 99, &k), 1, - "PublicKeyInside offset too big"); + TEST_NEQ(VerifyPublicKeyInside(&k, 99, &k), 0, + "PublicKeyInside offset too big"); } { @@ -110,14 +81,14 @@ static void VerifyHelperFunctions(void) "SignatureInside ok 1"); TEST_EQ(VerifySignatureInside(&s - 1, 2*sizeof(s)+128, &s), 0, "SignatureInside ok 2"); - TEST_EQ(VerifySignatureInside(&s, 128, &s), 1, - "SignatureInside sig too big"); + TEST_NEQ(VerifySignatureInside(&s, 128, &s), 0, + "SignatureInside sig too big"); } { VbSignature s = {100, 4, 0}; - TEST_EQ(VerifySignatureInside(&s, 99, &s), 1, - "SignatureInside offset too big"); + TEST_NEQ(VerifySignatureInside(&s, 99, &s), 0, + "SignatureInside offset too big"); } } |