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

src/platform/vboot_reference/tests/sha_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.
  */
 
 /* FIPS 180-2 Tests for message digest functions. */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "cryptolib.h"
+#include "sha.h"
+
 #include "sha_test_vectors.h"
 
 int SHA1_tests(void) {
   int i, success = 1;
   uint8_t sha1_digest[SHA1_DIGEST_SIZE];
   uint8_t* test_inputs[3];
   test_inputs[0] = (uint8_t *) oneblock_msg;
   test_inputs[1] = (uint8_t *) multiblock_msg1;
   test_inputs[2] = (uint8_t *) long_msg;
 
@@ skipping 66 matching lines @@
     success = 0;
   if (!SHA256_tests())
     success = 0;
   if (!SHA512_tests())
     success = 0;
 
   free(long_msg);
 
   return !success;
 }