combined patch for:

src/platform/vboot_reference/tests/kernel_splicing_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.
  *
  * Splicing tests for the kernel image verification library.
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "cryptolib.h"
 #include "file_keys.h"
 #include "kernel_image.h"
-#include "padding.h"
-#include "rsa_utility.h"
 #include "test_common.h"
 #include "utility.h"
 
 #define FIRMWARE_KEY_BASE_NAME "testkeys/key_rsa2048"
 #define KERNEL_KEY_BASE_NAME "testkeys/key_rsa1024"
 
 const char* kFirmwareKeyPublicFile = FIRMWARE_KEY_BASE_NAME ".keyb";
 const char* kFirmwareKeyFile = FIRMWARE_KEY_BASE_NAME ".pem";
 const char* kKernelKeyPublicFile = KERNEL_KEY_BASE_NAME ".keyb";
 const char* kKernelKeyFile = KERNEL_KEY_BASE_NAME ".pem";
@@ skipping 51 matching lines @@
 }
 
 int main(int argc, char* argv[])
 {
   int error_code = 0;
   VerifyKernelSplicingTest();
   if (!gTestSuccess)
     error_code = 255;
   return error_code;
 }