Upgrade to tpm-emulator version 0.7.

tpm/tpm_structures.h

-/* Software-Based Trusted Platform Module (TPM) Emulator for Linux
- * Copyright (C) 2004 Mario Strasser <mast@gmx.net>,
- *                    Swiss Federal Institute of Technology (ETH) Zurich
- *               2006, 2007 Heiko Stamer <stamer@gaos.org>
+/* Software-based Trusted Platform Module (TPM) Emulator
+ * Copyright (C) 2004-2010 Mario Strasser <mast@gmx.net>
+ *               2005-2008 Heiko Stamer <stamer@gaos.org>
  *
  * This module is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published
  * by the Free Software Foundation; either version 2 of the License,
  * or (at your option) any later version.
  *
  * This module is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * $Id$
+ * $Id: tpm_structures.h 367 2010-02-13 15:52:18Z mast $
  */
 
 #ifndef _TPM_STRUCTURES_H_
 #define _TPM_STRUCTURES_H_
 
 #include "tpm_emulator.h"
 #include "crypto/rsa.h"
 
 /*
  * The following types and structures are specified in
@@ skipping 116 matching lines @@
 #define TPM_ET_DATA             0x03
 #define TPM_ET_SRK              0x04
 #define TPM_ET_KEY              0x05
 #define TPM_ET_REVOKE           0x06
 #define TPM_ET_DEL_OWNER_BLOB   0x07
 #define TPM_ET_DEL_ROW          0x08
 #define TPM_ET_DEL_KEY_BLOB     0x09
 #define TPM_ET_COUNTER          0x0A
 #define TPM_ET_NV               0x0B
 #define TPM_ET_OPERATOR         0x0C
+#define TPM_ET_VERIFICATION_AUTH 0x0D
 #define TPM_ET_RESERVED_HANDLE  0x40
 /* MSB Values */
 #define TPM_ET_XOR              0x00
 #define TPM_ET_AES128_CTR       0x06
 
 /*
  * Reserved Key Handles ([TPM_Part2], Section 4.4.1)
  * These values specify specific keys or specific actions for the TPM.
  */
 #define TPM_KH_SRK              0x40000000
@@ skipping 2066 matching lines @@
     if (s->keys[i].payload != TPM_PT_NONE)
       size += sizeof_TPM_KEY_DATA((s->keys[i]));
     else
       size += 1;
   }
   size += TPM_NUM_TIS_TIMEOUTS * 4;
   size += TPM_NUM_CMD_DURATIONS * 4;
   return size;
 }
 
+static inline void free_TPM_PERMANENT_DATA(TPM_PERMANENT_DATA *s)
+{
+  int i;
+  /* release the EK, SRK as well as all other rsa keys */
+  if (s->endorsementKey.size > 0) tpm_rsa_release_private_key(&s->endorsementKey);
+  if (s->srk.payload) free_TPM_KEY_DATA(s->srk);
+  if (s->manuMaintPub.valid) free_TPM_PUBKEY_DATA(s->manuMaintPub);
+  for (i = 0; i < TPM_MAX_KEYS; i++)
+    if (s->keys[i].payload) free_TPM_KEY_DATA(s->keys[i]);
+}
+
 /*
  * TPM_STCLEAR_DATA ([TPM_Part2], Section 7.5)
  * Most of the data in this structure resets on TPM_Startup(ST_Clear).
  *
  * This is an informative structure and not normative.
  */
 #define TPM_TAG_STCLEAR_DATA 0x0023
 typedef struct tdTPM_STCLEAR_DATA {
   TPM_STRUCTURE_TAG tag;
   TPM_NONCE contextNonceKey;
@@ skipping 91 matching lines @@
   } permanent;
   struct {
     TPM_STCLEAR_FLAGS flags;
     TPM_STCLEAR_DATA data;
   } stclear;
   struct {
     TPM_STANY_FLAGS flags;
     TPM_STANY_DATA data;
   } stany;
 } TPM_DATA;
+#define sizeof_TPM_DATA(s) ( \
+  sizeof_TPM_PERMANENT_FLAGS(s.permanent.flags) + 2 \
+  + sizeof_TPM_PERMANENT_DATA(&s.permanent.data) \
+  + sizeof_TPM_STCLEAR_FLAGS(s.stclear.flags) \
+  + sizeof_TPM_STCLEAR_DATA(s.stclear.data) \
+  + sizeof_TPM_STANY_DATA(s.stany.data))
+#define free_TPM_DATA(s) { free_TPM_PERMANENT_DATA(&s.permanent.data); }
 
 /*
  * Context Structures
  */
 
 /*
  * TPM_CONTEXT_BLOB ([TPM_Part2], Section 18.1)
  * This is the header for the wrapped context. The blob contains all
  * information necessary to reload the context back into the TPM.
  */
@@ skipping 62 matching lines @@
   TPM_TAG tag;
   UINT32 size;
   TPM_RESULT result;
   BYTE *param;
   UINT32 paramSize;
   TPM_AUTH *auth1;
   TPM_AUTH *auth2;
 } TPM_RESPONSE;
 
 #endif /* _TPM_STRUCTURES_H_ */