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

src/tcs/rpc/tcstp/rpc_transport.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 ulTransControlFlags, ulTransSessionInfoSize, ulSecretSize, ulCurrentTicks, i;
         BYTE *rgbTransSessionInfo, *rgbSecret, *prgbCurrentTicks;
         TPM_MODIFIER_INDICATOR pbLocality;
         TPM_AUTH pEncKeyAuth, *pAuth;
         TPM_NONCE pTransNonce;
         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, &ulTransControlFlags, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_UINT32, 2, &hEncKey, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_UINT32, 3, &ulTransSessionInfoSize, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         rgbTransSessionInfo = malloc(ulTransSessionInfoSize);
         if (rgbTransSessionInfo == NULL) {
@@ skipping 85 matching lines @@
         UINT32 ulWrappedCmdDataInSize, pulHandleListSize, ulWrappedCmdDataOutSize, i = 0;
         BYTE *rgbWrappedCmdDataIn, *rgbWrappedCmdDataOut;
         TPM_MODIFIER_INDICATOR pbLocality;
         TPM_AUTH pWrappedCmdAuth1, pWrappedCmdAuth2, pTransAuth, *pAuth1, *pAuth2, null_auth;
         UINT64 punCurrentTicks;
         TSS_RESULT result, pulWrappedCmdReturnCode;
 
         if (getData(TCSD_PACKET_TYPE_UINT32, i++, &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, i++, &unWrappedCommandOrdinal, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_UINT32, i++, &ulWrappedCmdDataInSize, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         rgbWrappedCmdDataIn = malloc(ulWrappedCmdDataInSize);
         if (rgbWrappedCmdDataIn == NULL) {
                 LogError("malloc of %u bytes failed", ulWrappedCmdDataInSize);
                 return TCSERR(TSS_E_INTERNAL_ERROR);
@@ skipping 146 matching lines @@
         TPM_MODIFIER_INDICATOR pbLocality;
         TPM_AUTH pKeyAuth, pTransAuth, *pAuth, null_auth;
         TSS_RESULT result;
 
         memset(&null_auth, 0, sizeof(TPM_AUTH));
         memset(&pKeyAuth, 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, &hSignatureKey, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_NONCE, 2, &AntiReplayNonce, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_AUTH, 3, &pKeyAuth, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         if (!memcmp(&null_auth, &pKeyAuth, sizeof(TPM_AUTH)))
                 pAuth = NULL;
@@ skipping 59 matching lines @@
                         free(prgbSignature);
                         return TCSERR(TSS_E_INTERNAL_ERROR);
                 }
                 free(prgbSignature);
         } else
                 initData(&data->comm, 0);
 
         data->comm.hdr.u.result = result;
         return TSS_SUCCESS;
 }