combined patch for:

src/platform/vboot_reference/crypto/rsa.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.
  */
 
 /* Implementation of RSA signature verification which uses a pre-processed
  * key for computation. The code extends Android's RSA verification code to
  * support multiple RSA key lengths and hash digest algorithms.
  */
 
-#include <stdio.h>
-
-#include "padding.h"
-#include "rsa.h"
+#include "cryptolib.h"
 #include "utility.h"
 
 /* a[] -= mod */
 static void subM(const RSAPublicKey *key, uint32_t *a) {
   int64_t A = 0;
   int i;
   for (i = 0; i < key->len; ++i) {
     A += (uint64_t)a[i] - key->n[i];
     a[i] = (uint32_t)A;
     A >>= 32;
@@ skipping 106 matching lines @@
               const uint8_t *sig,
               const int sig_len,
               const uint8_t sig_type,
               const uint8_t *hash) {
   int i;
   uint8_t* buf;
   const uint8_t* padding;
   int success = 1;
 
   if (sig_len != (key->len * sizeof(uint32_t))) {
-    fprintf(stderr, "Signature is of incorrect length!\n");
+    debug("Signature is of incorrect length!\n");
     return 0;
   }
 
   if (sig_type >= kNumAlgorithms) {
-    fprintf(stderr, "Invalid signature type!\n");
+    debug("Invalid signature type!\n");
     return 0;
   }
 
   if (key->len != siglen_map[sig_type] / sizeof(uint32_t)) {
-    fprintf(stderr, "Wrong key passed in!\n");
+    debug("Wrong key passed in!\n");
     return 0;
   }
 
   buf = (uint8_t*) Malloc(sig_len);
   Memcpy(buf, sig, sig_len);
 
   modpowF4(key, buf);
 
   /* Determine padding to use depending on the signature type. */
   padding = padding_map[sig_type];
 
   /* Check pkcs1.5 padding bytes. */
   for (i = 0; i < padding_size_map[sig_type]; ++i) {
     if (buf[i] != padding[i]) {
 #ifndef NDEBUG
 /* TODO(gauravsh): Replace with a macro call for logging. */
-      fprintf(stderr, "Padding: Expecting = %02x Got = %02x\n", padding[i],
+      debug("Padding: Expecting = %02x Got = %02x\n", padding[i],
               buf[i]);
 #endif
       success = 0;
     }
   }
 
   /* Check if digest matches. */
   for (; i < sig_len; ++i) {
     if (buf[i] != *hash++) {
 #ifndef NDEBUG
 /* TODO(gauravsh): Replace with a macro call for logging. */
-      fprintf(stderr, "Digest: Expecting = %02x Got = %02x\n", padding[i],
+      debug("Digest: Expecting = %02x Got = %02x\n", padding[i],
               buf[i]);
 #endif
       success = 0;
     }
   }
 
   Free(buf);
 
   return success;
 }