diff options
| author | Joel Kitching <kitching@google.com> | 2019-09-04 15:52:25 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-10-29 21:27:35 +0000 |
| commit | 3d8dcc853a98bb8aae91d9a30862541a38581b2d (patch) | |
| tree | 934ad41cc209cc3161e2fa3581e8f20298107329 /tests | |
| parent | 6d43a1925a3f88b4fb8ac3fc9dcfc42ccd934063 (diff) | |
| download | vboot-3d8dcc853a98bb8aae91d9a30862541a38581b2d.tar.gz | |
vboot: keep const and non-const signature and key accessors
Keep const (default) and non-const (_mutable suffix) versions
of `data` field accessors for vb2_signature and vb2_packed_key.
No need for separate 2packed_key.c file -- just static inline
the functions.
vb2_verify_packed_key_inside should return type vb2_error_t.
BUG=b:124141368, chromium:968464
TEST=make clean && make runtests
BRANCH=none
Change-Id: I96722a746f26abbb6e19a365ce74f0bfda0da381
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1786386
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')
| -rw-r--r-- | tests/vb20_common2_tests.c | 2 | ||||
| -rw-r--r-- | tests/vb20_common3_tests.c | 4 | ||||
| -rw-r--r-- | tests/vboot_common_tests.c | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/tests/vb20_common2_tests.c b/tests/vb20_common2_tests.c index 46b04cad..8f8b11ac 100644 --- a/tests/vb20_common2_tests.c +++ b/tests/vb20_common2_tests.c @@ -130,7 +130,7 @@ static void test_verify_data(const struct vb2_packed_key *key1, 0, "vb2_verify_data() input buffer too small"); memcpy(sig2, sig, sig_total_size); - vb2_signature_data(sig2)[0] ^= 0x5A; + vb2_signature_data_mutable(sig2)[0] ^= 0x5A; TEST_NEQ(vb2_verify_data(test_data, test_size, sig2, &pubk, &wb), 0, "vb2_verify_data() wrong sig"); diff --git a/tests/vb20_common3_tests.c b/tests/vb20_common3_tests.c index cf74b72d..fb787d1f 100644 --- a/tests/vb20_common3_tests.c +++ b/tests/vb20_common3_tests.c @@ -174,7 +174,7 @@ static void test_verify_keyblock(const struct vb2_public_key *public_key, "vb2_verify_keyblock() sig too small"); memcpy(h, hdr, hsize); - ((uint8_t *)vb2_packed_key_data(&h->data_key))[0] ^= 0x34; + ((uint8_t *)vb2_packed_key_data_mutable(&h->data_key))[0] ^= 0x34; TEST_EQ(vb2_verify_keyblock(h, hsize, public_key, &wb), VB2_ERROR_KEYBLOCK_SIG_INVALID, "vb2_verify_keyblock() sig mismatch"); @@ -293,7 +293,7 @@ static void test_verify_fw_preamble(struct vb2_packed_key *public_key, "vb2_verify_fw_preamble() sig too small"); memcpy(h, hdr, hsize); - ((uint8_t *)vb2_packed_key_data(&h->kernel_subkey))[0] ^= 0x34; + ((uint8_t *)vb2_packed_key_data_mutable(&h->kernel_subkey))[0] ^= 0x34; TEST_EQ(vb2_verify_fw_preamble(h, hsize, &rsa, &wb), VB2_ERROR_PREAMBLE_SIG_INVALID, "vb2_verify_fw_preamble() sig mismatch"); diff --git a/tests/vboot_common_tests.c b/tests/vboot_common_tests.c index 49f2f2b9..57f43824 100644 --- a/tests/vboot_common_tests.c +++ b/tests/vboot_common_tests.c @@ -78,7 +78,8 @@ static void PublicKeyTest(void) TEST_EQ(k->key_version, j->key_version, "PublicKeyCopy key_version"); /* Data should have been copied */ TEST_EQ(0, - memcmp(GetPublicKeyData(k), GetPublicKeyData(j), k->key_size), + memcmp(vb2_packed_key_data(k), + vb2_packed_key_data(j), k->key_size), "PublicKeyCopy data"); } |