summaryrefslogtreecommitdiff
path: root/tests/vboot_common3_tests.c
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2010-06-10 12:43:51 -0700
committerRandall Spangler <rspangler@chromium.org>2010-06-10 12:43:51 -0700
commitd55c64537245abca67a66fde5874b7f4a6cdc556 (patch)
tree9985b8ee0b402282a93501accee171e5ce0c8ba6 /tests/vboot_common3_tests.c
parent4f11c36ebcc42a8f875ce6ea7cdc36f5c4e965de (diff)
downloadvboot-d55c64537245abca67a66fde5874b7f4a6cdc556.tar.gz
Utility to pack public key, version, algorithm into a single file in VbPublicKey format
Review URL: http://codereview.chromium.org/2762009
Diffstat (limited to 'tests/vboot_common3_tests.c')
-rw-r--r--tests/vboot_common3_tests.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/tests/vboot_common3_tests.c b/tests/vboot_common3_tests.c
index a4e69fd1..1cfdd519 100644
--- a/tests/vboot_common3_tests.c
+++ b/tests/vboot_common3_tests.c
@@ -46,7 +46,8 @@ static void VerifyKeyBlockTest(const VbPublicKey* public_key,
TEST_EQ(VerifyKeyBlock(hdr, hsize, public_key), 0,
"VerifyKeyBlock() ok using key");
- TEST_NEQ(VerifyKeyBlock(hdr, hsize-1, NULL), 0, "VerifyKeyBlock() size");
+ TEST_NEQ(VerifyKeyBlock(hdr, hsize - 1, NULL), 0, "VerifyKeyBlock() size--");
+ TEST_EQ(VerifyKeyBlock(hdr, hsize + 1, NULL), 0, "VerifyKeyBlock() size++");
Memcpy(h, hdr, hsize);
h->magic[0] &= 0x12;
@@ -164,8 +165,10 @@ static void VerifyFirmwarePreambleTest(const VbPublicKey* public_key,
TEST_EQ(VerifyFirmwarePreamble2(hdr, hsize, rsa), 0,
"VerifyFirmwarePreamble2() ok using key");
- TEST_NEQ(VerifyFirmwarePreamble2(hdr, hsize-1, rsa), 0,
- "VerifyFirmwarePreamble2() size");
+ TEST_NEQ(VerifyFirmwarePreamble2(hdr, hsize - 1, rsa), 0,
+ "VerifyFirmwarePreamble2() size--");
+ TEST_EQ(VerifyFirmwarePreamble2(hdr, hsize + 1, rsa), 0,
+ "VerifyFirmwarePreamble2() size++");
/* Care about major version but not minor */
Memcpy(h, hdr, hsize);
@@ -268,13 +271,13 @@ int main(int argc, char* argv[]) {
return 1;
}
- signing_public_key = PublicKeyRead(argv[4], signing_key_algorithm, 1);
+ signing_public_key = PublicKeyReadKeyb(argv[4], signing_key_algorithm, 1);
if (!signing_public_key) {
fprintf(stderr, "Error reading signing_public_key");
return 1;
}
- data_public_key = PublicKeyRead(argv[6], data_key_algorithm, 1);
+ data_public_key = PublicKeyReadKeyb(argv[6], data_key_algorithm, 1);
if (!data_public_key) {
fprintf(stderr, "Error reading data_public_key");
return 1;