Many upgrades to tpm_lite.

src/platform/tpm_lite/src/tlcl/generator.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.
  */
 
 /* This program generates partially filled TPM datagrams and other compile-time
  * constants (e.g. structure sizes and offsets).  Compile this file---and ONLY
  * this file---with -fpack-struct.  We take advantage of the fact that the
  * (packed) TPM structures layout (mostly) match the TPM request and response
  * datagram layout.  When they don't completely match, some fixing is necessary
  * (see PCR_SELECTION_FIX below).
  */
 
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <tss/tcs.h>
 
+#include "tlcl.h"
 #include "tlcl_internal.h"
 #include "tpmextras.h"
 
 /* See struct Command below.  This structure represent a field in a TPM
  * command.  [name] is the field name.  [visible] is true if the field is
  * modified by the run-time.  Non-visible fields are initialized at build time
  * and remain constant.  [size] is the field size in bytes.  [value] is the
  * fixed value of non-visible fields.
  */
 typedef struct Field {
@@ skipping 160 matching lines @@
   return cmd;
 }
 
 Command* BuildSelftestfullCommand(void) {
   int size = kTpmRequestHeaderLength + sizeof(TPM_PHYSICAL_PRESENCE);
   Command* cmd = newCommand(TPM_ORD_SelfTestFull, size);
   cmd->name = "tpm_selftestfull_cmd";
   return cmd;
 }
 
+Command* BuildReadPubekCommand(void) {
+  int size = kTpmRequestHeaderLength + sizeof(TPM_NONCE);
+  Command* cmd = newCommand(TPM_ORD_ReadPubek, size);
+  cmd->name = "tpm_readpubek_cmd";
+  return cmd;  
+}
+
 /* Output the fields of a structure.
  */
 void OutputFields(Field* fld) {
   /*
    * Field order is reversed.
    */
   if (fld != NULL) {
     OutputFields(fld->next);
     if (fld->visible) {
       printf("  uint8_t* %s;\n", fld->name);
@@ skipping 82 matching lines @@
   OutputCommands(cmd->next);
 }
 
 Command* (*builders[])(void) = {
   BuildDefineSpaceCommand,
   BuildWriteCommand,
   BuildReadCommand,
   BuildPhysicalPresenceCommand,
   BuildStartupCommand,
   BuildSelftestfullCommand,
+  BuildReadPubekCommand,
 };
 
 static void FreeFields(Field* fld) {
   if (fld != NULL) {
     Field* next_field = fld->next;
     free(fld);
     FreeFields(next_field);
   }
 }
 
 static void FreeCommands(Command* cmd) {
   if (cmd != NULL) {
     Command* next_command = cmd->next;
     free(cmd);
+    FreeFields(cmd->fields);
     FreeCommands(next_command);
   }
 }
 
 int main(void) {
   Command* commands = NULL;
   int i;
   for (i = 0; i < sizeof(builders) / sizeof(builders[0]); i++) {
     Command* cmd = builders[i]();
     cmd->next = commands;
     commands = cmd;
   }
 
   printf("/* This file is automatically generated */\n\n");
   OutputCommands(commands);
-  printf("const int kWriteInfoLength = %ld;\n", sizeof(TPM_WRITE_INFO));
+  printf("const int kWriteInfoLength = %d;\n", (int) sizeof(TPM_WRITE_INFO));
 
   FreeCommands(commands);
   return 0;
 }