combined patch for:

src/platform/vboot_reference/crypto/genpadding.sh

 #!/bin/bash
 
 # 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.
 
 # Script to generate padding.c containing PKCS 1.5 padding byte arrays for
 # various combinations of RSA key lengths and message digest algorithms. 
 
 Pad_Preamble="0x00,0x01"
@@ skipping 30 matching lines @@
 /*
  * 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.
  */
 
 EOF
 
 
-echo '#include "rsa.h"'
-echo '#include "sha.h"'
+echo '#include "cryptolib.h"'
 echo
 echo
 cat <<EOF 
 /*
  * 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 102 matching lines @@
 for rsaalgo in ${RSAAlgos[@]}
 do
   for hashalgo in ${HashAlgos[@]}
   do
     echo ${rsaalgo}NUMBYTES - ${hashalgo}_DIGEST_SIZE,
   done
 done
 echo "};"
 echo
 
+# Generate signature algorithm to messge digest algorithm map.
+echo "const int hash_type_map[] = {"
+for rsaalgo in ${RSAAlgos[@]}
+do
+  for hashalgo in ${HashAlgos[@]}
+  do
+    echo ${hashalgo}_DIGEST_ALGORITHM,
+  done
+done
+echo "};"
+echo
+
 # Generate algorithm to message digest's output size map.
 echo "const int hash_size_map[NUMALGORITHMS] = {"
 for rsaalgo in ${RSAAlgos[@]}
 do
   for hashalgo in ${HashAlgos[@]}
   do
     echo ${hashalgo}_DIGEST_SIZE,
   done
 done
 echo "};"
@@ skipping 30 matching lines @@
 do
   for hashalgo in ${HashAlgos[@]}
   do
     echo \"${rsaalgo} ${hashalgo}\",
   done
 done
 echo "};"
 echo
 
 #echo "#endif  /* VBOOT_REFERENCE_PADDING_H_ */"