Upgrade to tpm-emulator version 0.7.

tpm/tpm_owner.c

Index: tpm/tpm_owner.c
diff --git a/tpm/tpm_owner.c b/tpm/tpm_owner.c
index 19b81d534029824ce04648216a6646aa692976b7..50eb0b5c70cb09703badaa756c32a6ebd67ccbf8 100644
--- a/tpm/tpm_owner.c
+++ b/tpm/tpm_owner.c
@@ -1,6 +1,5 @@
-/* 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
@@ -12,7 +11,7 @@
  * 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"
@@ -224,11 +223,11 @@ void tpm_owner_clear()
   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));