Major refactoring of structures, with unit tests.

vboot_firmware/include/load_firmware_fw.h

 /* 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.
  *
  * High-level firmware API for loading and verifying rewritable firmware.
  * (Firmware Portion)
  */
 
 #ifndef VBOOT_REFERENCE_LOAD_FIRMWARE_FW_H_
 #define VBOOT_REFERENCE_LOAD_FIRMWARE_FW_H_
@@ skipping 26 matching lines @@
 
 /* Update the data hash for the current firmware image, extending it
  * by [size] bytes stored in [*data].  This function must only be
  * called inside GetFirmwareBody(). */
 void UpdateFirmwareBodyHash(uint8_t* data, uint64_t size);
 
 
 typedef struct LoadFirmwareParams {
   /* Inputs to LoadFirmware() */
   void *firmware_root_key_blob;  /* Key used to sign firmware header */
-  void *verification_block_0;  /* Key block + preamble for firmware 0 */
-  void *verification_block_1;  /* Key block + preamble for firmware 1 */
+  void *verification_block_0;    /* Key block + preamble for firmware 0 */
+  void *verification_block_1;    /* Key block + preamble for firmware 1 */
+  uint64_t verification_size_0;  /* Verification block 0 size in bytes */
+  uint64_t verification_size_1;  /* Verification block 1 size in bytes */
 
   /* Outputs from LoadFirmware(); valid only if LoadFirmware() returns
    * LOAD_FIRMWARE_SUCCESS. */
   uint64_t firmware_index;       /* Firmware index to run. */
   void *kernel_sign_key_blob;    /* Key to use when loading kernel.
                                   * Pass this data to LoadKernel() in
                                   * LoadKernelParams.header_sign_key_blob.
                                   * Key data may be copied/relocated
                                   * if necessary. */
   uint64_t kernel_sign_key_size;  /* Size of kernel signing key blob,
                                    * in bytes. */
 } LoadFirmwareParams;
 
 
 /* Attempts to load the rewritable firmware.
  *
  * Returns LOAD_FIRMWARE_SUCCESS if successful, error code on failure. */
 int LoadFirmware(LoadFirmwareParams* params);
 
 
 #endif  /* VBOOT_REFERENCE_LOAD_FIRMWARE_FW_H_ */