1 files changed, 14 insertions, 11 deletions

diff --git a/tests/vboot_common2_tests.c b/tests/vboot_common2_tests.c
index 8f662d38..5185debb 100644
--- a/tests/vboot_common2_tests.c
+++ b/tests/vboot_common2_tests.c
@@ -44,14 +44,15 @@ static void VerifyPublicKeyToRSA(const VbPublicKey *orig_key)
 }
 
 static void VerifyDataTest(const VbPublicKey *public_key,
-                           const VbPrivateKey *private_key)
+                           const struct vb2_private_key *private_key)
 {
 	const uint8_t test_data[] = "This is some test data to sign.";
 	const uint64_t test_size = sizeof(test_data);
 	VbSignature *sig;
 	RSAPublicKey *rsa;
 
-	sig = CalculateSignature(test_data, test_size, private_key);
+	sig = (VbSignature *)vb2_calculate_signature(test_data, test_size,
+						     private_key);
 	TEST_PTR_NEQ(sig, 0, "VerifyData() calculate signature");
 
 	rsa = PublicKeyToRSA(public_key);
@@ -80,14 +81,16 @@ static void VerifyDataTest(const VbPublicKey *public_key,
 }
 
 static void VerifyDigestTest(const VbPublicKey *public_key,
-                             const VbPrivateKey *private_key)
+                             const struct vb2_private_key *private_key)
 {
 	const uint8_t test_data[] = "This is some other test data to sign.";
 	VbSignature *sig;
 	RSAPublicKey *rsa;
 	uint8_t digest[VB2_MAX_DIGEST_SIZE];
 
-	sig = CalculateSignature(test_data, sizeof(test_data), private_key);
+	sig = (VbSignature *)vb2_calculate_signature(test_data,
+						     sizeof(test_data),
+						     private_key);
 	rsa = PublicKeyToRSA(public_key);
 	TEST_SUCC(vb2_digest_buffer(test_data, sizeof(test_data),
 				    vb2_crypto_to_hash(public_key->algorithm),
@@ -111,17 +114,17 @@ static void VerifyDigestTest(const VbPublicKey *public_key,
 }
 
 static void ReSignKernelPreamble(VbKernelPreambleHeader *h,
-                                 const VbPrivateKey *key)
+                                 const struct vb2_private_key *key)
 {
-	VbSignature *sig = CalculateSignature((const uint8_t *)h,
-			h->preamble_signature.data_size, key);
+	struct vb2_signature *sig = vb2_calculate_signature(
+		(const uint8_t *)h, h->preamble_signature.data_size, key);
 
-	SignatureCopy(&h->preamble_signature, sig);
+	SignatureCopy(&h->preamble_signature, (VbSignature *)sig);
 	free(sig);
 }
 
 static void VerifyKernelPreambleTest(const VbPublicKey *public_key,
-                                     const VbPrivateKey *private_key)
+                                     const struct vb2_private_key *private_key)
 {
 	VbKernelPreambleHeader *hdr;
 	VbKernelPreambleHeader *h;
@@ -219,13 +222,13 @@ 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;
 	VbPublicKey *public_key = NULL;
 
 	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);
+	struct vb2_private_key *private_key =
+		vb2_read_private_key_pem(filename, key_algorithm);
 	if (!private_key) {
 		fprintf(stderr, "Error reading private_key: %s\n", filename);
 		return 1;