combined patch for:

src/platform/vboot_reference/crypto/padding.c

 /*
  * DO NOT MODIFY THIS FILE DIRECTLY.
  *
  * This file is automatically generated by genpadding.sh and contains padding
  * arrays corresponding to various combinations of algorithms for RSA signatures.
  */
 
-#include "rsa.h"
-#include "sha.h"
+#include "cryptolib.h"
 
 
 /*
  * PKCS 1.5 padding (from the RSA PKCS#1 v2.1 standard)
  *
  * Depending on the RSA key size and hash function, the padding is calculated
  * as follows:
  *
  * 0x00 || 0x01 || PS || 0x00 || T
  *
@@ skipping 143 matching lines @@
 RSA2048NUMBYTES - SHA256_DIGEST_SIZE,
 RSA2048NUMBYTES - SHA512_DIGEST_SIZE,
 RSA4096NUMBYTES - SHA1_DIGEST_SIZE,
 RSA4096NUMBYTES - SHA256_DIGEST_SIZE,
 RSA4096NUMBYTES - SHA512_DIGEST_SIZE,
 RSA8192NUMBYTES - SHA1_DIGEST_SIZE,
 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,
 SHA512_DIGEST_SIZE,
 SHA1_DIGEST_SIZE,
 SHA256_DIGEST_SIZE,
 SHA512_DIGEST_SIZE,
 SHA1_DIGEST_SIZE,
 SHA256_DIGEST_SIZE,
 SHA512_DIGEST_SIZE,
@@ skipping 40 matching lines @@
 "RSA2048 SHA256",
 "RSA2048 SHA512",
 "RSA4096 SHA1",
 "RSA4096 SHA256",
 "RSA4096 SHA512",
 "RSA8192 SHA1",
 "RSA8192 SHA256",
 "RSA8192 SHA512",
 };