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

Side by Side Diff: src/trspi/crypto/openssl/symmetric.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/trspi/Makefile.am ('k') | src/tspi/Makefile.am » ('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
11 /* 11 /*
12 * symmetric.c - openssl TSS crypto routines 12 * symmetric.c - openssl TSS crypto routines
13 * 13 *
14 * Kent Yoder <shpedoikal@gmail.com> 14 * Kent Yoder <shpedoikal@gmail.com>
15 * 15 *
16 */ 16 */
17 17
18 #include <limits.h>
18 #include <string.h> 19 #include <string.h>
19 20
20 #include <openssl/evp.h> 21 #include <openssl/evp.h>
21 #include <openssl/err.h> 22 #include <openssl/err.h>
22 #include <openssl/rand.h> 23 #include <openssl/rand.h>
23 #include <limits.h> 24 #include <limits.h>
24 25
25 #include "trousers/tss.h" 26 #include "trousers/tss.h"
26 #include "trousers/trousers.h" 27 #include "trousers/trousers.h"
27 #include "trousers_types.h" 28 #include "trousers_types.h"
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 goto done; 379 goto done;
379 } 380 }
380 381
381 *out_len += tmp; 382 *out_len += tmp;
382 done: 383 done:
383 if (def_iv != iv) 384 if (def_iv != iv)
384 free(def_iv); 385 free(def_iv);
385 EVP_CIPHER_CTX_cleanup(&ctx); 386 EVP_CIPHER_CTX_cleanup(&ctx);
386 return result; 387 return result;
387 } 388 }
OLDNEW
« no previous file with comments | « src/trspi/Makefile.am ('k') | src/tspi/Makefile.am » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698