Switch to using .vbprivk for signing everything now.

host/lib/signature_digest.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.
  */
 
 #include "signature_digest.h"
 #define OPENSSL_NO_SHA
 #include <openssl/engine.h>
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
@@ skipping 13 matching lines @@
   Memcpy(p, digestinfo, digestinfo_size);
   Memcpy(p + digestinfo_size, digest, digest_size);
   return p;
 }
 
 uint8_t* SignatureDigest(const uint8_t* buf, uint64_t len, int algorithm) {
   uint8_t* info_digest  = NULL;
   uint8_t* digest = NULL;
 
   if (algorithm >= kNumAlgorithms) {
-    debug("SignatureDigest() called with invalid algorithm!\n");
+    VBDEBUG(("SignatureDigest() called with invalid algorithm!\n"));
   } else if ((digest = DigestBuf(buf, len, algorithm))) {
     info_digest = PrependDigestInfo(algorithm, digest);
   }
   Free(digest);
   return info_digest;
 }
 
 uint8_t* SignatureBuf(const uint8_t* buf, uint64_t len, const char* key_file,
                       int algorithm) {
   FILE* key_fp = NULL;
   RSA* key = NULL;
   uint8_t* signature = NULL;
   uint8_t* signature_digest = SignatureDigest(buf, len, algorithm);
   int signature_digest_len = (hash_size_map[algorithm] +
                               digestinfo_size_map[algorithm]);
   key_fp  = fopen(key_file, "r");
   if (!key_fp) {
-    debug("SignatureBuf(): Couldn't open key file: %s\n", key_file);
+    VBDEBUG(("SignatureBuf(): Couldn't open key file: %s\n", key_file));
     Free(signature_digest);
     return NULL;
   }
   if ((key = PEM_read_RSAPrivateKey(key_fp, NULL, NULL, NULL)))
     signature = (uint8_t*) Malloc(siglen_map[algorithm]);
   else
-    debug("SignatureBuf(): Couldn't read private key from file: %s\n",
-            key_file);
+    VBDEBUG(("SignatureBuf(): Couldn't read private key from file: %s\n",
+             key_file));
   if (signature) {
     if (-1 == RSA_private_encrypt(signature_digest_len,  /* Input length. */
                                   signature_digest,  /* Input data. */
                                   signature,  /* Output signature. */
                                   key,  /* Key to use. */
                                   RSA_PKCS1_PADDING))  /* Padding to use. */
-      debug("SignatureBuf(): RSA_private_encrypt() failed.\n");
+      VBDEBUG(("SignatureBuf(): RSA_private_encrypt() failed.\n"));
   }
   fclose(key_fp);
   if (key)
     RSA_free(key);
   Free(signature_digest);
   return signature;
 }