Vboot Reference: Refactor Code.

src/platform/vboot_reference/tests/kernel_image_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 kernel image library.
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 
@@ skipping 156 matching lines @@
     success = 0;
 
   return success;
 }
 
 int main(int argc, char* argv[]) {
   uint32_t len;
   uint8_t* kernel_sign_key_buf = NULL;
   uint8_t* firmware_key_blob = NULL;
   uint8_t* kernel_blob = NULL;
+  int kernel_blob_len = 0;
   KernelImage* image = NULL;
   RSAPublicKey* firmware_key = NULL;
   int error_code = 1;
-  char* tmp_kernelblob_file = ".tmpKernelBlob";
 
   if(argc != 7) {
     fprintf(stderr, "Usage: %s <firmware signing algorithm> "  /* argv[1] */
             "<kernel signing algorithm> "  /* argv[2] */
             "<firmware key> "  /* argv[3] */
             "<processed firmware pubkey> "  /* argv[4] */
             "<kernel signing key> "  /* argv[5] */
             "<processed kernel signing key>\n",  /* argv[6] */
             argv[0]);
     return -1;
@@ skipping 19 matching lines @@
     goto failure;
   }
 
   /* Generate and populate signatures. */
   if (!AddKernelKeySignature(image, argv[3])) {
     fprintf(stderr, "Couldn't create key signature.\n");
     error_code = 1;
     goto failure;
   }
 
-  if (!AddKernelSignature(image, argv[5], image->kernel_sign_algorithm)) {
+  if (!AddKernelSignature(image, argv[5])) {
     fprintf(stderr, "Couldn't create firmware and preamble signature.\n");
     error_code = 1;
     goto failure;
   }
 
-  /* Generate a firmware binary blob from image.
-   *
-   * TODO(gauravsh): Add a function to directly generate a binary
-   * blob buffer from a KernelImage instead of indirectly writing to a file
-   * and reading it into a buffer.
-   */
-  if (!WriteKernelImage(tmp_kernelblob_file, image)) {
-    fprintf(stderr, "Couldn't create a temporary kernel blob file.\n");
-    error_code = 1;
-    goto failure;
-  }
-  kernel_blob = BufferFromFile(tmp_kernelblob_file, &len);
+  kernel_blob = GetKernelBlob(image, &kernel_blob_len);
 
   /* Test Kernel blob verify operations. */
   if (!VerifyKernelTest(kernel_blob, firmware_key_blob))
     error_code = 255;
 
   /* Test KernelImage verify operations. */
   if (!VerifyKernelImageTest(image, firmware_key))
     error_code = 255;
   if (!VerifyKernelImageTamperTest(image, firmware_key))
     error_code = 255;
 
 failure:
   Free(kernel_blob);
   KernelImageFree(image);
   Free(kernel_sign_key_buf);
   Free(firmware_key_blob);
   Free(firmware_key);
 
   return error_code;
 }