Upgrade to tpm-emulator version 0.7.

tpm/tpm_authorization.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_authorization.c 367 2010-02-13 15:52:18Z mast $
  */
 
 #include "tpm_emulator.h"
 #include "tpm_commands.h"
 #include "tpm_handles.h"
 #include "tpm_data.h"
 #include "tpm_marshalling.h"
 #include "crypto/hmac.h"
 #include "crypto/sha1.h"
 
@@ skipping 164 matching lines @@
   switch (entityType & 0x00FF) {
     case TPM_ET_KEYHANDLE:
       session->handle = entityValue;
       if (session->handle == TPM_KH_OPERATOR) return TPM_BAD_HANDLE;
       if (tpm_get_key(session->handle) != NULL)
         secret = &tpm_get_key(session->handle)->usageAuth;
       else
         debug("TPM_OSAP failed(): tpm_get_key(handle) == NULL");
       break;
     case TPM_ET_OWNER:
+    case TPM_ET_VERIFICATION_AUTH:
       session->handle = TPM_KH_OWNER;
       if (tpmData.permanent.flags.owned)
         secret = &tpmData.permanent.data.ownerAuth;
       break;
     case TPM_ET_SRK:
       session->handle = TPM_KH_SRK;
       if (tpmData.permanent.data.srk.payload)
         secret = &tpmData.permanent.data.srk.usageAuth;
       break;
     case TPM_ET_COUNTER:
@@ skipping 372 matching lines @@
 {
   unsigned int i;
   tpm_sha1_ctx_t ctx;
   tpm_sha1_init(&ctx);
   tpm_sha1_update(&ctx, secret, sizeof(TPM_SECRET));
   tpm_sha1_update(&ctx, nonce->nonce, sizeof(nonce->nonce));
   tpm_sha1_final(&ctx, plainAuth);
   for (i = 0; i < sizeof(TPM_SECRET); i++)
     plainAuth[i] ^= encAuth[i];
 }