Add vbutil_key

tests/vboot_common3_tests.c

 /* Copyright (c) 2010 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 image library.
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 
@@ skipping 28 matching lines @@
   if (!hdr)
     return;
   hsize = hdr->key_block_size;
   h = (VbKeyBlockHeader*)Malloc(hsize + 1024);
 
   TEST_EQ(VerifyKeyBlock(hdr, hsize, NULL), 0,
           "VerifyKeyBlock() ok using checksum");
   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;
   TEST_NEQ(VerifyKeyBlock(h, hsize, NULL), 0, "VerifyKeyBlock() magic");
 
   /* Care about major version but not minor */
   Memcpy(h, hdr, hsize);
   h->header_version_major++;
   ReChecksumKeyBlock(h);
   TEST_NEQ(VerifyKeyBlock(h, hsize, NULL), 0, "VerifyKeyBlock() major++");
@@ skipping 97 matching lines @@
   rsa = PublicKeyToRSA(public_key);
   hdr = CreateFirmwarePreamble(0x1234, kernel_subkey, body_sig, private_key);
   TEST_NEQ(hdr && rsa, 0, "VerifyFirmwarePreamble2() prerequisites");
   if (!hdr)
     return;
   hsize = hdr->preamble_size;
   h = (VbFirmwarePreambleHeader*)Malloc(hsize + 16384);
 
   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);
   h->header_version_major++;
   ReSignFirmwarePreamble(h, private_key);
   TEST_NEQ(VerifyFirmwarePreamble2(h, hsize, rsa), 0,
            "VerifyFirmwarePreamble2() major++");
 
   Memcpy(h, hdr, hsize);
   h->header_version_major--;
@@ skipping 82 matching lines @@
   /* Read verification keys and create a test image. */
   signing_key_algorithm = atoi(argv[1]);
   data_key_algorithm = atoi(argv[2]);
 
   signing_private_key = PrivateKeyRead(argv[3], signing_key_algorithm);
   if (!signing_private_key) {
     fprintf(stderr, "Error reading signing_private_key");
     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;
   }
 
   VerifyKeyBlockTest(signing_public_key, signing_private_key, data_public_key);
   VerifyFirmwarePreambleTest(signing_public_key, signing_private_key,
                              data_public_key);
 
   if (signing_public_key)
     Free(signing_public_key);
   if (signing_private_key)
     Free(signing_private_key);
   if (data_public_key)
     Free(data_public_key);
 
   return error_code;
 }