Added TPM command to read space permissions, and a correctness test.

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
@@ skipping 234 matching lines @@
 
 Command* BuildExtendCommand(void) {
   int size = kTpmRequestHeaderLength + sizeof(uint32_t) + kPcrDigestLength;
   Command* cmd = newCommand(TPM_ORD_Extend, size);
   cmd->name = "tpm_extend_cmd";
   AddVisibleField(cmd, "pcrNum", kTpmRequestHeaderLength);
   AddVisibleField(cmd, "inDigest", kTpmRequestHeaderLength + sizeof(uint32_t));
   return cmd;  
 }
 
-Command* BuildGetCapabilityCommand(void) {
+Command* BuildGetFlagsCommand(void) {
   int size = (kTpmRequestHeaderLength +
               sizeof(TPM_CAPABILITY_AREA) +   /* capArea */
               sizeof(uint32_t) +              /* subCapSize */
-              sizeof(uint32_t));               /* subCap */
+              sizeof(uint32_t));              /* subCap */
     
   Command* cmd = newCommand(TPM_ORD_GetCapability, size);
-  cmd->name = "tpm_getcapability_cmd";
+  cmd->name = "tpm_getflags_cmd";
   AddInitializedField(cmd, kTpmRequestHeaderLength,
                       sizeof(TPM_CAPABILITY_AREA), TPM_CAP_FLAG);
   AddInitializedField(cmd, kTpmRequestHeaderLength +
                       sizeof(TPM_CAPABILITY_AREA),
                       sizeof(uint32_t), sizeof(uint32_t));
   AddInitializedField(cmd, kTpmRequestHeaderLength +
                       sizeof(TPM_CAPABILITY_AREA) + sizeof(uint32_t),
                       sizeof(uint32_t), TPM_CAP_FLAG_PERMANENT);
   return cmd;  
 }
 
+Command* BuildGetPermissionsCommand(void) {
+  int size = (kTpmRequestHeaderLength +
+              sizeof(TPM_CAPABILITY_AREA) +   /* capArea */
+              sizeof(uint32_t) +              /* subCapSize */
+              sizeof(uint32_t));              /* subCap */
+    
+  Command* cmd = newCommand(TPM_ORD_GetCapability, size);
+  cmd->name = "tpm_getpermissions_cmd";
+  AddInitializedField(cmd, kTpmRequestHeaderLength,
+                      sizeof(TPM_CAPABILITY_AREA), TPM_CAP_NV_INDEX);
+  AddInitializedField(cmd, kTpmRequestHeaderLength +
+                      sizeof(TPM_CAPABILITY_AREA),
+                      sizeof(uint32_t), sizeof(uint32_t));
+  AddVisibleField(cmd, "index", kTpmRequestHeaderLength +
+                  sizeof(TPM_CAPABILITY_AREA) + sizeof(uint32_t));
+  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 88 matching lines @@
   BuildReadCommand,
   BuildPPAssertCommand,
   BuildPPLockCommand,
   BuildStartupCommand,
   BuildSelftestfullCommand,
   BuildContinueSelfTestCommand,
   BuildReadPubekCommand,
   BuildForceClearCommand,
   BuildPhysicalEnableCommand,
   BuildPhysicalSetDeactivatedCommand,
-  BuildGetCapabilityCommand,
+  BuildGetFlagsCommand,
+  BuildGetPermissionsCommand,
   BuildExtendCommand,
 };
 
 static void FreeFields(Field* fld) {
   if (fld != NULL) {
     Field* next_field = fld->next;
     free(fld);
     FreeFields(next_field);
   }
 }
@@ skipping 12 matching lines @@
   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 = %d;\n", (int) sizeof(TPM_WRITE_INFO));
+  printf("const int kNvDataPublicPermissionsOffset = %d;\n",
+         (int) (offsetof(TPM_NV_DATA_PUBLIC, permission) +
+                2 * PCR_SELECTION_FIX +
+                offsetof(TPM_NV_ATTRIBUTES, attributes)));
 
   FreeCommands(commands);
   return 0;
 }