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

src/tcs/rpc/tcstp/rpc_aik.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2004-2006
  *
  */
 
@@ skipping 38 matching lines @@
         BYTE *prgbPlatCred = NULL;
         UINT32 pcConfCredSize;
         BYTE *prgbConfCred = NULL;
         TSS_RESULT result;
 
         int i;
 
         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_ENCAUTH, 1, &identityAuth, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_DIGEST, 2, &privCAHash, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         if (getData(TCSD_PACKET_TYPE_UINT32, 3, &idKeyInfoSize, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         idKeyInfo = (BYTE *) calloc(1, idKeyInfoSize);
         if (idKeyInfo == NULL) {
@@ skipping 91 matching lines @@
         TCS_KEY_HANDLE idKeyHandle;
         TPM_AUTH *pIdKeyAuth = NULL, *pOwnerAuth = NULL, auth1, auth2;
         UINT32 SymmetricKeySize, blobSize;
         BYTE *SymmetricKey, *blob;
         TSS_RESULT result;
         UINT32 i;
 
         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, &idKeyHandle, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_UINT32, 2, &blobSize, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         if ((blob = malloc(blobSize)) == NULL)
                 return TCSERR(TSS_E_OUTOFMEMORY);
 
         if (getData(TCSD_PACKET_TYPE_PBYTE, 3, blob, blobSize, &data->comm)) {
@@ skipping 70 matching lines @@
 
         if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         if (getData(TCSD_PACKET_TYPE_UINT32, 1, &CredType, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         if (getData(TCSD_PACKET_TYPE_UINT32, 2, &CredAccessMode, 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);
 
         result = TCS_GetCredential_Internal(hContext, CredType, CredAccessMode, 
                                             &CredSize, &CredData);
 
         if (result == TSS_SUCCESS) {
                 initData(&data->comm, 2);
                 if (setData(TCSD_PACKET_TYPE_UINT32, 0, &CredSize, 0, &data->comm))
                         goto internal_error;
                 if (setData(TCSD_PACKET_TYPE_PBYTE, 1, CredData, CredSize, &data->comm))
                         goto internal_error;
 
                 free(CredData);
         } else
                 initData(&data->comm, 0);
 
         data->comm.hdr.u.result = result;
         return TSS_SUCCESS;
 
 internal_error:
         free(CredData);
         return TCSERR(TSS_E_INTERNAL_ERROR);
 }
 #endif