src/tcs/rpc/tcstp/rpc_ps.c - Issue 3581012: Upgrade from trousers 0.3.3 to 0.3.6 and from testsuite 0.2 to 0.3.

Unified Diff: src/tcs/rpc/tcstp/rpc_ps.c

Issue 3581012: Upgrade from trousers 0.3.3 to 0.3.6 and from testsuite 0.2 to 0.3. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/trousers.git

Patch Set: git cl push Created 10 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: src/tcs/rpc/tcstp/rpc_ps.c

diff --git a/src/tcs/rpc/tcstp/rpc_ps.c b/src/tcs/rpc/tcstp/rpc_ps.c

index 9815dd04435c0a281407b1db0e8edf762f0f3bc9..3f6e5a70abc0b3f398aa9bc001467f89ee8cee49 100644

--- a/src/tcs/rpc/tcstp/rpc_ps.c

+++ b/src/tcs/rpc/tcstp/rpc_ps.c

@@ -42,7 +42,7 @@ tcs_wrap_RegisterKey(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_UUID, 1, &WrappingKeyUUID, 0, &data->comm))

return TCSERR(TSS_E_INTERNAL_ERROR);

@@ -103,7 +103,7 @@ tcs_wrap_UnregisterKey(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_UUID, 1, &uuid, 0, &data->comm))

return TCSERR(TSS_E_INTERNAL_ERROR);

@@ -128,7 +128,7 @@ tcs_wrap_GetRegisteredKeyBlob(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_UUID, 1, &uuid, 0, &data->comm))

return TCSERR(TSS_E_INTERNAL_ERROR);

@@ -166,7 +166,7 @@ tcs_wrap_LoadKeyByUUID(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_UUID, 1, &uuid, 0, &data->comm))

return TCSERR(TSS_E_INTERNAL_ERROR);

@@ -219,7 +219,7 @@ tcs_wrap_EnumRegisteredKeys(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);

result = getData(TCSD_PACKET_TYPE_UUID , 1, &uuid, 0, &data->comm);

if (result == TSS_TCP_RPC_BAD_PACKET_TYPE)

@@ -272,7 +272,7 @@ tcs_wrap_EnumRegisteredKeys2(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);

result = getData(TCSD_PACKET_TYPE_UUID , 1, &uuid, 0, &data->comm);

if (result == TSS_TCP_RPC_BAD_PACKET_TYPE)

@@ -322,7 +322,7 @@ tcs_wrap_GetRegisteredKeyByPublicInfo(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, &algId, 0, &data->comm))

return TCSERR(TSS_E_INTERNAL_ERROR);

« no previous file with comments | « src/tcs/rpc/tcstp/rpc_pcr_extend.c ('k') | src/tcs/rpc/tcstp/rpc_quote.c » ('j') | no next file with comments »