combined patch for:

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 5580d6efe94bf147106cc9259d625656a8f90e3d..14d944583acf84e348f0f5019183714517ff2d18 100644
--- a/src/platform/vboot_reference/crypto/padding.c
+++ b/src/platform/vboot_reference/crypto/padding.c
@@ -5,8 +5,7 @@
  * arrays corresponding to various combinations of algorithms for RSA signatures.
  */
 
-#include "rsa.h"
-#include "sha.h"
+#include "cryptolib.h"
 
 
 /*
@@ -170,6 +169,21 @@ 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,