Add vbutil_key

tests/vboot_common2_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 73 matching lines @@
   VbKernelPreambleHeader *hdr;
   VbKernelPreambleHeader *h;
   RSAPublicKey* rsa;
   uint64_t hsize;
 
   /* Create a dummy signature */
   VbSignature *body_sig = SignatureAlloc(56, 78);
 
   rsa = PublicKeyToRSA(public_key);
   hdr = CreateKernelPreamble(0x1234, 0x100000, 0x300000, 0x4000, body_sig,
-                             private_key);
+                             0, private_key);
   TEST_NEQ(hdr && rsa, 0, "VerifyKernelPreamble2() prerequisites");
   if (!hdr)
     return;
   hsize = hdr->preamble_size;
   h = (VbKernelPreambleHeader*)Malloc(hsize + 16384);
 
   TEST_EQ(VerifyKernelPreamble2(hdr, hsize, rsa), 0,
           "VerifyKernelPreamble2() ok using key");
-  TEST_NEQ(VerifyKernelPreamble2(hdr, hsize-1, rsa), 0,
-           "VerifyKernelPreamble2() size");
+  TEST_NEQ(VerifyKernelPreamble2(hdr, hsize - 1, rsa), 0,
+           "VerifyKernelPreamble2() size--");
+  TEST_EQ(VerifyKernelPreamble2(hdr, hsize + 1, rsa), 0,
+           "VerifyKernelPreamble2() size++");
 
   /* Care about major version but not minor */
   Memcpy(h, hdr, hsize);
   h->header_version_major++;
   ReSignKernelPreamble(h, private_key);
   TEST_NEQ(VerifyKernelPreamble2(h, hsize, rsa), 0,
            "VerifyKernelPreamble2() major++");
 
   Memcpy(h, hdr, hsize);
   h->header_version_major--;
@@ skipping 69 matching lines @@
 
   /* Read verification keys and create a test image. */
   key_algorithm = atoi(argv[1]);
 
   private_key = PrivateKeyRead(argv[2], key_algorithm);
   if (!private_key) {
     fprintf(stderr, "Error reading private_key");
     return 1;
   }
 
-  public_key = PublicKeyRead(argv[3], key_algorithm, 1);
+  public_key = PublicKeyReadKeyb(argv[3], key_algorithm, 1);
   if (!public_key) {
     fprintf(stderr, "Error reading public_key");
     return 1;
   }
 
   VerifyPublicKeyToRSA(public_key);
   VerifyDataTest(public_key, private_key);
   VerifyKernelPreambleTest(public_key, private_key);
 
   if (public_key)
     Free(public_key);
   if (private_key)
     Free(private_key);
 
   return error_code;
 }