Revert "VBoot Reference: Refactor Part 2 - Crypto Libraries"

src/platform/vboot_reference/utils/firmware_utility.cc

 // 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.
 //
 // Utility for manipulating verified boot firmware images.
 //
 
 #include "firmware_utility.h"
 
 #include <errno.h>
 #include <getopt.h>
 #include <stdio.h>
 #include <stdint.h>  // Needed for UINT16_MAX.
 #include <stdlib.h>
 #include <unistd.h>
 
 #include <iostream>
 
 extern "C" {
-#include "cryptolib.h"
 #include "file_keys.h"
 #include "firmware_image.h"
+#include "padding.h"
+#include "rsa_utility.h"
+#include "sha_utility.h"
 #include "utility.h"
 }
 
 extern int errno;
 using std::cerr;
 
 namespace vboot_reference {
 
 FirmwareUtility::FirmwareUtility():
     image_(NULL),
@@ skipping 271 matching lines @@
   }
   if (fu.is_verify()) {
     cerr << "Verification ";
     if (fu.VerifySignedImage())
       cerr << "SUCCESS.\n";
     else
       cerr << "FAILURE.\n";
   }
   return 0;
 }