VBoot Reference: Fix splicing bugs in Firmware and Kernel verification.

src/platform/vboot_reference/include/kernel_image.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.
  *
  * Data structure and API definitions for a verified boot kernel image.
  */
 
 #ifndef VBOOT_REFERENCE_KERNEL_IMAGE_H_
 #define VBOOT_REFERENCE_KERNEL_IMAGE_H_
 
@@ skipping 45 matching lines @@
   uint8_t* kernel_key_signature;   /* Signature of the header above. */
 
   uint16_t kernel_version;  /* Kernel Version# for preventing rollbacks. */
   kconfig_options options;  /* Other kernel/bootloader options. */
 
   uint8_t* config_signature;  /* Signature of the kernel config file. */
 
   /* The kernel signature comes first as it may allow us to parallelize
    * the kernel data fetch and RSA public key operation.
    */
-  uint8_t* kernel_signature;  /* Signature on [kernel_data]. */
+  uint8_t* kernel_signature;  /* Signature on the concatenation of
+                               * [kernel_version], [options] and
+                               * [kernel_data]. */
   uint8_t* kernel_data;  /* Actual kernel data. */
 
 } KernelImage;
 
 /* Allocate and return a new KernelImage structure. */
 KernelImage* KernelImageNew(void);
 
 /* Deep free the contents of [image]. */
 void KernelImageFree(KernelImage* image);
 
@@ skipping 87 matching lines @@
                        int* kernel_len);
 
 /* Checks the signature on the kernel data at location [kernel_data_start].
  * The length of the actual kernel data is kernel _len and it is assumed to
  * be prepended with the signature whose size depends on the signature_algorithm
  * [algorithm].
  *
  * Return 0 on success, error code on failure.
  */
 int VerifyKernelData(RSAPublicKey* kernel_sign_key,
+                     const uint8_t* kernel_config_start,
                      const uint8_t* kernel_data_start,
                      int kernel_len,
                      int algorithm);
 
 /* Performs a chained verify of the kernel blob [kernel_blob]. If
  * [dev_mode] is 0 [inactive], then the pre-processed public signing key
  * [root_key_blob] is used to verify the signature of the signing key,
  * else the check is skipped.
  *
  * TODO(gauravsh): Does the dev mode only effect the R/W firmware verification,
@@ skipping 74 matching lines @@
  * BOOT_KERNEL_A_CONTINUE          Boot from Kenrel A
  * BOOT_KERNEL_B_CONTINUE          Boot from Kernel B
  * BOOT_KERNEL_RECOVERY_CONTINUE   Jump to recovery mode
  */
 int VerifyKernelDriver_f(uint8_t* firmware_key_blob,
                          kernel_entry* kernelA,
                          kernel_entry* kernelB,
                          int dev_mode);
 
 #endif  /* VBOOT_REFERENCE_KERNEL_IMAGE_H_ */