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

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

Issue 153373003: Fix of crash in e_rc4_hmac_md5.c caused by rc4-md5-x86_64.S. (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/openssl.git@master
Patch Set: Fix RC4_INT in opensslconf.h Created 6 years, 10 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
« no previous file with comments | « no previous file | import_from_android.sh » ('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 7
8 #ifndef OPENSSL_NO_CAMELLIA 8 #ifndef OPENSSL_NO_CAMELLIA
9 # define OPENSSL_NO_CAMELLIA 9 # define OPENSSL_NO_CAMELLIA
10 #endif 10 #endif
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 192
193 #if defined(HEADER_RC4_H) 193 #if defined(HEADER_RC4_H)
194 #if !defined(RC4_INT) 194 #if !defined(RC4_INT)
195 /* using int types make the structure larger but make the code faster 195 /* using int types make the structure larger but make the code faster
196 * on most boxes I have tested - up to %20 faster. */ 196 * on most boxes I have tested - up to %20 faster. */
197 /* 197 /*
198 * I don't know what does "most" mean, but declaring "int" is a must on: 198 * I don't know what does "most" mean, but declaring "int" is a must on:
199 * - Intel P6 because partial register stalls are very expensive; 199 * - Intel P6 because partial register stalls are very expensive;
200 * - elder Alpha because it lacks byte load/store instructions; 200 * - elder Alpha because it lacks byte load/store instructions;
201 */ 201 */
202 #define RC4_INT unsigned char 202 #define RC4_INT unsigned int
203 #endif 203 #endif
204 #if !defined(RC4_CHUNK) 204 #if !defined(RC4_CHUNK)
205 /* 205 /*
206 * This enables code handling data aligned at natural CPU word 206 * This enables code handling data aligned at natural CPU word
207 * boundary. See crypto/rc4/rc4_enc.c for further details. 207 * boundary. See crypto/rc4/rc4_enc.c for further details.
208 */ 208 */
209 #define RC4_CHUNK unsigned long 209 #define RC4_CHUNK unsigned long
210 #endif 210 #endif
211 #endif 211 #endif
212 212
(...skipping 19 matching lines...) Expand all
232 232
233 #if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H) 233 #if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
234 #define CONFIG_HEADER_RC4_LOCL_H 234 #define CONFIG_HEADER_RC4_LOCL_H
235 /* if this is defined data[i] is used instead of *data, this is a %20 235 /* if this is defined data[i] is used instead of *data, this is a %20
236 * speedup on x86 */ 236 * speedup on x86 */
237 #undef RC4_INDEX 237 #undef RC4_INDEX
238 #endif 238 #endif
239 239
240 #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) 240 #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
241 #define CONFIG_HEADER_BF_LOCL_H 241 #define CONFIG_HEADER_BF_LOCL_H
242 #define BF_PTR 242 #undef BF_PTR
243 #endif /* HEADER_BF_LOCL_H */ 243 #endif /* HEADER_BF_LOCL_H */
244 244
245 #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) 245 #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
246 #define CONFIG_HEADER_DES_LOCL_H 246 #define CONFIG_HEADER_DES_LOCL_H
247 #ifndef DES_DEFAULT_OPTIONS 247 #ifndef DES_DEFAULT_OPTIONS
248 /* the following is tweaked from a config script, that is why it is a 248 /* the following is tweaked from a config script, that is why it is a
249 * protected undef/define */ 249 * protected undef/define */
250 #ifndef DES_PTR 250 #ifndef DES_PTR
251 #undef DES_PTR 251 #undef DES_PTR
252 #endif 252 #endif
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 # define DES_UNROLL 307 # define DES_UNROLL
308 #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ 308 #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */
309 # define DES_PTR 309 # define DES_PTR
310 # define DES_RISC1 310 # define DES_RISC1
311 # define DES_UNROLL 311 # define DES_UNROLL
312 #endif /* Systems-specific speed defines */ 312 #endif /* Systems-specific speed defines */
313 #endif 313 #endif
314 314
315 #endif /* DES_DEFAULT_OPTIONS */ 315 #endif /* DES_DEFAULT_OPTIONS */
316 #endif /* HEADER_DES_LOCL_H */ 316 #endif /* HEADER_DES_LOCL_H */
OLDNEW
« no previous file with comments | « no previous file | import_from_android.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698