Upgrade to tpm-emulator version 0.7.

tpm/tpm_owner.c

-/* Software-Based Trusted Platform Module (TPM) Emulator for Linux
- * Copyright (C) 2004 Mario Strasser <mast@gmx.net>,
- *                    Swiss Federal Institute of Technology (ETH) Zurich
+/* Software-based Trusted Platform Module (TPM) Emulator
+ * Copyright (C) 2004-2010 Mario Strasser <mast@gmx.net>
  *
  * 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_owner.c 374 2010-02-16 14:00:35Z mast $
  */
 
 #include "tpm_emulator.h"
 #include "tpm_commands.h"
 #include "tpm_data.h"
 #include "tpm_handles.h"
 #include "crypto/rsa.h"
 
 /*
  * Admin Opt-in ([TPM_Part3], Section 5)
@@ skipping 191 matching lines @@
   /* set permanent flags */
   tpmData.permanent.flags.owned = FALSE;
   tpmData.permanent.flags.operator = FALSE;
   tpmData.permanent.flags.disableOwnerClear = FALSE;
   tpmData.permanent.flags.ownership = TRUE;
   tpmData.permanent.flags.disable = FALSE;
   tpmData.permanent.flags.deactivated = FALSE;
   tpmData.permanent.flags.maintenanceDone = FALSE;
   tpmData.permanent.flags.allowMaintenance = TRUE;
   tpmData.permanent.flags.disableFullDALogicInfo = FALSE;
-#ifdef TPM_KEEP_PUBEK_READABLE  
-  tpmData.permanent.flags.readPubek = TRUE;
-#else
-  tpmData.permanent.flags.readPubek = FALSE;
-#endif
+  if (tpmConf & TPM_CONF_KEEP_PUBEK_READABLE) {
+    tpmData.permanent.flags.readPubek = TRUE;
+  } else {
+    tpmData.permanent.flags.readPubek = FALSE;
+  }
   /* release all counters */
   for (i = 0; i < TPM_MAX_COUNTERS; i++)
     memset(&tpmData.permanent.data.counters[i], 0, sizeof(TPM_COUNTER_VALUE));
   /* invalidate family and delegates table */
   for (i = 0; i < TPM_NUM_FAMILY_TABLE_ENTRY; i++) {
     memset(&tpmData.permanent.data.familyTable.famRow[i], 0,
            sizeof(TPM_FAMILY_TABLE_ENTRY));
   }
   for (i = 0; i < TPM_NUM_DELEGATE_TABLE_ENTRY; i++) {
     memset(&tpmData.permanent.data.delegateTable.delRow[i], 0,
@@ skipping 75 matching lines @@
 
 TPM_RESULT TSC_ResetEstablishmentBit()
 {
   info("TSC_ResetEstablishmentBit()");
   /* locality must be three or four */
   if (tpmData.stany.flags.localityModifier != 3
       && tpmData.stany.flags.localityModifier != 4) return TPM_BAD_LOCALITY;
   /* as we do not have such a bit we do nothing and just return true */
   return TPM_SUCCESS;
 }