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

src/platform/vboot_reference/crypto/padding.c

Index: src/platform/vboot_reference/crypto/padding.c
diff --git a/src/platform/vboot_reference/crypto/padding.c b/src/platform/vboot_reference/crypto/padding.c
index 91424ba548e4e5ef4fa2dca1410beb8adcaeb3f1..5580d6efe94bf147106cc9259d625656a8f90e3d 100644
--- a/src/platform/vboot_reference/crypto/padding.c
+++ b/src/platform/vboot_reference/crypto/padding.c
@@ -5,7 +5,9 @@
  * arrays corresponding to various combinations of algorithms for RSA signatures.
  */
 
-#include "cryptolib.h"
+#include "rsa.h"
+#include "sha.h"
+
 
 /*
  * PKCS 1.5 padding (from the RSA PKCS#1 v2.1 standard)
@@ -168,21 +170,6 @@ RSA8192NUMBYTES - SHA256_DIGEST_SIZE,
 RSA8192NUMBYTES - SHA512_DIGEST_SIZE,
 };
 
-const int hash_type_map[] = {
-SHA1_DIGEST_ALGORITHM,
-SHA256_DIGEST_ALGORITHM,
-SHA512_DIGEST_ALGORITHM,
-SHA1_DIGEST_ALGORITHM,
-SHA256_DIGEST_ALGORITHM,
-SHA512_DIGEST_ALGORITHM,
-SHA1_DIGEST_ALGORITHM,
-SHA256_DIGEST_ALGORITHM,
-SHA512_DIGEST_ALGORITHM,
-SHA1_DIGEST_ALGORITHM,
-SHA256_DIGEST_ALGORITHM,
-SHA512_DIGEST_ALGORITHM,
-};
-
 const int hash_size_map[NUMALGORITHMS] = {
 SHA1_DIGEST_SIZE,
 SHA256_DIGEST_SIZE,
@@ -242,3 +229,4 @@ const char* algo_strings[NUMALGORITHMS] = {
 "RSA8192 SHA256",
 "RSA8192 SHA512",
 };
+