Fix KeyBlockVerify() to take an explicit param for whether to use hash only.

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"
 
 #include "cryptolib.h"
 #include "host_common.h"
 #include "utility.h"
 #include "vboot_common.h"
 
 
 VbKeyBlockHeader* KeyBlockCreate(const VbPublicKey* data_key,
                                  const VbPrivateKey* signing_key,
                                  uint64_t flags) {
 
   VbKeyBlockHeader* h;
   uint64_t signed_size = sizeof(VbKeyBlockHeader) + data_key->key_size;
   uint64_t block_size = (signed_size + SHA512_DIGEST_SIZE +
-                         (signing_key ? siglen_map[signing_key->algorithm] : 0));
+                         (signing_key ?
+                          siglen_map[signing_key->algorithm] : 0));
   uint8_t* data_key_dest;
   uint8_t* block_sig_dest;
   uint8_t* block_chk_dest;
   VbSignature *sigtmp;
 
   /* Allocate key block */
   h = (VbKeyBlockHeader*)Malloc(block_size);
   if (!h)
     return NULL;
   data_key_dest = (uint8_t*)(h + 1);
@@ skipping 46 matching lines @@
   uint64_t file_size;
 
   block = (VbKeyBlockHeader*)ReadFile(filename, &file_size);
   if (!block) {
     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)) {
+  if (0 != KeyBlockVerify(block, file_size, NULL, 1)) {
     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)) {
     VBDEBUG(("KeyBlockWrite() error writing key block\n"));
     return 1;
   }
 
   return 0;
 }