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

src/tcs/rpc/tcstp/rpc_admin.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2004-2007
  *
  */
 
@@ skipping 19 matching lines @@
 TSS_RESULT
 tcs_wrap_PhysicalSetDeactivated(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         TSS_BOOL state;
         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_BOOL, 1, &state, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         MUTEX_LOCK(tcsp_lock);
 
         result = TCSP_PhysicalSetDeactivated_Internal(hContext, state);
 
         MUTEX_UNLOCK(tcsp_lock);
 
         initData(&data->comm, 0);
         data->comm.hdr.u.result = result;
 
         return TSS_SUCCESS;
 }
 
 TSS_RESULT
 tcs_wrap_DisableOwnerClear(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_DisableOwnerClear_Internal(hContext, &auth);
 
         MUTEX_UNLOCK(tcsp_lock);
 
@@ skipping 11 matching lines @@
 
 TSS_RESULT
 tcs_wrap_ForceClear(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_ForceClear_Internal(hContext);
 
         MUTEX_UNLOCK(tcsp_lock);
 
         initData(&data->comm, 0);
         data->comm.hdr.u.result = result;
 
         return TSS_SUCCESS;
 }
 
 TSS_RESULT
 tcs_wrap_DisableForceClear(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_DisableForceClear_Internal(hContext);
 
         MUTEX_UNLOCK(tcsp_lock);
 
         initData(&data->comm, 0);
         data->comm.hdr.u.result = result;
 
         return TSS_SUCCESS;
 }
 
 TSS_RESULT
 tcs_wrap_PhysicalEnable(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_PhysicalEnable_Internal(hContext);
 
         MUTEX_UNLOCK(tcsp_lock);
 
         initData(&data->comm, 0);
         data->comm.hdr.u.result = result;
 
         return TSS_SUCCESS;
 }
 
 TSS_RESULT
 tcs_wrap_SetOwnerInstall(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         TSS_BOOL state;
         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_BOOL, 1, &state, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         MUTEX_LOCK(tcsp_lock);
 
         result = TCSP_SetOwnerInstall_Internal(hContext, state);
 
         MUTEX_UNLOCK(tcsp_lock);
 
         initData(&data->comm, 0);
         data->comm.hdr.u.result = result;
 
         return TSS_SUCCESS;
 }
 
 TSS_RESULT
 tcs_wrap_OwnerSetDisable(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         TSS_BOOL disableState;
         TPM_AUTH ownerAuth;
         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_BOOL, 1, &disableState, 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_OwnerSetDisable_Internal(hContext, disableState, &ownerAuth);
@@ skipping 14 matching lines @@
 
 TSS_RESULT
 tcs_wrap_PhysicalDisable(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_PhysicalDisable_Internal(hContext);
 
         MUTEX_UNLOCK(tcsp_lock);
 
         initData(&data->comm, 0);
         data->comm.hdr.u.result = result;
 
         return TSS_SUCCESS;
 }
 
 TSS_RESULT
 tcs_wrap_PhysicalPresence(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         TSS_RESULT result;
         TCPA_PHYSICAL_PRESENCE phyPresFlags;
 
         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, &phyPresFlags, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         MUTEX_LOCK(tcsp_lock);
 
         result = TCSP_PhysicalPresence_Internal(hContext, phyPresFlags);
 
         MUTEX_UNLOCK(tcsp_lock);
 
         initData(&data->comm, 0);
         data->comm.hdr.u.result = result;
 
         return TSS_SUCCESS;
 }
 
 TSS_RESULT
 tcs_wrap_SetTempDeactivated(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_SetTempDeactivated_Internal(hContext);
 
         MUTEX_UNLOCK(tcsp_lock);
 
         initData(&data->comm, 0);
         data->comm.hdr.u.result = result;
 
         return TSS_SUCCESS;
 }
 
 #ifdef TSS_BUILD_TSS12
 TSS_RESULT
 tcs_wrap_SetTempDeactivated2(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         TPM_AUTH operatorAuth, nullAuth, *pAuth;
         TSS_RESULT result;
 
         memset(&operatorAuth, 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_AUTH, 1, &operatorAuth, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         if (memcmp(&nullAuth, &operatorAuth, sizeof(TPM_AUTH)))
                 pAuth = &operatorAuth;
         else
                 pAuth = NULL;
 
         MUTEX_LOCK(tcsp_lock);
@@ skipping 20 matching lines @@
 TSS_RESULT
 tcs_wrap_ResetLockValue(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         TPM_AUTH ownerAuth;
         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_AUTH, 1, &ownerAuth, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         MUTEX_LOCK(tcsp_lock);
 
         result = TCSP_ResetLockValue_Internal(hContext, &ownerAuth);
 
         MUTEX_UNLOCK(tcsp_lock);
 
@@ skipping 14 matching lines @@
 tcs_wrap_FlushSpecific(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         TCS_HANDLE hResHandle;
         TPM_RESOURCE_TYPE resourceType;
         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, &hResHandle, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_UINT32, 2, &resourceType, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         MUTEX_LOCK(tcsp_lock);
 
         result = TCSP_FlushSpecific_Internal(hContext, hResHandle, resourceType);
 
         MUTEX_UNLOCK(tcsp_lock);
 
         initData(&data->comm, 0);
         data->comm.hdr.u.result = result;
 
         return TSS_SUCCESS;
 }
 #endif