Added new commands and reactivated full rebuild after fixing for ARM ebuild.

firmware/lib/tpm_lite/tlcl.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.
  */
 
 /* A lightweight TPM command library.
  *
  * The general idea is that TPM commands are array of bytes whose
  * fields are mostly compile-time constant.  The goal is to build much
  * of the commands at compile time (or build time) and change some of
  * the fields at run time as needed.  The code in
  * utility/tlcl_generator.c builds structures containing the commands,
  * as well as the offsets of the fields that need to be set at run
  * time.
  */
 
 #include "sysincludes.h"
 #include "tlcl.h"
 #include "tlcl_internal.h"
 #include "tlcl_structures.h"
-#include "tss_constants.h"
+#include "tpmextras.h"
 #include "utility.h"
 
 /* Sets the size field of a TPM command. */
 static INLINE void SetTpmCommandSize(uint8_t* buffer, uint32_t size) {
   ToTpmUint32(buffer + sizeof(uint16_t), size);
 }
 
 /* Gets the size field of a TPM command. */
 POSSIBLY_UNUSED static INLINE int TpmCommandSize(const uint8_t* buffer) {
   uint32_t size;
@@ skipping 182 matching lines @@
 }
 
 uint32_t TlclSetDeactivated(uint8_t flag) {
   struct s_tpm_physicalsetdeactivated_cmd cmd;
   VBDEBUG(("TPM: SetDeactivated(%d)\n", flag));
   Memcpy(&cmd, &tpm_physicalsetdeactivated_cmd, sizeof(cmd));
   *(cmd.buffer + cmd.deactivated) = flag;
   return Send(cmd.buffer);
 }
 
-uint32_t TlclGetFlags(uint8_t* disable, uint8_t* deactivated, uint8_t *nvlocked) {
+uint32_t TlclGetPermanentFlags(TPM_PERMANENT_FLAGS* pflags) {
   uint8_t response[TPM_LARGE_ENOUGH_COMMAND_SIZE];
-  TPM_PERMANENT_FLAGS* pflags;
-  uint32_t result;
   uint32_t size;
-  VBDEBUG(("TPM: Get flags\n"));
-
-  result = TlclSendReceive(tpm_getflags_cmd.buffer, response, sizeof(response));
+  uint32_t result =
+    TlclSendReceive(tpm_getflags_cmd.buffer, response, sizeof(response));
   if (result != TPM_SUCCESS)
     return result;
-
   FromTpmUint32(response + kTpmResponseHeaderLength, &size);
   assert(size == sizeof(TPM_PERMANENT_FLAGS));
-  pflags =
-    (TPM_PERMANENT_FLAGS*) (response + kTpmResponseHeaderLength + sizeof(size));
-  VBDEBUG(("TPM: Got flags disable=%d, deactivated=%d, nvlocked=%d\n",
-           pflags->disable, pflags->deactivated, pflags->nvLocked));
-  if (disable)
-    *disable = pflags->disable;
-  if (deactivated)
-    *deactivated = pflags->deactivated;
-  if (nvlocked)
-    *nvlocked = pflags->nvLocked;
+  Memcpy(pflags,
+         response + kTpmResponseHeaderLength + sizeof(size),
+         sizeof(TPM_PERMANENT_FLAGS));
   return result;
 }
 
+uint32_t TlclGetSTClearFlags(TPM_STCLEAR_FLAGS* vflags) {
+  uint8_t response[TPM_LARGE_ENOUGH_COMMAND_SIZE];
+  uint32_t size;
+  uint32_t result =
+    TlclSendReceive(tpm_getstclearflags_cmd.buffer, response, sizeof(response));
+  if (result != TPM_SUCCESS)
+    return result;
+  FromTpmUint32(response + kTpmResponseHeaderLength, &size);
+  /* Ugly assertion, but the struct is padded up by one byte. */
+  assert(size == 7 && sizeof(TPM_STCLEAR_FLAGS) - 1 == 7);
+  Memcpy(vflags,
+         response + kTpmResponseHeaderLength + sizeof(size),
+         sizeof(TPM_STCLEAR_FLAGS));
+  return result;
+}
+
+uint32_t TlclGetFlags(uint8_t* disable,
+                      uint8_t* deactivated,
+                      uint8_t *nvlocked) {
+  TPM_PERMANENT_FLAGS pflags;
+  uint32_t result = TlclGetPermanentFlags(&pflags);
+  if (result == TPM_SUCCESS) {
+    if (disable)
+      *disable = pflags.disable;
+    if (deactivated)
+      *deactivated = pflags.deactivated;
+    if (nvlocked)
+      *nvlocked = pflags.nvLocked;
+    VBDEBUG(("TPM: Got flags disable=%d, deactivated=%d, nvlocked=%d\n",
+             pflags.disable, pflags.deactivated, pflags.nvLocked));
+  }
+  return result;
+}
+    
 uint32_t TlclSetGlobalLock(void) {
   uint32_t x;
   VBDEBUG(("TPM: Set global lock\n"));
   return TlclWrite(TPM_NV_INDEX0, (uint8_t*) &x, 0);
 }
 
 uint32_t TlclExtend(int pcr_num, uint8_t* in_digest, uint8_t* out_digest) {
   struct s_tpm_extend_cmd cmd;
   uint8_t response[kTpmResponseHeaderLength + kPcrDigestLength];
   uint32_t result;
@@ skipping 20 matching lines @@
   Memcpy(&cmd, &tpm_getpermissions_cmd, sizeof(cmd));
   ToTpmUint32(cmd.buffer + tpm_getpermissions_cmd.index, index);
   result = TlclSendReceive(cmd.buffer, response, sizeof(response));
   if (result != TPM_SUCCESS)
     return result;
 
   nvdata = response + kTpmResponseHeaderLength + sizeof(size);
   FromTpmUint32(nvdata + kNvDataPublicPermissionsOffset, permissions);
   return result;
 }