Add --describe flag to {firmware|kernel}_utility.

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>
 
 #include "file_keys.h"
 #include "kernel_image.h"
 #include "rsa_utility.h"
-#include "sha_utility.h"
 #include "utility.h"
 
 /* ANSI Color coding sequences. */
 #define COL_GREEN "\e[1;32m"
 #define COL_RED "\e[0;31m"
 #define COL_STOP "\e[m"
 
 int TEST_EQ(int result, int expected_result, char* testname) {
   if (result == expected_result) {
     fprintf(stderr, "%s Test " COL_GREEN " PASSED\n" COL_STOP, testname);
     return 1;
   }
   else {
     fprintf(stderr, "%s Test " COL_RED " FAILED\n" COL_STOP, testname);
     return 0;
   }
 }
 
 KernelImage* GenerateTestKernelImage(int firmware_sign_algorithm,
                                      int kernel_sign_algorithm,
                                      uint8_t* kernel_sign_key,
                                      int kernel_key_version,
                                      int kernel_version,
                                      int kernel_len) {
   KernelImage* image = KernelImageNew();
-  uint8_t* header_checksum;
-  DigestContext ctx;
 
   Memcpy(image->magic, KERNEL_MAGIC, KERNEL_MAGIC_SIZE);
   image->header_version = 1;
   image->firmware_sign_algorithm = firmware_sign_algorithm;
   image->kernel_sign_algorithm = kernel_sign_algorithm;
   image->kernel_key_version = kernel_key_version;
   image->kernel_sign_key = (uint8_t*) Malloc(
       RSAProcessedKeySize(image->kernel_sign_algorithm));
   Memcpy(image->kernel_sign_key, kernel_sign_key,
          RSAProcessedKeySize(image->kernel_sign_algorithm));
 
   /* Update correct header length. */
   image->header_len = GetKernelHeaderLen(image);
 
   /* Calculate SHA-512 digest on header and populate header_checksum. */
-  DigestInit(&ctx, SHA512_DIGEST_ALGORITHM);
-  DigestUpdate(&ctx, (uint8_t*) &image->header_version,
-               sizeof(image->header_version));
-  DigestUpdate(&ctx, (uint8_t*) &image->header_len,
-               sizeof(image->header_len));
-  DigestUpdate(&ctx, (uint8_t*) &image->firmware_sign_algorithm,
-               sizeof(image->firmware_sign_algorithm));
-  DigestUpdate(&ctx, (uint8_t*) &image->kernel_sign_algorithm,
-               sizeof(image->kernel_sign_algorithm));
-  DigestUpdate(&ctx, (uint8_t*) &image->kernel_key_version,
-               sizeof(image->kernel_key_version));
-  DigestUpdate(&ctx, image->kernel_sign_key,
-               RSAProcessedKeySize(image->kernel_sign_algorithm));
-  header_checksum = DigestFinal(&ctx);
-  Memcpy(image->header_checksum, header_checksum, SHA512_DIGEST_SIZE);
-  Free(header_checksum);
+  CalculateKernelHeaderChecksum(image, image->header_checksum);
 
   /* Populate kernel options and data with dummy data. */
   image->kernel_version = kernel_version;
   image->options.version[0] = 1;
   image->options.version[1] = 0;
   Memset(image->options.cmd_line, 0, sizeof(image->options.cmd_line));
   image->options.kernel_len = kernel_len;
   image->options.kernel_load_addr = 0;
   image->options.kernel_entry_addr = 0;
   image->kernel_key_signature = image->kernel_signature = NULL;
@@ skipping 149 matching lines @@
 
 failure:
   Free(kernel_blob);
   KernelImageFree(image);
   Free(kernel_sign_key_buf);
   Free(firmware_key_blob);
   RSAPublicKeyFree(firmware_key);
 
   return error_code;
 }