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

src/tcs/rpc/tcstp/rpc_audit.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2007
  *
  */
 
@@ skipping 21 matching lines @@
 {
         TCS_CONTEXT_HANDLE hContext;
         TPM_AUTH ownerAuth;
         UINT32 ulOrdinal;
         TSS_BOOL bAuditState;
         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, &ulOrdinal, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         if (getData(TCSD_PACKET_TYPE_BOOL, 2, &bAuditState, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         if (getData(TCSD_PACKET_TYPE_AUTH, 3, &ownerAuth, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
@@ skipping 24 matching lines @@
         UINT32 counterValueSize;
         BYTE *counterValue;
         TSS_BOOL more;
         UINT32 ordSize;
         UINT32 *ordList;
         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, &startOrdinal, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         MUTEX_LOCK(tcsp_lock);
 
         result = TCSP_GetAuditDigest_Internal(hContext, startOrdinal, &auditDigest, &counterValueSize, &counterValue,
                                                 &more, &ordSize, &ordList);
 
         MUTEX_UNLOCK(tcsp_lock);
@@ skipping 53 matching lines @@
         BYTE *sig;
         TSS_RESULT result;
         int i;
 
         memset(&privAuth, 0, sizeof(TPM_AUTH));
         memset(&nullAuth, 0, sizeof(TPM_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_UINT32, 1, &keyHandle, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_BOOL, 2, &closeAudit, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_NONCE, 3, &antiReplay, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_AUTH, 4, &privAuth, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
@@ skipping 49 matching lines @@
                         return TCSERR(TSS_E_INTERNAL_ERROR);
                 }
                 free(sig);
         } else
                 initData(&data->comm, 0);
 
         data->comm.hdr.u.result = result;
 
         return TSS_SUCCESS;
 }