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

src/tcs/rpc/tcstp/rpc_pcr_extend.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2004-2006
  *
  */
 
@@ skipping 21 matching lines @@
 {
         TCS_CONTEXT_HANDLE hContext;
         UINT32 pcrIndex;
         TCPA_DIGEST inDigest;
         TSS_RESULT result;
         TCPA_DIGEST outDigest;
 
         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, &pcrIndex, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_DIGEST, 2, &inDigest, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         MUTEX_LOCK(tcsp_lock);
 
         result = TCSP_Extend_Internal(hContext, pcrIndex, inDigest, &outDigest);
 
@@ skipping 15 matching lines @@
 tcs_wrap_PcrRead(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         UINT32 pcrIndex;
         TCPA_DIGEST digest;
         TSS_RESULT result;
 
         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, &pcrIndex, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         MUTEX_LOCK(tcsp_lock);
 
         result = TCSP_PcrRead_Internal(hContext, pcrIndex, &digest);
 
         MUTEX_UNLOCK(tcsp_lock);
 
@@ skipping 13 matching lines @@
 tcs_wrap_PcrReset(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         UINT32 pcrDataSizeIn;
         BYTE *pcrDataIn;
         TSS_RESULT result;
 
         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, &pcrDataSizeIn, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         pcrDataIn = (BYTE *)malloc(pcrDataSizeIn);
         if (pcrDataIn == NULL) {
                 LogError("malloc of %u bytes failed.", pcrDataSizeIn);
                 return TCSERR(TSS_E_OUTOFMEMORY);
         }
         if (getData(TCSD_PACKET_TYPE_PBYTE, 2, pcrDataIn, pcrDataSizeIn, &data->comm)) {
                 free(pcrDataIn);
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         }
 
         MUTEX_LOCK(tcsp_lock);
 
         result = TCSP_PcrReset_Internal(hContext, pcrDataSizeIn, pcrDataIn);
 
         MUTEX_UNLOCK(tcsp_lock);
         free(pcrDataIn);
 
         initData(&data->comm, 0);
         data->comm.hdr.u.result = result;
 
         return result;
 }