Switch to using .vbprivk for signing everything now.

host/lib/host_keyblock.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.
  *
  * Host functions for verified boot.
  */
 
 /* TODO: change all 'return 0', 'return 1' into meaningful return codes */
 
 #include "host_keyblock.h"
@@ skipping 60 matching lines @@
  * pointer, and must free it with Free().
  *
  * Returns NULL if error. */
 VbKeyBlockHeader* KeyBlockRead(const char* filename) {
 
   VbKeyBlockHeader* block;
   uint64_t file_size;
 
   block = (VbKeyBlockHeader*)ReadFile(filename, &file_size);
   if (!block) {
-    debug("Error reading key block file: %s\n", filename);
+    VBDEBUG(("Error reading key block file: %s\n", filename));
     return NULL;
   }
 
   /* Verify the hash of the key block, since we can do that without
    * the public signing key. */
   if (0 != KeyBlockVerify(block, file_size, NULL)) {
-    debug("Invalid key block file: filename\n", filename);
+    VBDEBUG(("Invalid key block file: filename\n", filename));
     Free(block);
     return NULL;
   }
 
   return block;
 }
 
 
 /* Write a key block to a file in .keyblock format. */
 int KeyBlockWrite(const char* filename, const VbKeyBlockHeader* key_block) {
 
   if (0 != WriteFile(filename, key_block, key_block->key_block_size)) {
-    debug("KeyBlockWrite() error writing key block\n");
+    VBDEBUG(("KeyBlockWrite() error writing key block\n"));
     return 1;
   }
 
   return 0;
 }