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

src/tcs/rpc/tcstp/rpc_daa.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2004-2006
  *
  */
 
@@ skipping 23 matching lines @@
         TPM_HANDLE hDAA;
         BYTE stage;
         UINT32 inputSize0, inputSize1, outputSize, i;
         BYTE *inputData0 = NULL, *inputData1 = NULL,*outputData;
         TSS_RESULT result;
         TPM_AUTH ownerAuth, *pOwnerAuth;
 
         if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
-        LogDebugFn("thread %zd hDAA %x", THREAD_ID, hDAA);
+        LogDebugFn("thread %ld hDAA %x", THREAD_ID, hDAA);
 
         if (getData(TCSD_PACKET_TYPE_UINT32, 1, &hDAA, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         if (getData(TCSD_PACKET_TYPE_BYTE, 2, &stage, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         LogDebug("getData 2 (stage=%d)", (int)stage);
 
         if (getData(TCSD_PACKET_TYPE_UINT32, 3, &inputSize0, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
@@ skipping 83 matching lines @@
         TPM_HANDLE hDAA;
         BYTE stage;
         UINT32 inputSize0, inputSize1, outputSize, i;
         BYTE *inputData0 = NULL, *inputData1 = NULL,*outputData;
         TSS_RESULT result;
         TPM_AUTH ownerAuth, *pOwnerAuth;
 
         if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
-        LogDebugFn("thread %zd hDAA %x", THREAD_ID, hDAA);
+        LogDebugFn("thread %ld hDAA %x", THREAD_ID, hDAA);
         if (getData(TCSD_PACKET_TYPE_UINT32, 1, &hDAA, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         if (getData(TCSD_PACKET_TYPE_BYTE, 2, &stage, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         LogDebugFn("getData 2 (stage=%d)", (int)stage);
 
         if (getData(TCSD_PACKET_TYPE_UINT32, 3, &inputSize0, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         LogDebug("getData 3  inputSize0=%d", inputSize0);
@@ skipping 71 matching lines @@
                         free(outputData);
                         return TCSERR(TSS_E_INTERNAL_ERROR);
                 }
                 free(outputData);
         } else
                 initData(&data->comm, 0);
 
         data->comm.hdr.u.result = result;
         return TSS_SUCCESS;
 }