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

Side by Side Diff: openssl/crypto/opensslconf.h.in

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/ocsp/ocsp_vfy.c ('k') | openssl/crypto/opensslv.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/opensslconf.h.in */ 1 /* crypto/opensslconf.h.in */
2 2
3 #ifdef OPENSSL_DOING_MAKEDEPEND
4
5 /* Include any symbols here that have to be explicitly set to enable a feature
6 * that should be visible to makedepend.
7 *
8 * [Our "make depend" doesn't actually look at this, we use actual build setting s
9 * instead; we want to make it easy to remove subdirectories with disabled algor ithms.]
10 */
11
12 #ifndef OPENSSL_FIPS
13 #define OPENSSL_FIPS
14 #endif
15
16 #endif
17
18 /* Generate 80386 code? */ 3 /* Generate 80386 code? */
19 #undef I386_ONLY 4 #undef I386_ONLY
20 5
21 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ 6 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
22 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 7 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
23 #define ENGINESDIR "/usr/local/lib/engines" 8 #define ENGINESDIR "/usr/local/lib/engines"
24 #define OPENSSLDIR "/usr/local/ssl" 9 #define OPENSSLDIR "/usr/local/ssl"
25 #endif 10 #endif
26 #endif 11 #endif
27 12
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 #endif 56 #endif
72 #endif 57 #endif
73 58
74 #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) 59 #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
75 #define CONFIG_HEADER_BN_H 60 #define CONFIG_HEADER_BN_H
76 #undef BN_LLONG 61 #undef BN_LLONG
77 62
78 /* Should we define BN_DIV2W here? */ 63 /* Should we define BN_DIV2W here? */
79 64
80 /* Only one for the following should be defined */ 65 /* Only one for the following should be defined */
81 /* The prime number generation stuff may not work when
82 * EIGHT_BIT but I don't care since I've only used this mode
83 * for debuging the bignum libraries */
84 #undef SIXTY_FOUR_BIT_LONG 66 #undef SIXTY_FOUR_BIT_LONG
85 #undef SIXTY_FOUR_BIT 67 #undef SIXTY_FOUR_BIT
86 #define THIRTY_TWO_BIT 68 #define THIRTY_TWO_BIT
87 #undef SIXTEEN_BIT
88 #undef EIGHT_BIT
89 #endif 69 #endif
90 70
91 #if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H) 71 #if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
92 #define CONFIG_HEADER_RC4_LOCL_H 72 #define CONFIG_HEADER_RC4_LOCL_H
93 /* if this is defined data[i] is used instead of *data, this is a %20 73 /* if this is defined data[i] is used instead of *data, this is a %20
94 * speedup on x86 */ 74 * speedup on x86 */
95 #undef RC4_INDEX 75 #undef RC4_INDEX
96 #endif 76 #endif
97 77
98 #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) 78 #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 # define DES_UNROLL 145 # define DES_UNROLL
166 #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ 146 #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */
167 # define DES_PTR 147 # define DES_PTR
168 # define DES_RISC1 148 # define DES_RISC1
169 # define DES_UNROLL 149 # define DES_UNROLL
170 #endif /* Systems-specific speed defines */ 150 #endif /* Systems-specific speed defines */
171 #endif 151 #endif
172 152
173 #endif /* DES_DEFAULT_OPTIONS */ 153 #endif /* DES_DEFAULT_OPTIONS */
174 #endif /* HEADER_DES_LOCL_H */ 154 #endif /* HEADER_DES_LOCL_H */
OLDNEW
« no previous file with comments | « openssl/crypto/ocsp/ocsp_vfy.c ('k') | openssl/crypto/opensslv.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698