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

Side by Side Diff: openssl/crypto/x509/by_file.c

Issue 9254031: Upgrade chrome's OpenSSL to same version Android ships with. (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/openssl/
Patch Set: '' Created 8 years, 11 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 | « openssl/crypto/x509/by_dir.c ('k') | openssl/crypto/x509/x509.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* crypto/x509/by_file.c */ 1 /* crypto/x509/by_file.c */
2 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
5 * This package is an SSL implementation written 5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com). 6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL. 7 * The implementation was written so as to conform with Netscapes SSL.
8 * 8 *
9 * This library is free for commercial and non-commercial use as long as 9 * This library is free for commercial and non-commercial use as long as
10 * the following conditions are aheared to. The following conditions 10 * the following conditions are aheared to. The following conditions
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 char **ret) 93 char **ret)
94 { 94 {
95 int ok=0; 95 int ok=0;
96 char *file; 96 char *file;
97 97
98 switch (cmd) 98 switch (cmd)
99 { 99 {
100 case X509_L_FILE_LOAD: 100 case X509_L_FILE_LOAD:
101 if (argl == X509_FILETYPE_DEFAULT) 101 if (argl == X509_FILETYPE_DEFAULT)
102 { 102 {
103 » » » file = (char *)Getenv(X509_get_default_cert_file_env()); 103 » » » file = (char *)getenv(X509_get_default_cert_file_env());
104 if (file) 104 if (file)
105 ok = (X509_load_cert_crl_file(ctx,file, 105 ok = (X509_load_cert_crl_file(ctx,file,
106 X509_FILETYPE_PEM) != 0); 106 X509_FILETYPE_PEM) != 0);
107 107
108 else 108 else
109 ok = (X509_load_cert_crl_file(ctx,X509_get_defau lt_cert_file(), 109 ok = (X509_load_cert_crl_file(ctx,X509_get_defau lt_cert_file(),
110 X509_FILETYPE_PEM) != 0); 110 X509_FILETYPE_PEM) != 0);
111 111
112 if (!ok) 112 if (!ok)
113 { 113 {
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 count++; 291 count++;
292 } 292 }
293 } 293 }
294 sk_X509_INFO_pop_free(inf, X509_INFO_free); 294 sk_X509_INFO_pop_free(inf, X509_INFO_free);
295 return count; 295 return count;
296 } 296 }
297 297
298 298
299 #endif /* OPENSSL_NO_STDIO */ 299 #endif /* OPENSSL_NO_STDIO */
300 300
OLDNEW
« no previous file with comments | « openssl/crypto/x509/by_dir.c ('k') | openssl/crypto/x509/x509.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698