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

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 38 matching lines @@
           "KernelImage Config Tamper Verification (Trusted)");
   image->options.kernel_load_addr = 0;
 
   image->kernel_data[0] = 'T';
   TEST_EQ(VerifyKernelImage(firmware_key, image, DEV_MODE_ENABLED),
           VERIFY_KERNEL_SIGNATURE_FAILED,
           "KernelImage Tamper Verification (Dev Mode)");
   TEST_EQ(VerifyKernelImage(firmware_key, image, DEV_MODE_DISABLED),
           VERIFY_KERNEL_SIGNATURE_FAILED,
           "KernelImage Tamper Verification (Trusted)");
-  image->kernel_data[0] = 'F';
+  image->kernel_data[0] = 'K';
 
   image->kernel_key_signature[0] = 0xFF;
   image->kernel_key_signature[1] = 0x00;
   TEST_EQ(VerifyKernelImage(firmware_key, image, DEV_MODE_ENABLED),
           VERIFY_KERNEL_SUCCESS,
           "KernelImage Key Signature Tamper Verification (Dev Mode)");
   TEST_EQ(VerifyKernelImage(firmware_key, image, DEV_MODE_DISABLED),
           VERIFY_KERNEL_KEY_SIGNATURE_FAILED,
           "KernelImage Key Signature Tamper Verification (Trusted)");
 }
@@ skipping 33 matching lines @@
     goto failure;
   }
 
   image = GenerateTestKernelImage(atoi(argv[1]),
                                   atoi(argv[2]),
                                   kernel_sign_key_buf,
                                   1,  /* Kernel Key Version */
                                   1,  /* Kernel Version */
                                   1000,  /* Kernel Size */
                                   firmware_key_file,
-                                  kernel_key_file);
+                                  kernel_key_file,
+                                  'K');
   if (!image) {
     error_code = 1;
     goto failure;
   }
 
   kernel_blob = GetKernelBlob(image, &kernel_blob_len);
 
   /* Test Kernel blob verify operations. */
   VerifyKernelTest(kernel_blob, firmware_key_blob);
 
   /* Test KernelImage verify operations. */
   VerifyKernelImageTest(image, firmware_key);
   VerifyKernelImageTamperTest(image, firmware_key);
 
   if (!gTestSuccess)
     error_code = 255;
 
 failure:
   Free(kernel_blob);
   KernelImageFree(image);
   Free(kernel_sign_key_buf);
   Free(firmware_key_blob);
   RSAPublicKeyFree(firmware_key);
 
   return error_code;
 }