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

src/tcs/rpc/tcstp/rpc_own.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2004-2006
  *
  */
 
@@ skipping 29 matching lines @@
         BYTE *srkInfo;
         TPM_AUTH ownerAuth;
 
         UINT32 srkKeySize;
         BYTE *srkKey;
         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_UINT16, 1, &protocolID, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_UINT32, 2, &encOwnerAuthSize, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         encOwnerAuth = calloc(1, encOwnerAuthSize);
         if (encOwnerAuth == NULL) {
                 LogError("malloc of %d bytes failed.", encOwnerAuthSize);
                 return TCSERR(TSS_E_OUTOFMEMORY);
         }
@@ skipping 78 matching lines @@
 TSS_RESULT
 tcs_wrap_OwnerClear(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         TSS_RESULT result;
         TPM_AUTH auth;
 
         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_AUTH, 1, &auth, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         MUTEX_LOCK(tcsp_lock);
 
         result = TCSP_OwnerClear_Internal(hContext, &auth);
 
         MUTEX_UNLOCK(tcsp_lock);
 
         if (result == TSS_SUCCESS) {
                 initData(&data->comm, 1);
                 if (setData(TCSD_PACKET_TYPE_AUTH, 0, &auth, 0, &data->comm)) {
                         return TCSERR(TSS_E_INTERNAL_ERROR);
                 }
         } else
                 initData(&data->comm, 0);
 
         data->comm.hdr.u.result = result;
         return TSS_SUCCESS;
 }