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

src/tcs/rpc/tcstp/rpc_maint.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2004-2006
  *
  */
 
@@ skipping 19 matching lines @@
 TSS_RESULT
 tcs_wrap_KillMaintenanceFeature(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         TSS_RESULT result;
         TPM_AUTH ownerAuth;
 
         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, &ownerAuth, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         MUTEX_LOCK(tcsp_lock);
 
         result = TCSP_KillMaintenanceFeature_Internal(hContext, &ownerAuth);
 
         MUTEX_UNLOCK(tcsp_lock);
 
@@ skipping 16 matching lines @@
         TCS_CONTEXT_HANDLE hContext;
         TSS_RESULT result;
         TPM_AUTH ownerAuth;
         TSS_BOOL generateRandom;
         UINT32 randomSize, archiveSize;
         BYTE *random, *archive;
 
         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_BOOL, 1, &generateRandom, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         if (getData(TCSD_PACKET_TYPE_AUTH, 2, &ownerAuth, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         MUTEX_LOCK(tcsp_lock);
 
         result = TCSP_CreateMaintenanceArchive_Internal(hContext, generateRandom, &ownerAuth,
@@ skipping 47 matching lines @@
 {
         TCS_CONTEXT_HANDLE hContext;
         TSS_RESULT result;
         TPM_AUTH ownerAuth;
         UINT32 dataInSize, dataOutSize;
         BYTE *dataIn, *dataOut;
 
         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, &dataInSize, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         dataIn = (BYTE *)malloc(dataInSize);
         if (dataIn == NULL) {
                 LogError("malloc of %d bytes failed.", dataInSize);
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         }
         if (getData(TCSD_PACKET_TYPE_PBYTE, 2, dataIn, dataInSize, &data->comm)) {
@@ skipping 44 matching lines @@
         TCS_CONTEXT_HANDLE hContext;
         TSS_RESULT result;
         UINT32 pubKeySize;
         BYTE *pubKey;
         TCPA_NONCE antiReplay;
         TCPA_DIGEST checksum;
 
         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_NONCE, 1, &antiReplay, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         if (getData(TCSD_PACKET_TYPE_UINT32, 2, &pubKeySize, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         pubKey = (BYTE *)malloc(pubKeySize);
         if (pubKey == NULL) {
                 LogError("malloc of %d bytes failed.", pubKeySize);
@@ skipping 30 matching lines @@
 tcs_wrap_ReadManuMaintPub(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         TSS_RESULT result;
         TCPA_NONCE antiReplay;
         TCPA_DIGEST checksum;
 
         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_NONCE, 1, &antiReplay, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         MUTEX_LOCK(tcsp_lock);
 
         result = TCSP_ReadManuMaintPub_Internal(hContext, antiReplay, &checksum);
 
         MUTEX_UNLOCK(tcsp_lock);
 
         if (result == TSS_SUCCESS) {
                 initData(&data->comm, 1);
                 if (setData(TCSD_PACKET_TYPE_DIGEST, 0, &checksum, 0, &data->comm)) {
                         return TCSERR(TSS_E_INTERNAL_ERROR);
                 }
         } else
                 initData(&data->comm, 0);
 
         data->comm.hdr.u.result = result;
 
         return TSS_SUCCESS;
 }