diff options
Diffstat (limited to 'tests/vb21_host_fw_preamble_tests.c')
| -rw-r--r-- | tests/vb21_host_fw_preamble_tests.c | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/tests/vb21_host_fw_preamble_tests.c b/tests/vb21_host_fw_preamble_tests.c index 5edcb51d..33b9371a 100644 --- a/tests/vb21_host_fw_preamble_tests.c +++ b/tests/vb21_host_fw_preamble_tests.c @@ -12,7 +12,7 @@ #include "2common.h" #include "2rsa.h" -#include "vb2_common.h" +#include "vb21_common.h" #include "host_common.h" #include "host_fw_preamble2.h" @@ -29,9 +29,9 @@ static void preamble_tests(const char *keys_dir) { struct vb2_private_key *prik4096; struct vb2_public_key *pubk4096; - struct vb2_fw_preamble *fp; + struct vb21_fw_preamble *fp; const struct vb2_private_key *prikhash; - struct vb2_signature *hashes[3]; + struct vb21_signature *hashes[3]; char fname[1024]; const char test_desc[] = "Test fw preamble"; const uint32_t test_version = 2061; @@ -63,26 +63,25 @@ static void preamble_tests(const char *keys_dir) "Create private hash key"); /* Create some signatures */ - TEST_SUCC(vb2_sign_data(hashes + 0, test_data1, sizeof(test_data1), - prikhash, "Hash 1"), + TEST_SUCC(vb21_sign_data(hashes + 0, test_data1, sizeof(test_data1), + prikhash, "Hash 1"), "Hash 1"); - TEST_SUCC(vb2_sign_data(hashes + 1, test_data2, sizeof(test_data2), - prikhash, "Hash 2"), + TEST_SUCC(vb21_sign_data(hashes + 1, test_data2, sizeof(test_data2), + prikhash, "Hash 2"), "Hash 2"); - TEST_SUCC(vb2_sign_data(hashes + 2, test_data3, sizeof(test_data3), - prikhash, "Hash 3"), + TEST_SUCC(vb21_sign_data(hashes + 2, test_data3, sizeof(test_data3), + prikhash, "Hash 3"), "Hash 3"); /* Test good preamble */ - TEST_SUCC(vb2_fw_preamble_create(&fp, prik4096, - (const struct vb2_signature **)hashes, - 3, test_version, test_flags, - test_desc), + TEST_SUCC(vb21_fw_preamble_create( + &fp, prik4096, (const struct vb21_signature **)hashes, + 3, test_version, test_flags, test_desc), "Create preamble good"); TEST_PTR_NEQ(fp, NULL, " fp_ptr"); - TEST_SUCC(vb2_verify_fw_preamble(fp, fp->c.total_size, pubk4096, &wb), + TEST_SUCC(vb21_verify_fw_preamble(fp, fp->c.total_size, pubk4096, &wb), "Verify preamble good"); - TEST_EQ(strcmp(vb2_common_desc(fp), test_desc), 0, " desc"); + TEST_EQ(strcmp(vb21_common_desc(fp), test_desc), 0, " desc"); TEST_EQ(fp->fw_version, test_version, " fw_version"); TEST_EQ(fp->flags, test_flags, " flags"); TEST_EQ(fp->hash_count, 3, " hash_count"); @@ -98,10 +97,10 @@ static void preamble_tests(const char *keys_dir) /* Test errors */ prik4096->hash_alg = VB2_HASH_INVALID; - TEST_EQ(vb2_fw_preamble_create(&fp, prik4096, - (const struct vb2_signature **)hashes, - 3, test_version, test_flags, - test_desc), + TEST_EQ(vb21_fw_preamble_create(&fp, prik4096, + (const struct vb21_signature **)hashes, + 3, test_version, test_flags, + test_desc), VB2_FW_PREAMBLE_CREATE_SIG_SIZE, "Create preamble bad sig"); TEST_PTR_EQ(fp, NULL, " fp_ptr"); |