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

src/tcs/rpc/tcstp/rpc_changeauth.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2004-2006
  *
  */
 
@@ skipping 30 matching lines @@
         TPM_AUTH ownerAuth;
         TPM_AUTH entityAuth;
 
         UINT32 outDataSize;
         BYTE *outData;
         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, &parentHandle, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_UINT16, 2, &protocolID, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_ENCAUTH, 3, &newAuth, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_UINT16, 4, &entityType, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_UINT32, 5, &encDataSize, 0, &data->comm))
@@ skipping 58 matching lines @@
         TCPA_PROTOCOL_ID protocolID;
         TCPA_ENCAUTH newAuth;
         TCPA_ENTITY_TYPE entityType;
 
         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_UINT16, 1, &protocolID, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_ENCAUTH, 2, &newAuth, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_UINT16, 3, &entityType, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_AUTH, 4, &ownerAuth, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         MUTEX_LOCK(tcsp_lock);
 
         result = TCSP_ChangeAuthOwner_Internal(hContext, protocolID, newAuth, entityType,
                                                &ownerAuth);
 
         MUTEX_UNLOCK(tcsp_lock);
 
         if (result == TSS_SUCCESS) {
                 initData(&data->comm, 1);
                 if (setData(TCSD_PACKET_TYPE_AUTH, 0, &ownerAuth, 0, &data->comm)) {
                         return TCSERR(TSS_E_INTERNAL_ERROR);
                 }
         } else
                 initData(&data->comm, 0);
 
         data->comm.hdr.u.result = result;
         return TSS_SUCCESS;
 }