summaryrefslogtreecommitdiff
path: root/tests/vb20_common2_tests.c
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2016-06-17 10:48:16 -0700
committerchrome-bot <chrome-bot@chromium.org>2016-08-03 19:40:41 -0700
commit814aaf09ceecddb16a01e1cbe0df4299b83b5699 (patch)
tree2d8cdeed4ee062c83dd6e84a341ff53cf343fd1c /tests/vb20_common2_tests.c
parent31f04ada58bc67680ec9d62a404365803c76ffc1 (diff)
downloadvboot-814aaf09ceecddb16a01e1cbe0df4299b83b5699.tar.gz
futility: Create signatures using vboot 2.0 APIsstabilize-8688.B
Refactor futility to use only vboot 2.0 APIs to create signatures. BUG=chromium:611535 BRANCH=none TEST=make runtests Change-Id: I176e7f424fa556d34d8fe691df5681f1e43210ce Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/356128 Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'tests/vb20_common2_tests.c')
-rw-r--r--tests/vb20_common2_tests.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/vb20_common2_tests.c b/tests/vb20_common2_tests.c
index e5463e28..623633d6 100644
--- a/tests/vb20_common2_tests.c
+++ b/tests/vb20_common2_tests.c
@@ -140,14 +140,14 @@ int test_algorithm(int key_algorithm, const char *keys_dir)
char filename[1024];
int rsa_len = siglen_map[key_algorithm] * 8;
- VbPrivateKey *private_key = NULL;
+ struct vb2_private_key *private_key = NULL;
struct vb2_signature *sig = NULL;
struct vb2_packed_key *key1;
printf("***Testing algorithm: %s\n", algo_strings[key_algorithm]);
sprintf(filename, "%s/key_rsa%d.pem", keys_dir, rsa_len);
- private_key = PrivateKeyReadPem(filename, key_algorithm);
+ private_key = vb2_read_private_key_pem(filename, key_algorithm);
if (!private_key) {
fprintf(stderr, "Error reading private_key: %s\n", filename);
return 1;
@@ -162,8 +162,8 @@ int test_algorithm(int key_algorithm, const char *keys_dir)
}
/* Calculate good signatures */
- sig = (struct vb2_signature *)
- CalculateSignature(test_data, sizeof(test_data), private_key);
+ sig = vb2_calculate_signature(test_data, sizeof(test_data),
+ private_key);
TEST_PTR_NEQ(sig, 0, "Calculate signature");
if (!sig)
return 1;