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

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

Issue 10911247: Upstream openssl to version 1.0.1c (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/openssl/
Patch Set: Created 8 years, 3 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
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 7
8 #ifndef OPENSSL_NO_CAMELLIA
9 # define OPENSSL_NO_CAMELLIA
10 #endif
8 #ifndef OPENSSL_NO_CAST 11 #ifndef OPENSSL_NO_CAST
9 # define OPENSSL_NO_CAST 12 # define OPENSSL_NO_CAST
10 #endif 13 #endif
14 #ifndef OPENSSL_NO_CMS
15 # define OPENSSL_NO_CMS
16 #endif
17 #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
18 # define OPENSSL_NO_EC_NISTP_64_GCC_128
19 #endif
11 #ifndef OPENSSL_NO_GMP 20 #ifndef OPENSSL_NO_GMP
12 # define OPENSSL_NO_GMP 21 # define OPENSSL_NO_GMP
13 #endif 22 #endif
14 #ifndef OPENSSL_NO_IDEA 23 #ifndef OPENSSL_NO_IDEA
15 # define OPENSSL_NO_IDEA 24 # define OPENSSL_NO_IDEA
16 #endif 25 #endif
17 #ifndef OPENSSL_NO_JPAKE 26 #ifndef OPENSSL_NO_JPAKE
18 # define OPENSSL_NO_JPAKE 27 # define OPENSSL_NO_JPAKE
19 #endif 28 #endif
20 #ifndef OPENSSL_NO_KRB5 29 #ifndef OPENSSL_NO_KRB5
21 # define OPENSSL_NO_KRB5 30 # define OPENSSL_NO_KRB5
22 #endif 31 #endif
23 #ifndef OPENSSL_NO_MD2 32 #ifndef OPENSSL_NO_MD2
24 # define OPENSSL_NO_MD2 33 # define OPENSSL_NO_MD2
25 #endif 34 #endif
35 #ifndef OPENSSL_NO_MDC2
36 # define OPENSSL_NO_MDC2
37 #endif
26 #ifndef OPENSSL_NO_RC5 38 #ifndef OPENSSL_NO_RC5
27 # define OPENSSL_NO_RC5 39 # define OPENSSL_NO_RC5
28 #endif 40 #endif
29 #ifndef OPENSSL_NO_RFC3779 41 #ifndef OPENSSL_NO_RFC3779
30 # define OPENSSL_NO_RFC3779 42 # define OPENSSL_NO_RFC3779
31 #endif 43 #endif
44 #ifndef OPENSSL_NO_SCTP
45 # define OPENSSL_NO_SCTP
46 #endif
32 #ifndef OPENSSL_NO_SEED 47 #ifndef OPENSSL_NO_SEED
33 # define OPENSSL_NO_SEED 48 # define OPENSSL_NO_SEED
34 #endif 49 #endif
35 #ifndef OPENSSL_NO_SHA0 50 #ifndef OPENSSL_NO_SHA0
36 # define OPENSSL_NO_SHA0 51 # define OPENSSL_NO_SHA0
37 #endif 52 #endif
38 #ifndef OPENSSL_NO_STORE 53 #ifndef OPENSSL_NO_STORE
39 # define OPENSSL_NO_STORE 54 # define OPENSSL_NO_STORE
40 #endif 55 #endif
41 #ifndef OPENSSL_NO_WHRLPOOL 56 #ifndef OPENSSL_NO_WHIRLPOOL
42 # define OPENSSL_NO_WHRLPOOL 57 # define OPENSSL_NO_WHIRLPOOL
43 #endif 58 #endif
44 59
45 #endif /* OPENSSL_DOING_MAKEDEPEND */ 60 #endif /* OPENSSL_DOING_MAKEDEPEND */
46 61
47 #ifndef OPENSSL_THREADS 62 #ifndef OPENSSL_THREADS
48 # define OPENSSL_THREADS 63 # define OPENSSL_THREADS
49 #endif 64 #endif
50 #ifndef OPENSSL_NO_DYNAMIC_ENGINE 65 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
51 # define OPENSSL_NO_DYNAMIC_ENGINE 66 # define OPENSSL_NO_DYNAMIC_ENGINE
52 #endif 67 #endif
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 # define DES_UNROLL 256 # define DES_UNROLL
242 #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ 257 #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */
243 # define DES_PTR 258 # define DES_PTR
244 # define DES_RISC1 259 # define DES_RISC1
245 # define DES_UNROLL 260 # define DES_UNROLL
246 #endif /* Systems-specific speed defines */ 261 #endif /* Systems-specific speed defines */
247 #endif 262 #endif
248 263
249 #endif /* DES_DEFAULT_OPTIONS */ 264 #endif /* DES_DEFAULT_OPTIONS */
250 #endif /* HEADER_DES_LOCL_H */ 265 #endif /* HEADER_DES_LOCL_H */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698