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

Side by Side Diff: config/android/openssl/opensslconf.h

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 | « README.chromium ('k') | openssl.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* opensslconf.h */ 1 /* opensslconf.h */
2 /* WARNING: Generated automatically from opensslconf.h.in by Configure. */ 2 /* WARNING: Generated automatically from opensslconf.h.in by Configure. */
3 3
4 /* OpenSSL was configured with the following options: */ 4 /* OpenSSL was configured with the following options: */
5 #ifndef OPENSSL_DOING_MAKEDEPEND 5 #ifndef OPENSSL_DOING_MAKEDEPEND
6 6
7 #ifndef OPENSSL_NO_CMS
8 # define OPENSSL_NO_CMS
9 #endif
10 #ifndef OPENSSL_NO_CAMELLIA
11 # define OPENSSL_NO_CAMELLIA
12 #endif
13 #ifndef OPENSSL_NO_MDC2
14 # define OPENSSL_NO_MDC2
15 #endif
16
17 7
18 #ifndef OPENSSL_NO_CAST 8 #ifndef OPENSSL_NO_CAST
19 # define OPENSSL_NO_CAST 9 # define OPENSSL_NO_CAST
20 #endif 10 #endif
21 #ifndef OPENSSL_NO_GMP 11 #ifndef OPENSSL_NO_GMP
22 # define OPENSSL_NO_GMP 12 # define OPENSSL_NO_GMP
23 #endif 13 #endif
24 #ifndef OPENSSL_NO_IDEA 14 #ifndef OPENSSL_NO_IDEA
25 # define OPENSSL_NO_IDEA 15 # define OPENSSL_NO_IDEA
26 #endif 16 #endif
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 # define DES_UNROLL 241 # define DES_UNROLL
252 #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ 242 #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */
253 # define DES_PTR 243 # define DES_PTR
254 # define DES_RISC1 244 # define DES_RISC1
255 # define DES_UNROLL 245 # define DES_UNROLL
256 #endif /* Systems-specific speed defines */ 246 #endif /* Systems-specific speed defines */
257 #endif 247 #endif
258 248
259 #endif /* DES_DEFAULT_OPTIONS */ 249 #endif /* DES_DEFAULT_OPTIONS */
260 #endif /* HEADER_DES_LOCL_H */ 250 #endif /* HEADER_DES_LOCL_H */
OLDNEW
« no previous file with comments | « README.chromium ('k') | openssl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698