combined patch for:

src/platform/vboot_reference/tests/firmware_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 firmware image library.
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "cryptolib.h"
 #include "file_keys.h"
 #include "firmware_image.h"
-#include "rsa_utility.h"
 #include "test_common.h"
 #include "utility.h"
 
 /* Normal Firmware Blob Verification Tests. */
 void VerifyFirmwareTest(uint8_t* firmware_blob, uint8_t* root_key_blob) {
   TEST_EQ(VerifyFirmware(root_key_blob, firmware_blob),
           VERIFY_FIRMWARE_SUCCESS,
           "Normal Firmware Blob Verification");
 }
 
@@ skipping 79 matching lines @@
 
 failure:
   Free(firmware_blob);
   FirmwareImageFree(image);
   Free(firmware_sign_key_buf);
   Free(root_key_blob);
   RSAPublicKeyFree(root_key_pub);
 
   return error_code;
 }