Import recent tpm_lite changes that make all TPM commands return a status.

vboot_firmware/lib/firmware_image_fw.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.
  *
  * Functions for verifying a verified boot firmware image.
  * (Firmware Portion)
  */
 
 #include "firmware_image_fw.h"
 
 #include "cryptolib.h"
 #include "rollback_index.h"
+#include "tss_constants.h"
 #include "utility.h"
 
 /* Macro to determine the size of a field structure in the FirmwareImage
  * structure. */
 #define FIELD_LEN(field) (sizeof(((FirmwareImage*)0)->field))
 
 char* kVerifyFirmwareErrors[VERIFY_FIRMWARE_MAX] = {
   "Success.",
   "Invalid Image.",
   "Root Key Signature Failed.",
@@ skipping 280 matching lines @@
                             (uint16_t) (min_lversion & 0xFFFF));
         stored_lversion = min_lversion;  /* Update stored version as it's used
                                           * later. */
       }
     }
   }
   /* 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.
    */
-  LockFirmwareVersions();
+  if (TPM_SUCCESS != LockFirmwareVersions()) {
+    return VERIFY_FIRMWARE_TPM_ERROR;
+  }
 
   /* Determine which firmware (if any) to jump to.
    *
    * We always attempt to jump to FirmwareA first. If verification of FirmwareA
    * fails, we try FirmwareB. In all cases, if the firmware successfully
    * verified but is a rollback, we jump to recovery.
    *
    * Note: This means that if FirmwareA verified successfully and is a
    * rollback, then no attempt is made to check FirmwareB. We still jump to
    * recovery. FirmwareB is only used as a backup in case FirmwareA gets
@@ skipping 12 matching lines @@
      */
     if (stored_lversion <= firmwareB_lversion &&
         (VERIFY_FIRMWARE_SUCCESS == VerifyFirmware(root_key_blob,
                                                    verification_headerB,
                                                    firmwareB)))
         return BOOT_FIRMWARE_B_CONTINUE;
   }
   /* D'oh: No bootable firmware. */
   return BOOT_FIRMWARE_RECOVERY_CONTINUE;
 }