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

src/tcs/rpc/tcstp/rpc_delegate.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2007
  *
  */
 
@@ skipping 29 matching lines @@
         BYTE *retData;
         TSS_RESULT result;
         int i;
 
         memset(&ownerAuth, 0, sizeof(TPM_AUTH));
         memset(&nullAuth, 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, &familyId, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         if (getData(TCSD_PACKET_TYPE_UINT32, 2, &opFlag, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         if (getData(TCSD_PACKET_TYPE_UINT32, 3, &opDataSize, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
@@ skipping 65 matching lines @@
         BYTE *blob;
         TSS_RESULT result;
         int i;
 
         memset(&keyAuth, 0, sizeof(TPM_AUTH));
         memset(&nullAuth, 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, &hKey, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         if (getData(TCSD_PACKET_TYPE_UINT32, 2, &publicInfoSize, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         publicInfo = malloc(publicInfoSize);
         if (publicInfo == NULL) {
                 LogError("malloc of %u bytes failed.", publicInfoSize);
@@ skipping 67 matching lines @@
         BYTE *blob;
         TSS_RESULT result;
         int i;
 
         memset(&ownerAuth, 0, sizeof(TPM_AUTH));
         memset(&nullAuth, 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_BOOL, 1, &increment, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         if (getData(TCSD_PACKET_TYPE_UINT32, 2, &publicInfoSize, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         publicInfo = malloc(publicInfoSize);
         if (publicInfo == NULL) {
                 LogError("malloc of %u bytes failed.", publicInfoSize);
@@ skipping 63 matching lines @@
         BYTE *blob;
         TPM_AUTH ownerAuth, nullAuth, *pAuth;
         TSS_RESULT result;
 
         memset(&ownerAuth, 0, sizeof(TPM_AUTH));
         memset(&nullAuth, 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, &index, 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);
 
         blob = malloc(blobSize);
         if (blob == NULL) {
                 LogError("malloc of %u bytes failed.", blobSize);
@@ skipping 19 matching lines @@
         result = TCSP_Delegate_LoadOwnerDelegation_Internal(hContext, index, blobSize, blob,
                         pAuth);
 
         MUTEX_UNLOCK(tcsp_lock);
         free(blob);
 
         if (result == TSS_SUCCESS) {
                 initData(&data->comm, 1);
                 if (pAuth) {
                         if (setData(TCSD_PACKET_TYPE_AUTH, 0, pAuth, 0, &data->comm)) {
-                                free(blob);
                                 return TCSERR(TSS_E_INTERNAL_ERROR);
                         }
                 }
         } else
                 initData(&data->comm, 0);
 
         data->comm.hdr.u.result = result;
 
         return TSS_SUCCESS;
 }
 
 TSS_RESULT
 tcs_wrap_Delegate_ReadTable(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         UINT32 familyTableSize;
         BYTE *familyTable;
         UINT32 delegateTableSize;
         BYTE *delegateTable;
         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);
 
         MUTEX_LOCK(tcsp_lock);
 
         result = TCSP_Delegate_ReadTable_Internal(hContext, &familyTableSize, &familyTable,
                         &delegateTableSize, &delegateTable);
 
         MUTEX_UNLOCK(tcsp_lock);
 
         if (result == TSS_SUCCESS) {
                 initData(&data->comm, 4);
@@ skipping 37 matching lines @@
         BYTE *output;
         TSS_RESULT result;
         int i;
 
         memset(&ownerAuth, 0, sizeof(TPM_AUTH));
         memset(&nullAuth, 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, &inputSize, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         input = malloc(inputSize);
         if (input == NULL) {
                 LogError("malloc of %u bytes failed.", inputSize);
                 return TCSERR(TSS_E_OUTOFMEMORY);
         }
         if (getData(TCSD_PACKET_TYPE_PBYTE, 2, input, inputSize, &data->comm)) {
@@ skipping 50 matching lines @@
 tcs_wrap_Delegate_VerifyDelegation(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         UINT32 delegateSize;
         BYTE *delegate;
         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, &delegateSize, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         delegate = malloc(delegateSize);
         if (delegate == NULL) {
                 LogError("malloc of %u bytes failed.", delegateSize);
                 return TCSERR(TSS_E_OUTOFMEMORY);
         }
         if (getData(TCSD_PACKET_TYPE_PBYTE, 2, delegate, delegateSize, &data->comm)) {
@@ skipping 23 matching lines @@
         TCS_KEY_HANDLE keyHandle;
         TPM_NONCE nonceOddDSAP, nonceEven, nonceEvenDSAP;
         UINT32 entityValueSize;
         BYTE *entityValue;
         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_UINT16, 1, &entityType, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_UINT32, 2, &keyHandle, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_NONCE, 3, &nonceOddDSAP, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_UINT32, 4, &entityValueSize, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
@@ skipping 25 matching lines @@
                 if (setData(TCSD_PACKET_TYPE_NONCE, 2, &nonceEvenDSAP, 0, &data->comm))
                         return TCSERR(TSS_E_INTERNAL_ERROR);
         } else
                 initData(&data->comm, 0);
 
         data->comm.hdr.u.result = result;
 
         return TSS_SUCCESS;
 }