1 --- /tmp/opensslconf.h Fri Feb 11 15:36:12 2011 |
|
2 +++ openssl-1.0.0d/crypto/opensslconf.h Fri Feb 11 16:58:36 2011 |
|
3 @@ -181,7 +181,11 @@ |
|
4 |
|
5 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ |
|
6 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) |
|
7 +#if defined(__sparcv9) || defined(__x86_64) |
|
8 +#define ENGINESDIR "/lib/openssl/engines/64" |
|
9 +#else |
|
10 #define ENGINESDIR "/lib/openssl/engines" |
|
11 +#endif |
|
12 #define OPENSSLDIR "/etc/openssl" |
|
13 #endif |
|
14 #endif |
|
15 @@ -228,21 +232,39 @@ |
|
16 /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a |
|
17 * %20 speed up (longs are 8 bytes, int's are 4). */ |
|
18 #ifndef DES_LONG |
|
19 +#if defined(__sparcv9) || defined(__x86_64) |
|
20 +#define DES_LONG unsigned int |
|
21 +#else |
|
22 #define DES_LONG unsigned long |
|
23 #endif |
|
24 #endif |
|
25 +#endif |
|
26 |
|
27 #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) |
|
28 #define CONFIG_HEADER_BN_H |
|
29 +/* |
|
30 + * OpenSSL revision 1.521 from 2005-12-15 in OpenSSL_1_0_0-stable branch changed |
|
31 + * 64 bit sparcv9 configuration from SIXTY_FOUR_BIT_LONG to BN_LLONG. |
|
32 + */ |
|
33 +#if defined(__x86_64) |
|
34 +#undef BN_LLONG |
|
35 +#else |
|
36 #define BN_LLONG |
|
37 +#endif |
|
38 |
|
39 /* Should we define BN_DIV2W here? */ |
|
40 |
|
41 /* Only one for the following should be defined */ |
|
42 +#if defined(__x86_64) |
|
43 +#define SIXTY_FOUR_BIT_LONG |
|
44 +#undef THIRTY_TWO_BIT |
|
45 +#else |
|
46 #undef SIXTY_FOUR_BIT_LONG |
|
47 #undef SIXTY_FOUR_BIT |
|
48 #define THIRTY_TWO_BIT |
|
49 #endif |
|
50 +#undef SIXTY_FOUR_BIT |
|
51 +#endif |
|
52 |
|
53 #if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H) |
|
54 #define CONFIG_HEADER_RC4_LOCL_H |
|