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

src/tcs/rpc/tcstp/rpc_caps_tpm.c

Index: src/tcs/rpc/tcstp/rpc_caps_tpm.c
diff --git a/src/tcs/rpc/tcstp/rpc_caps_tpm.c b/src/tcs/rpc/tcstp/rpc_caps_tpm.c
index 424026bf1d5e22854a010f9eb0533c105d62ac20..2bcac27373be30b8ddcf8707960e64245a778953 100644
--- a/src/tcs/rpc/tcstp/rpc_caps_tpm.c
+++ b/src/tcs/rpc/tcstp/rpc_caps_tpm.c
@@ -41,7 +41,7 @@ tcs_wrap_GetCapability(struct tcsd_thread_data *data)
 	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 %ldd context %x", THREAD_ID, hContext);
 
 	if (getData(TCSD_PACKET_TYPE_UINT32, 1, &capArea, 0, &data->comm))
 		return TCSERR(TSS_E_INTERNAL_ERROR);
@@ -101,7 +101,7 @@ tcs_wrap_GetCapabilityOwner(struct tcsd_thread_data *data)
 	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_AUTH, 1, &ownerAuth, 0, &data->comm))
 		return TCSERR(TSS_E_INTERNAL_ERROR);
@@ -148,7 +148,7 @@ tcs_wrap_SetCapability(struct tcsd_thread_data *data)
 	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, &capArea, 0, &data->comm))
 		return TCSERR(TSS_E_INTERNAL_ERROR);
@@ -169,8 +169,10 @@ tcs_wrap_SetCapability(struct tcsd_thread_data *data)
 		}
 	}
 
-	if (getData(TCSD_PACKET_TYPE_UINT32, 4, &valueSize, 0, &data->comm))
+	if (getData(TCSD_PACKET_TYPE_UINT32, 4, &valueSize, 0, &data->comm)) {
+		free(subCap);
 		return TCSERR(TSS_E_INTERNAL_ERROR);
+	}
 
 	if (valueSize == 0)
 		value = NULL;