|
1 --- /tmp/opensslconf.h Thu Mar 10 06:46:57 2011 |
|
2 +++ /tmp/opensslconf.h.new Thu Mar 10 06:47:41 2011 |
|
3 @@ -2,9 +2,12 @@ |
|
4 /* WARNING: Generated automatically from opensslconf.h.in by Configure. */ |
|
5 |
|
6 /* OpenSSL was configured with the following options: */ |
|
7 +#if defined(__sparcv9) |
|
8 #ifndef OPENSSL_SYSNAME_ULTRASPARC |
|
9 # define OPENSSL_SYSNAME_ULTRASPARC |
|
10 #endif |
|
11 +#endif |
|
12 + |
|
13 #ifndef OPENSSL_DOING_MAKEDEPEND |
|
14 |
|
15 |
|
16 @@ -185,10 +188,14 @@ |
|
17 |
|
18 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ |
|
19 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) |
|
20 +#if defined(__sparcv9) || defined(__x86_64) |
|
21 +#define ENGINESDIR "/lib/openssl/engines/64" |
|
22 +#else |
|
23 #define ENGINESDIR "/lib/openssl/engines" |
|
24 -#define OPENSSLDIR "/etc/openssl" |
|
25 #endif |
|
26 +#define OPENSSLDIR "/etc/openssl/fips-140" |
|
27 #endif |
|
28 +#endif |
|
29 |
|
30 #undef OPENSSL_UNISTD |
|
31 #define OPENSSL_UNISTD <unistd.h> |
|
32 @@ -232,21 +239,34 @@ |
|
33 /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a |
|
34 * %20 speed up (longs are 8 bytes, int's are 4). */ |
|
35 #ifndef DES_LONG |
|
36 +#if defined(__sparcv9) || defined(__x86_64) |
|
37 +#define DES_LONG unsigned int |
|
38 +#else |
|
39 #define DES_LONG unsigned long |
|
40 #endif |
|
41 #endif |
|
42 +#endif |
|
43 |
|
44 #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) |
|
45 #define CONFIG_HEADER_BN_H |
|
46 +#if defined(__sparcv9) || defined(__x86_64) |
|
47 +#undef BN_LLONG |
|
48 +#else |
|
49 #define BN_LLONG |
|
50 +#endif |
|
51 |
|
52 /* Should we define BN_DIV2W here? */ |
|
53 |
|
54 /* Only one for the following should be defined */ |
|
55 +#if defined(__sparcv9) || defined(__x86_64) |
|
56 +#define SIXTY_FOUR_BIT_LONG |
|
57 +#undef THIRTY_TWO_BIT |
|
58 +#else |
|
59 #undef SIXTY_FOUR_BIT_LONG |
|
60 -#undef SIXTY_FOUR_BIT |
|
61 #define THIRTY_TWO_BIT |
|
62 #endif |
|
63 +#undef SIXTY_FOUR_BIT |
|
64 + #endif |
|
65 |
|
66 #if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H) |
|
67 #define CONFIG_HEADER_RC4_LOCL_H |