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

src/tcs/rpc/tcstp/rpc_ek.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2004-2007
  *
  */
 
@@ skipping 24 matching lines @@
         UINT32 eKPtrSize;
         BYTE *eKPtr;
         UINT32 eKSize;
         BYTE* eK;
         TCPA_DIGEST checksum;
         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_NONCE, 1, &antiReplay, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         if (getData(TCSD_PACKET_TYPE_UINT32, 2, &eKPtrSize, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         eKPtr = calloc(1, eKPtrSize);
         if (eKPtr == NULL) {
                 LogError("malloc of %u bytes failed.", eKPtrSize);
@@ skipping 40 matching lines @@
         TCS_CONTEXT_HANDLE hContext;
         TCPA_NONCE antiReplay;
         UINT32 pubEKSize;
         BYTE *pubEK;
         TCPA_DIGEST checksum;
         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_NONCE, 1, &antiReplay, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         MUTEX_LOCK(tcsp_lock);
 
         result = TCSP_ReadPubek_Internal(hContext, antiReplay, &pubEKSize, &pubEK, &checksum);
 
         MUTEX_UNLOCK(tcsp_lock);
 
@@ skipping 23 matching lines @@
 {
         TCS_CONTEXT_HANDLE hContext;
         UINT32 pubEKSize;
         BYTE *pubEK;
         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_OwnerReadPubek_Internal(hContext, &auth, &pubEKSize, &pubEK);
 
         MUTEX_UNLOCK(tcsp_lock);
 
@@ skipping 22 matching lines @@
 TSS_RESULT
 tcs_wrap_DisablePubekRead(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_DisablePubekRead_Internal(hContext, &auth);
 
         MUTEX_UNLOCK(tcsp_lock);
 
@@ skipping 20 matching lines @@
         TSS_BOOL genResetAuth;
         TPM_DIGEST eKResetAuth;
         UINT32 eKSize;
         BYTE* eK;
         TPM_DIGEST checksum;
         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_NONCE, 1, &antiReplay, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         if (getData(TCSD_PACKET_TYPE_UINT32, 2, &eKPtrSize, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         eKPtr = calloc(1, eKPtrSize);
         if (eKPtr == NULL) {
                 LogError("malloc of %d bytes failed.", eKPtrSize);
@@ skipping 52 matching lines @@
 TSS_RESULT
 tcs_wrap_RevokeEndorsementKeyPair(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         TPM_DIGEST eKResetAuth;
         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_DIGEST, 1, &eKResetAuth, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         MUTEX_LOCK(tcsp_lock);
 
         result = TCSP_RevokeEndorsementKeyPair_Internal(hContext, eKResetAuth);
 
         MUTEX_UNLOCK(tcsp_lock);
 
         initData(&data->comm, 0);
 
         data->comm.hdr.u.result = result;
 
         return TSS_SUCCESS;
 }
 #endif