diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/vb2_auxfw_sync_tests.c | 1 | ||||
| -rw-r--r-- | tests/vb2_host_key_tests.c (renamed from tests/vboot_common_tests.c) | 44 | ||||
| -rw-r--r-- | tests/verify_kernel.c | 1 |
3 files changed, 20 insertions, 26 deletions
diff --git a/tests/vb2_auxfw_sync_tests.c b/tests/vb2_auxfw_sync_tests.c index 470c2d2a..3ce0cd7f 100644 --- a/tests/vb2_auxfw_sync_tests.c +++ b/tests/vb2_auxfw_sync_tests.c @@ -18,7 +18,6 @@ #include "secdata_tpm.h" #include "test_common.h" #include "vboot_audio.h" -#include "vboot_common.h" #include "vboot_display.h" #include "vboot_kernel.h" #include "vboot_struct.h" diff --git a/tests/vboot_common_tests.c b/tests/vb2_host_key_tests.c index 50e2bb59..82dd3572 100644 --- a/tests/vboot_common_tests.c +++ b/tests/vb2_host_key_tests.c @@ -1,22 +1,16 @@ -/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The Chromium OS Authors. All rights reserved. * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * - * Tests for firmware vboot_common.c + * Tests for host library vboot2 key functions */ -#include <stdint.h> -#include <stdio.h> -#include <stdlib.h> - #include "2common.h" #include "host_common.h" #include "test_common.h" -#include "utility.h" -#include "vboot_common.h" /* Public key utility functions */ -static void PublicKeyTest(void) +static void public_key_tests(void) { struct vb2_packed_key k[3]; struct vb2_packed_key j[5]; @@ -27,46 +21,48 @@ static void PublicKeyTest(void) k[1].key_size = 12345; k[2].key_version = 67; - PublicKeyInit(k, (uint8_t*)(k + 1), 2 * sizeof(struct vb2_packed_key)); + vb2_init_packed_key(k, (uint8_t*)(k + 1), + 2 * sizeof(struct vb2_packed_key)); TEST_EQ(k->key_offset, sizeof(struct vb2_packed_key), - "PublicKeyInit key_offset"); + "vb2_init_packed_key key_offset"); TEST_EQ(k->key_size, 2 * sizeof(struct vb2_packed_key), - "PublicKeyInit key_size"); - TEST_EQ(k->algorithm, VB2_ALG_COUNT, "PublicKeyInit algorithm"); - TEST_EQ(k->key_version, 0, "PublicKeyInit key_version"); + "vb2_init_packed_key key_size"); + TEST_EQ(k->algorithm, VB2_ALG_COUNT, "vb2_init_packed_key algorithm"); + TEST_EQ(k->key_version, 0, "vb2_init_packed_key key_version"); /* Set algorithm and version, so we can tell if they get copied */ k->algorithm = 3; k->key_version = 21; /* Copying to a smaller destination should fail */ - PublicKeyInit(j, (uint8_t*)(j + 1), + vb2_init_packed_key(j, (uint8_t*)(j + 1), 2 * sizeof(struct vb2_packed_key) - 1); - TEST_NEQ(0, PublicKeyCopy(j, k), "PublicKeyCopy too small"); + TEST_NEQ(0, vb2_copy_packed_key(j, k), "vb2_copy_packed_key too small"); /* Copying to same or larger size should succeed */ - PublicKeyInit(j, (uint8_t*)(j + 2), + vb2_init_packed_key(j, (uint8_t*)(j + 2), 2 * sizeof(struct vb2_packed_key) + 1); - TEST_EQ(0, PublicKeyCopy(j, k), "PublicKeyCopy same"); + TEST_EQ(0, vb2_copy_packed_key(j, k), "vb2_copy_packed_key same"); /* Offset in destination shouldn't have been modified */ TEST_EQ(j->key_offset, 2 * sizeof(struct vb2_packed_key), - "PublicKeyCopy key_offset"); + "vb2_copy_packed_key key_offset"); /* Size should have been reduced to match the source */ TEST_EQ(k->key_size, 2 * sizeof(struct vb2_packed_key), - "PublicKeyCopy key_size"); + "vb2_copy_packed_key key_size"); /* Other fields should have been copied */ - TEST_EQ(k->algorithm, j->algorithm, "PublicKeyCopy algorithm"); - TEST_EQ(k->key_version, j->key_version, "PublicKeyCopy key_version"); + TEST_EQ(k->algorithm, j->algorithm, "vb2_copy_packed_key algorithm"); + TEST_EQ(k->key_version, j->key_version, + "vb2_copy_packed_key key_version"); /* Data should have been copied */ TEST_EQ(0, memcmp(vb2_packed_key_data(k), vb2_packed_key_data(j), k->key_size), - "PublicKeyCopy data"); + "vb2_copy_packed_key data"); } int main(int argc, char* argv[]) { - PublicKeyTest(); + public_key_tests(); return gTestSuccess ? 0 : 255; } diff --git a/tests/verify_kernel.c b/tests/verify_kernel.c index ddb1fe30..1a4831d5 100644 --- a/tests/verify_kernel.c +++ b/tests/verify_kernel.c @@ -15,7 +15,6 @@ #include "2nvstorage.h" #include "host_common.h" #include "util_misc.h" -#include "vboot_common.h" #include "vboot_api.h" #include "vboot_kernel.h" |