Upgrade to tpm-emulator version 0.7.

tpm/tpm_audit.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_audit.c 385 2010-02-17 15:41:28Z mast $
  */
 
 #include "tpm_emulator.h"
 #include "tpm_commands.h"
 #include "tpm_data.h"
 #include "tpm_marshalling.h"
 #include "tpm_handles.h"
 #include <crypto/sha1.h>
 
 /*
@@ skipping 33 matching lines @@
     tpm_sha1_init(&sha1_ctx);
     tpm_sha1_update(&sha1_ctx, tpmData.stany.data.auditDigest.digest, sizeof(TPM_DIGEST));
     tpm_sha1_update(&sha1_ctx, buf, sizeof(buf));
     tpm_sha1_final(&sha1_ctx, tpmData.stany.data.auditDigest.digest);
   }
 }
 
 void tpm_audit_response(TPM_COMMAND_CODE ordinal, TPM_RESPONSE *rsp)
 {
   tpm_sha1_ctx_t sha1_ctx;
-  BYTE buf[sizeof_TPM_AUDIT_EVENT_OUT()], *ptr;
+  BYTE buf[sizeof_TPM_AUDIT_EVENT_OUT(x)], *ptr;
   UINT32 len;
   TPM_COMMAND_CODE ord = ordinal & TPM_ORD_INDEX_MASK;
   if (ord < TPM_ORD_MAX
       && (AUDIT_STATUS[ord / 8] & (1 << (ord & 0x07)))) {
     info("tpm_audit_response()");
     /* update audit digest */
     ptr = buf; len = sizeof(buf);
     tpm_marshal_TPM_TAG(&ptr, &len, TPM_TAG_AUDIT_EVENT_OUT);
     tpm_marshal_TPM_COMMAND_CODE(&ptr, &len, ordinal);
     tpm_sha1_init(&sha1_ctx);
@@ skipping 148 matching lines @@
   if (ordinalToAudit > TPM_ORD_MAX) return TPM_BADINDEX;
   ordinalToAudit &= TPM_ORD_INDEX_MASK;
   if (auditState) {
     AUDIT_STATUS[ordinalToAudit / 8] |= (1 << (ordinalToAudit & 0x07));
   } else {
     AUDIT_STATUS[ordinalToAudit / 8] &= ~(1 << (ordinalToAudit & 0x07)); 
   }
   return TPM_SUCCESS;
 }