combined patch for:

src/platform/vboot_reference/tests/firmware_verify_benchmark.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.
  *
  * Timing benchmark for verifying a firmware image.
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "cryptolib.h"
 #include "file_keys.h"
 #include "firmware_image.h"
-#include "padding.h"
-#include "rsa_utility.h"
 #include "test_common.h"
 #include "timer_utils.h"
 #include "utility.h"
 
 #define FILE_NAME_SIZE 128
 #define NUM_OPERATIONS 100  /* Number of verify operations to time. */
 
 #define FIRMWARE_SIZE_SMALL 512000
 #define FIRMWARE_SIZE_MEDIUM 1024000
 #define FIRMWARE_SIZE_LARGE 4096000
@@ skipping 97 matching lines @@
 
 
 int main(int argc, char* argv[]) {
   int i, error_code = 0;
   for (i = 0; i < kNumAlgorithms; ++i) {
     if (0 != (error_code = SpeedTestAlgorithm(i)))
       return error_code;
   }
   return 0;
 }