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

Side by Side Diff: src/tspi/tsp_maint.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/tspi/tsp_context_mem.c ('k') | src/tspi/tsp_migration.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-2007 7 * (C) Copyright International Business Machines Corp. 2004-2007
8 * 8 *
9 */ 9 */
10 10
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 *randomSize = 0; 54 *randomSize = 0;
55 free(dec); 55 free(dec);
56 LogError("malloc of %u bytes failed", *randomSize); 56 LogError("malloc of %u bytes failed", *randomSize);
57 return TSPERR(TSS_E_OUTOFMEMORY); 57 return TSPERR(TSS_E_OUTOFMEMORY);
58 } 58 }
59 Trspi_UnloadBlob(&offset, *randomSize, dec, *random); 59 Trspi_UnloadBlob(&offset, *randomSize, dec, *random);
60 } 60 }
61 61
62 Trspi_UnloadBlob_UINT32(&offset, archiveSize, dec); 62 Trspi_UnloadBlob_UINT32(&offset, archiveSize, dec);
63 if ((*archive = malloc(*archiveSize)) == NULL) { 63 if ((*archive = malloc(*archiveSize)) == NULL) {
64 » » free(random); 64 » » free(*random);
65 *random = NULL; 65 *random = NULL;
66 *randomSize = 0; 66 *randomSize = 0;
67 free(dec); 67 free(dec);
68 LogError("malloc of %u bytes failed", *archiveSize); 68 LogError("malloc of %u bytes failed", *archiveSize);
69 *archiveSize = 0; 69 *archiveSize = 0;
70 return TSPERR(TSS_E_OUTOFMEMORY); 70 return TSPERR(TSS_E_OUTOFMEMORY);
71 } 71 }
72 Trspi_UnloadBlob(&offset, *archiveSize, dec, *archive); 72 Trspi_UnloadBlob(&offset, *archiveSize, dec, *archive);
73 free(dec); 73 free(dec);
74 74
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 return result; 188 return result;
189 189
190 offset = 0; 190 offset = 0;
191 Trspi_UnloadBlob_DIGEST(&offset, dec, checksum); 191 Trspi_UnloadBlob_DIGEST(&offset, dec, checksum);
192 free(dec); 192 free(dec);
193 193
194 return result; 194 return result;
195 } 195 }
196 #endif 196 #endif
197 197
OLDNEW
« no previous file with comments | « src/tspi/tsp_context_mem.c ('k') | src/tspi/tsp_migration.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698