Refactor rollback interface for LoadKernel(), LoadFirmware().

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 "load_firmware_fw.h"
 #include "rollback_index.h"
@@ skipping 40 matching lines @@
   debug("LoadFirmware started...\n");
 
   /* Must have a root key */
   if (!root_key) {
     debug("No root key\n");
     return LOAD_FIRMWARE_RECOVERY;
   }
 
   /* Initialize the TPM and read rollback indices. */
   /* TODO: fix SetupTPM parameter for developer mode */
-  if (0 != SetupTPM(RO_NORMAL_MODE, 0)) {
-    debug("SetupTPM failed\n");
-    return LOAD_FIRMWARE_RECOVERY;
-  }
-  if (0 != GetStoredVersions(FIRMWARE_VERSIONS,
-                             &tpm_key_version, &tpm_fw_version)) {
+  if (0 != RollbackFirmwareSetup(0, &tpm_key_version, &tpm_fw_version)) {
     debug("Unable to get stored versions.\n");
     return LOAD_FIRMWARE_RECOVERY;
   }
 
   /* Allocate our internal data */
   lfi = (VbLoadFirmwareInternal*)Malloc(sizeof(VbLoadFirmwareInternal));
   if (!lfi)
     return LOAD_FIRMWARE_RECOVERY;
   params->load_firmware_internal = (uint8_t*)lfi;
 
@@ skipping 133 matching lines @@
   Free(lfi);
   params->load_firmware_internal = NULL;
 
   /* Handle finding good firmware */
   if (good_index >= 0) {
 
     /* Update TPM if necessary */
     if ((lowest_key_version > tpm_key_version) ||
         (lowest_key_version == tpm_key_version &&
          lowest_fw_version > tpm_fw_version)) {
-      if (0 != WriteStoredVersions(FIRMWARE_VERSIONS,
-                                   (uint16_t)lowest_key_version,
-                                   (uint16_t)lowest_fw_version)) {
+      if (0 != RollbackFirmwareWrite((uint16_t)lowest_key_version,
+                                     (uint16_t)lowest_fw_version)) {
         debug("Unable to write stored versions.\n");
         return LOAD_FIRMWARE_RECOVERY;
       }
     }
 
-    /* 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()) {
+    /* Lock firmware versions in TPM */
+    if (0 != RollbackFirmwareLock()) {
       debug("Unable to lock firmware versions.\n");
       return LOAD_FIRMWARE_RECOVERY;
     }
 
     /* Success */
     debug("Will boot firmware index %d\n", (int)params->firmware_index);
     return LOAD_FIRMWARE_SUCCESS;
   }
 
   /* If we're still here, no good firmware, so go to recovery mode. */
   debug("Alas, no good firmware.\n");
   return LOAD_FIRMWARE_RECOVERY;
 }