Upgrade to tpm-emulator version 0.7.

tpm/tpm_migration.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_migration.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/sha1.h"
 #include "crypto/hmac.h"
 
@@ skipping 39 matching lines @@
                                    TPM_MIGRATE_SCHEME migrationType,
                                    TPM_MIGRATIONKEYAUTH *migrationKeyAuth,
                                    UINT32 encDataSize, BYTE *encData,
                                    TPM_AUTH *auth1, TPM_AUTH *auth2,
                                    UINT32 *randomSize, BYTE **random,
                                    UINT32 *outDataSize, BYTE **outData)
 {
   TPM_RESULT res;
   TPM_KEY_DATA *parent;
   TPM_SESSION_DATA *session;
-  BYTE *ptr, *buf, *key_buf;
-  UINT32 len, key_buf_size;
+  BYTE *key_buf;
+  UINT32 key_buf_size;
   TPM_STORE_ASYMKEY store;
   TPM_PUBKEY_DATA key;
 
   info("TPM_CreateMigrationBlob()");
   /* get parent key */
   parent = tpm_get_key(parentHandle);
   if (parent == NULL) return TPM_INVALID_KEYHANDLE;
   /* verify parent authorization */
   res = tpm_verify_auth(auth1, parent->usageAuth, parentHandle);
   if (res != TPM_SUCCESS) return res;
@@ skipping 877 matching lines @@
   }
   if (tpm_encrypt_private_key(parent, &store, *outData, outDataSize)) {
     debug("tpm_encrypt_private_key() failed");
     tpm_free(*outData);
     tpm_free(buf);
     return TPM_ENCRYPT_ERROR;
   }
   tpm_free(buf);
   return TPM_SUCCESS;
 }