Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(607)

Side by Side Diff: src/tcs/rpc/tcstp/rpc_certify.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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/tcs/rpc/tcstp/rpc_caps_tpm.c ('k') | src/tcs/rpc/tcstp/rpc_changeauth.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Licensed Materials - Property of IBM 3 * Licensed Materials - Property of IBM
4 * 4 *
5 * trousers - An open source TCG Software Stack 5 * trousers - An open source TCG Software Stack
6 * 6 *
7 * (C) Copyright International Business Machines Corp. 2004-2006 7 * (C) Copyright International Business Machines Corp. 2004-2006
8 * 8 *
9 */ 9 */
10 10
(...skipping 28 matching lines...) Expand all
39 TSS_RESULT result; 39 TSS_RESULT result;
40 UINT32 i; 40 UINT32 i;
41 41
42 memset(&nullAuth, 0, sizeof(TPM_AUTH)); 42 memset(&nullAuth, 0, sizeof(TPM_AUTH));
43 memset(&certAuth, 0, sizeof(TPM_AUTH)); 43 memset(&certAuth, 0, sizeof(TPM_AUTH));
44 memset(&keyAuth, 0, sizeof(TPM_AUTH)); 44 memset(&keyAuth, 0, sizeof(TPM_AUTH));
45 45
46 if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm)) 46 if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
47 return TCSERR(TSS_E_INTERNAL_ERROR); 47 return TCSERR(TSS_E_INTERNAL_ERROR);
48 48
49 » LogDebugFn("thread %zd context %x", THREAD_ID, hContext); 49 » LogDebugFn("thread %ld context %x", THREAD_ID, hContext);
50 50
51 if (getData(TCSD_PACKET_TYPE_UINT32, 1, &certHandle, 0, &data->comm)) 51 if (getData(TCSD_PACKET_TYPE_UINT32, 1, &certHandle, 0, &data->comm))
52 return TCSERR(TSS_E_INTERNAL_ERROR); 52 return TCSERR(TSS_E_INTERNAL_ERROR);
53 if (getData(TCSD_PACKET_TYPE_UINT32, 2, &keyHandle, 0, &data->comm)) 53 if (getData(TCSD_PACKET_TYPE_UINT32, 2, &keyHandle, 0, &data->comm))
54 return TCSERR(TSS_E_INTERNAL_ERROR); 54 return TCSERR(TSS_E_INTERNAL_ERROR);
55 if (getData(TCSD_PACKET_TYPE_NONCE, 3, &antiReplay, 0, &data->comm)) 55 if (getData(TCSD_PACKET_TYPE_NONCE, 3, &antiReplay, 0, &data->comm))
56 return TCSERR(TSS_E_INTERNAL_ERROR); 56 return TCSERR(TSS_E_INTERNAL_ERROR);
57 57
58 if (getData(TCSD_PACKET_TYPE_AUTH, 4, &certAuth, 0, &data->comm)) 58 if (getData(TCSD_PACKET_TYPE_AUTH, 4, &certAuth, 0, &data->comm))
59 return TCSERR(TSS_E_INTERNAL_ERROR); 59 return TCSERR(TSS_E_INTERNAL_ERROR);
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 return TCSERR(TSS_E_INTERNAL_ERROR); 111 return TCSERR(TSS_E_INTERNAL_ERROR);
112 } 112 }
113 free(outData); 113 free(outData);
114 } else 114 } else
115 initData(&data->comm, 0); 115 initData(&data->comm, 0);
116 116
117 data->comm.hdr.u.result = result; 117 data->comm.hdr.u.result = result;
118 118
119 return TSS_SUCCESS; 119 return TSS_SUCCESS;
120 } 120 }
OLDNEW
« no previous file with comments | « src/tcs/rpc/tcstp/rpc_caps_tpm.c ('k') | src/tcs/rpc/tcstp/rpc_changeauth.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698