Clean up of key block functions

vboot_firmware/lib/vboot_firmware.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.
  *
  * High-level firmware API for loading and verifying rewritable firmware.
  * (Firmware portion)
  */
 
 #include "vboot_firmware.h"
 
@@ skipping 46 matching lines @@
     uint64_t body_size;
 
     /* Verify the key block */
     if (0 == index) {
       key_block = (VbKeyBlockHeader*)params->verification_block_0;
       vblock_size = params->verification_size_0;
     } else {
       key_block = (VbKeyBlockHeader*)params->verification_block_1;
       vblock_size = params->verification_size_1;
     }
-    if ((0 != VerifyKeyBlock(key_block, vblock_size, root_key)))
+    if ((0 != KeyBlockVerify(key_block, vblock_size, root_key)))
       continue;
 
     /* Check for rollback of key version. */
     key_version = key_block->data_key.key_version;
     if (key_version < tpm_key_version)
       continue;
 
     /* Get the key for preamble/data verification from the key block. */
     data_key = PublicKeyToRSA(&key_block->data_key);
     if (!data_key)
@@ skipping 86 matching lines @@
     /* Lock Firmware TPM rollback indices from further writes.  In
      * this design, this is done by setting the globalLock bit, which
      * is cleared only by TPM_Init at reboot.  */
     if (0 != LockFirmwareVersions())
       return LOAD_FIRMWARE_RECOVERY;
   }
 
   /* If we're still here, no good firmware, so go to recovery mode. */
   return LOAD_FIRMWARE_RECOVERY;
 }