Upgrade to tpm-emulator version 0.7.

tpm/tpm_startup.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_startup.c 367 2010-02-13 15:52:18Z mast $
  */
 
 #include "tpm_emulator.h"
 #include "tpm_commands.h"
 #include "tpm_data.h"
 #include "tpm_handles.h"
 
 /*
  * Admin Startup and State ([TPM_Part3], Section 3)
  * This section describes the commands that start a TPM.
@@ skipping 34 matching lines @@
       else
         SET_TO_ZERO(&tpmData.permanent.data.pcrValue[i].digest);
     }
     /* reset STCLEAR_FLAGS */
     SET_TO_ZERO(&tpmData.stclear.flags);
     tpmData.stclear.flags.tag = TPM_TAG_STCLEAR_FLAGS;
     tpmData.stclear.flags.deactivated = tpmData.permanent.flags.deactivated;
     /* reset STCLEAR_DATA */
     SET_TO_ZERO(&tpmData.stclear.data);
     tpmData.stclear.data.tag = TPM_TAG_STCLEAR_DATA;
-    /* flush volatiles and PCR dependent keys keys */
+    /* flush volatiles and PCR dependent keys */
     for (i = 0; i < TPM_MAX_KEYS; i++) {
       if (tpmData.permanent.data.keys[i].payload
           && ((tpmData.permanent.data.keys[i].keyFlags & TPM_KEY_FLAG_VOLATILE)
               || tpmData.permanent.data.keys[i].parentPCRStatus))
         TPM_FlushSpecific(INDEX_TO_KEY_HANDLE(i), TPM_RT_KEY);
     }
     /* init key-context nonce */
     SET_TO_RAND(&tpmData.stclear.data.contextNonceKey);
     /* invalidate counter handle */
     tpmData.stclear.data.countID = TPM_INVALID_HANDLE;
@@ skipping 24 matching lines @@
 TPM_RESULT TPM_SaveState()
 {
   info("TPM_SaveState()");
   if (tpmData.permanent.flags.selfTestSucceeded && !tpmData.stclear.flags.deactivated) { 
     return (tpm_store_permanent_data()) ? TPM_FAIL : TPM_SUCCESS;
   } else {
     debug("TPM is deactivated or in fail-stop mode, thus the permanent data is not stored");
     return TPM_SUCCESS;
   }
 }