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

src/tcs/rpc/tcstp/rpc_ps.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2004-2006
  *
  */
 
@@ skipping 24 matching lines @@
         TSS_UUID KeyUUID;
         UINT32 cKeySize;
         BYTE *rgbKey;
         UINT32 cVendorData;
         BYTE *gbVendorData;
         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_UUID, 1, &WrappingKeyUUID, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_UUID, 2, &KeyUUID, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_UINT32, 3, &cKeySize, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         rgbKey = calloc(1, cKeySize);
         if (rgbKey == NULL) {
@@ skipping 40 matching lines @@
 TSS_RESULT
 tcs_wrap_UnregisterKey(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         TSS_UUID uuid;
         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_UUID, 1, &uuid, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         result = TCS_UnregisterKey_Internal(hContext, uuid);
 
         initData(&data->comm, 0);
         data->comm.hdr.u.result = result;
 
         return TSS_SUCCESS;
 }
 
 TSS_RESULT
 tcs_wrap_GetRegisteredKeyBlob(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         TSS_UUID uuid;
         UINT32 pcKeySize;
         BYTE *prgbKey;
         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_UUID, 1, &uuid, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         result = TCS_GetRegisteredKeyBlob_Internal(hContext, &uuid, &pcKeySize,
                                               &prgbKey);
 
         if (result == TSS_SUCCESS) {
                 initData(&data->comm, 2);
                 if (setData(TCSD_PACKET_TYPE_UINT32, 0, &pcKeySize, 0, &data->comm)) {
@@ skipping 17 matching lines @@
 {
         TCS_CONTEXT_HANDLE hContext;
         TSS_UUID uuid;
         TCS_LOADKEY_INFO info, *pInfo;
         TCS_KEY_HANDLE phKeyTCSI;
         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_UUID, 1, &uuid, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         result = getData(TCSD_PACKET_TYPE_LOADKEY_INFO, 2, &info, 0, &data->comm);
         if (result == TSS_TCP_RPC_BAD_PACKET_TYPE)
                 pInfo = NULL;
         else if (result)
                 return result;
         else
@@ skipping 32 matching lines @@
         TSS_UUID uuid, *pUuid;
         UINT32 cKeyHierarchySize;
         TSS_KM_KEYINFO *pKeyHierarchy;
         unsigned int i, j;
         TSS_RESULT result;
 
         /* Receive */
         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);
 
         result = getData(TCSD_PACKET_TYPE_UUID , 1, &uuid, 0, &data->comm);
         if (result == TSS_TCP_RPC_BAD_PACKET_TYPE)
                 pUuid = NULL;
         else if (result)
                 return result;
         else
                 pUuid = &uuid;
 
         result = TCS_EnumRegisteredKeys_Internal(
@@ skipping 32 matching lines @@
         TSS_UUID uuid, *pUuid;
         UINT32 cKeyHierarchySize;
         TSS_KM_KEYINFO2 *pKeyHierarchy;
         unsigned int i, j;
         TSS_RESULT result;
 
         /* Receive */
         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);
 
         result = getData(TCSD_PACKET_TYPE_UUID , 1, &uuid, 0, &data->comm);
         if (result == TSS_TCP_RPC_BAD_PACKET_TYPE)
                 pUuid = NULL;
         else if (result)
                 return result;
         else
                 pUuid = &uuid;
 
         result = TCS_EnumRegisteredKeys_Internal2(
@@ skipping 29 matching lines @@
 tcs_wrap_GetRegisteredKeyByPublicInfo(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         TSS_RESULT result;
         UINT32 algId, ulPublicInfoLength, keySize;
         BYTE *rgbPublicInfo, *keyBlob;
 
         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, &algId, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_UINT32, 2, &ulPublicInfoLength, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         rgbPublicInfo = (BYTE *)calloc(1, ulPublicInfoLength);
         if (rgbPublicInfo == NULL) {
                 LogError("malloc of %d bytes failed.", ulPublicInfoLength);
                 return TCSERR(TSS_E_INTERNAL_ERROR);
@@ skipping 165 matching lines @@
         
         /* Extract the infos of the blob regarding the new data type TSS_KM_KEYINFO2 */
         UnloadBlob_UINT32(offset, &info->persistentStorageType, blob);
         UnloadBlob_UINT32(offset, &info->persistentStorageTypeParent, blob);
         
         UnloadBlob_BOOL(offset, &info->fIsLoaded, blob);
         UnloadBlob_UINT32(offset, &info->ulVendorDataLength, blob);
         UnloadBlob(offset, info->ulVendorDataLength, info->rgbVendorData, blob);
 }
 #endif