combined patch for:

src/platform/vboot_reference/tests/firmware_rollback_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 checking firmware rollback-prevention logic.
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "cryptolib.h"
 #include "file_keys.h"
 #include "firmware_image.h"
-#include "rsa_utility.h"
 #include "utility.h"
 #include "rollback_index.h"
 #include "test_common.h"
 
 const char* kRootKeyPublicFile = "testkeys/key_rsa8192.keyb";
 
 /* Tests that check for correctness of the VerifyFirmwareDriver_f() logic
  * and rollback prevention. */
 void VerifyFirmwareDriverTest(void) {
   uint8_t* valid_firmwareA = NULL;
@@ skipping 46 matching lines @@
   Free(corrupt_firmwareB);
 }
 
 int main(int argc, char* argv[]) {
   int error_code = 0;
   VerifyFirmwareDriverTest();
   if (!gTestSuccess)
     error_code = 255;
   return error_code;
 }