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

src/tcs/rpc/tcstp/rpc_selftest.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2004-2006
  *
  */
 
@@ skipping 18 matching lines @@
 
 TSS_RESULT
 tcs_wrap_SelfTestFull(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         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);
 
         MUTEX_LOCK(tcsp_lock);
 
         result = TCSP_SelfTestFull_Internal(hContext);
 
         MUTEX_UNLOCK(tcsp_lock);
 
         initData(&data->comm, 0);
         data->comm.hdr.u.result = result;
 
         return TSS_SUCCESS;
 }
 
 TSS_RESULT
 tcs_wrap_CertifySelfTest(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         TSS_RESULT result;
         UINT32 sigSize;
         BYTE *sigData = NULL;
         TCS_KEY_HANDLE hKey;
         TCPA_NONCE antiReplay;
         TPM_AUTH privAuth;
         TPM_AUTH *pPrivAuth;
         int 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, &hKey, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_NONCE, 2, &antiReplay, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         result = getData(TCSD_PACKET_TYPE_AUTH, 3, &privAuth, 0, &data->comm);
         if (result == TSS_TCP_RPC_BAD_PACKET_TYPE)
                 pPrivAuth = NULL;
         else if (result)
@@ skipping 39 matching lines @@
 tcs_wrap_GetTestResult(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         TSS_RESULT result;
         UINT32 resultDataSize;
         BYTE *resultData = NULL;
 
         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);
 
         MUTEX_LOCK(tcsp_lock);
 
         result = TCSP_GetTestResult_Internal(hContext, &resultDataSize, &resultData);
 
         MUTEX_UNLOCK(tcsp_lock);
 
         if (result == TSS_SUCCESS) {
                 initData(&data->comm, 2);
                 if (setData(TCSD_PACKET_TYPE_UINT32, 0, &resultDataSize, 0, &data->comm)) {
                         free(resultData);
                         return TCSERR(TSS_E_INTERNAL_ERROR);
                 }
                 if (setData(TCSD_PACKET_TYPE_PBYTE, 1, resultData, resultDataSize, &data->comm)) {
                         free(resultData);
                         return TCSERR(TSS_E_INTERNAL_ERROR);
                 }
                 free(resultData);
         } else
                 initData(&data->comm, 0);
 
 
         data->comm.hdr.u.result = result;
         return TSS_SUCCESS;
 }