Upgrade from trousers 0.3.3 to 0.3.6 and from testsuite 0.2 to 0.3.

src/tcs/rpc/tcstp/rpc_migration.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2004-2006
  *
  */
 
@@ skipping 24 matching lines @@
         TCS_KEY_HANDLE parentHandle;
         TSS_MIGRATE_SCHEME migrationType;
         UINT32 MigrationKeyAuthSize, encDataSize, randomSize, outDataSize;
         BYTE *MigrationKeyAuth, *encData, *random, *outData;
         TPM_AUTH auth1, auth2, *pParentAuth, *pEntityAuth;
         UINT32 i;
 
         if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
-        LogDebugFn("thread %zd context %x", THREAD_ID, hContext);
+        LogDebugFn("thread %ld context %x", THREAD_ID, hContext);
 
         if (getData(TCSD_PACKET_TYPE_UINT32, 1, &parentHandle, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_UINT16, 2, &migrationType, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         if (getData(TCSD_PACKET_TYPE_UINT32, 3, &MigrationKeyAuthSize, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         MigrationKeyAuth = (BYTE *)malloc(MigrationKeyAuthSize);
@@ skipping 108 matching lines @@
         TSS_RESULT result;
         TCS_KEY_HANDLE parentHandle;
         UINT32 outDataSize, randomSize, inDataSize;
         BYTE *outData, *random, *inData;
         TPM_AUTH parentAuth, *pParentAuth;
         UINT32 i;
 
         if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
-        LogDebugFn("thread %zd context %x", THREAD_ID, hContext);
+        LogDebugFn("thread %ld context %x", THREAD_ID, hContext);
 
         if (getData(TCSD_PACKET_TYPE_UINT32, 1, &parentHandle, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         if (getData(TCSD_PACKET_TYPE_UINT32, 2, &inDataSize, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         inData = (BYTE *)malloc(inDataSize);
         if (inData == NULL) {
                 LogError("malloc of %d bytes failed.", inDataSize);
@@ skipping 71 matching lines @@
         TCS_CONTEXT_HANDLE hContext;
         TSS_RESULT result;
         TSS_MIGRATE_SCHEME migrateScheme;
         UINT32 MigrationKeySize, MigrationKeyAuthSize;
         BYTE *MigrationKey, *MigrationKeyAuth;
         TPM_AUTH ownerAuth;
 
         if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
-        LogDebugFn("thread %zd context %x", THREAD_ID, hContext);
+        LogDebugFn("thread %ld context %x", THREAD_ID, hContext);
 
         if (getData(TCSD_PACKET_TYPE_UINT16, 1, &migrateScheme, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         if (getData(TCSD_PACKET_TYPE_UINT32, 2, &MigrationKeySize, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         MigrationKey = (BYTE *)malloc(MigrationKeySize);
         if (MigrationKey == NULL) {
                 LogError("malloc of %d bytes failed.", MigrationKeySize);
@@ skipping 35 matching lines @@
                 }
 
                 free(MigrationKeyAuth);
         } else
                 initData(&data->comm, 0);
 
         data->comm.hdr.u.result = result;
 
         return TSS_SUCCESS;
 }