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

src/tcs/rpc/tcstp/rpc_key.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2004-2006
  *
  */
 
@@ skipping 19 matching lines @@
 TSS_RESULT
 tcs_wrap_EvictKey(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         TCS_KEY_HANDLE hKey;
         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, &hKey, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         MUTEX_LOCK(tcsp_lock);
 
         result = key_mgr_evict(hContext, hKey);
 
         MUTEX_UNLOCK(tcsp_lock);
 
@@ skipping 11 matching lines @@
         TPM_AUTH auth;
         TPM_AUTH *pAuth;
         UINT32 pubKeySize;
         BYTE *pubKey;
         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_UINT32, 1, &hKey, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         result = getData(TCSD_PACKET_TYPE_AUTH, 2, &auth, 0, &data->comm);
         if (result == TSS_TCP_RPC_BAD_PACKET_TYPE)
                 pAuth = NULL;
         else if (result)
                 return result;
         else
@@ skipping 32 matching lines @@
 TSS_RESULT
 tcs_wrap_TerminateHandle(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         TCS_AUTHHANDLE authHandle;
         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, &authHandle, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         MUTEX_LOCK(tcsp_lock);
 
         result = TCSP_TerminateHandle_Internal(hContext, authHandle);
 
         MUTEX_UNLOCK(tcsp_lock);
 
@@ skipping 16 matching lines @@
         TCS_KEY_HANDLE phKeyTCSI;
         TCS_KEY_HANDLE phKeyHMAC;
 
         TPM_AUTH *pAuth;
         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_UINT32, 1, &hUnwrappingKey, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_UINT32, 2, &cWrappedKeyBlob, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         rgbWrappedKeyBlob = calloc(1, cWrappedKeyBlob);
         if (rgbWrappedKeyBlob == NULL) {
                 LogError("malloc of %d bytes failed.", cWrappedKeyBlob);
                 return TCSERR(TSS_E_OUTOFMEMORY);
@@ skipping 55 matching lines @@
         BYTE *rgbWrappedKeyBlob;
         TPM_AUTH auth;
         TCS_KEY_HANDLE phKeyTCSI;
         TPM_AUTH *pAuth;
         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_UINT32, 1, &hUnwrappingKey, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_UINT32, 2, &cWrappedKeyBlob, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         rgbWrappedKeyBlob = calloc(1, cWrappedKeyBlob);
         if (rgbWrappedKeyBlob == NULL) {
                 LogError("malloc of %d bytes failed.", cWrappedKeyBlob);
                 return TCSERR(TSS_E_OUTOFMEMORY);
@@ skipping 55 matching lines @@
 
         TPM_AUTH *pAuth, auth;
 
         UINT32 keyDataSize;
         BYTE *keyData;
         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, &hWrappingKey, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_ENCAUTH, 2, &KeyUsageAuth, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_ENCAUTH, 3, &KeyMigrationAuth, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_UINT32, 4, &keyInfoSize, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
@@ skipping 49 matching lines @@
         TCS_CONTEXT_HANDLE hContext;
         TCS_KEY_HANDLE hKey;
         TPM_AUTH ownerAuth;
         UINT32 pubKeySize;
         BYTE *pubKeyData;
         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, &hKey, 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_OwnerReadInternalPub_Internal(hContext, hKey, &ownerAuth, &pubKeySize, &pubKeyData);
 
@@ skipping 22 matching lines @@
         UINT32 ulPublicKeyLength;
         BYTE* rgbPublicKey;
         UINT32 attribName;
         TSS_BOOL attribValue;
         TPM_AUTH ownerAuth;
         TSS_UUID uuidData;
         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, &hKey, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_UINT32, 2, &ulPublicKeyLength, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         rgbPublicKey = (BYTE *) malloc(ulPublicKeyLength);
         if (rgbPublicKey == NULL) {
                 LogError("malloc of %u bytes failed.", ulPublicKeyLength);
                 return TCSERR(TSS_E_OUTOFMEMORY);
@@ skipping 29 matching lines @@
                 if (setData(TCSD_PACKET_TYPE_UUID, 1, &uuidData, 0, &data->comm))
                         return TCSERR(TSS_E_INTERNAL_ERROR);
         } else
                 initData(&data->comm, 0);
 
         data->comm.hdr.u.result = result;
         return TSS_SUCCESS;
 
 }
 #endif