combined patch for:

src/platform/vboot_reference/tests/kernel_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 "kernel_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 30  /* Number of verify operations to time.
                             * We use a smaller number here (30 vs. 100)
                             * since there are many more cases to consider
                             * (one for each combination of firmware and kernel
@@ skipping 125 matching lines @@
       if (siglen_map[j] > siglen_map[i])
         continue;
       if (siglen_map[j] == siglen_map[i] && hash_size_map[j] > hash_size_map[i])
         continue;
       if (0 != (error_code = SpeedTestAlgorithm(i, j)))
         return error_code;
     }
   }
   return 0;
 }