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

src/platform/vboot_reference/tests/firmware_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 firmware image library.
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include "file_keys.h"
 #include "firmware_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;
   }
 }
 
 FirmwareImage* GenerateTestFirmwareImage(int algorithm,
                                          uint8_t* firmware_sign_key,
                                          int firmware_key_version,
                                          int firmware_version,
                                          int firmware_len) {
   FirmwareImage* image = FirmwareImageNew();
-  uint8_t* header_checksum;
-  DigestContext ctx;
 
   Memcpy(image->magic, FIRMWARE_MAGIC, FIRMWARE_MAGIC_SIZE);
   image->firmware_sign_algorithm = algorithm;
   image->firmware_sign_key = (uint8_t*) Malloc(
       RSAProcessedKeySize(image->firmware_sign_algorithm));
   Memcpy(image->firmware_sign_key, firmware_sign_key,
          RSAProcessedKeySize(image->firmware_sign_algorithm));
   image->firmware_key_version = firmware_key_version;
 
   /* Update correct header length. */
   image->header_len = GetFirmwareHeaderLen(image);
 
   /* Calculate SHA-512 digest on header and populate header_checksum. */
-  DigestInit(&ctx, ROOT_SIGNATURE_ALGORITHM);
-  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, image->firmware_sign_key,
-               RSAProcessedKeySize(image->firmware_sign_algorithm));
-  DigestUpdate(&ctx, (uint8_t*) &image->firmware_key_version,
-               sizeof(image->firmware_key_version));
-  header_checksum = DigestFinal(&ctx);
-  Memcpy(image->header_checksum, header_checksum, SHA512_DIGEST_SIZE);
-  Free(header_checksum);
-
+  CalculateFirmwareHeaderChecksum(image, image->header_checksum);
 
   /* Populate firmware and preamble with dummy data. */
   image->firmware_version = firmware_version;
   image->firmware_len = firmware_len;
   image->preamble_signature = image->firmware_signature = NULL;
   Memset(image->preamble, 'P', FIRMWARE_PREAMBLE_SIZE);
   image->firmware_data = Malloc(image->firmware_len);
   Memset(image->firmware_data, 'F', image->firmware_len);
 
   return image;
@@ skipping 133 matching lines @@
 
 failure:
   Free(firmware_blob);
   FirmwareImageFree(image);
   Free(firmware_sign_key_buf);
   Free(root_key_blob);
   RSAPublicKeyFree(root_key);
 
   return error_code;
 }