Print this page
4853 illumos-gate is not lint-clean when built with openssl 1.0
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/lib/openssl/include/openssl/opensslconf.h
+++ new/usr/src/lib/openssl/include/openssl/opensslconf.h
1 1 /* opensslconf.h */
2 2 /* WARNING: Generated automatically from opensslconf.h.in by Configure. */
3 3
4 4 /* OpenSSL was configured with the following options: */
5 5 #ifndef OPENSSL_DOING_MAKEDEPEND
6 6
7 7
8 +#ifndef OPENSSL_NO_EC
9 +# define OPENSSL_NO_EC
10 +#endif
8 11 #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
9 12 # define OPENSSL_NO_EC_NISTP_64_GCC_128
10 13 #endif
14 +#ifndef OPENSSL_NO_ECDH
15 +# define OPENSSL_NO_ECDH
16 +#endif
17 +#ifndef OPENSSL_NO_ECDSA
18 +# define OPENSSL_NO_ECDSA
19 +#endif
11 20 #ifndef OPENSSL_NO_GMP
12 21 # define OPENSSL_NO_GMP
13 22 #endif
23 +#ifndef OPENSSL_NO_GOST
24 +# define OPENSSL_NO_GOST
25 +#endif
26 +#ifndef OPENSSL_NO_HW_4758_CCA
27 +# define OPENSSL_NO_HW_4758_CCA
28 +#endif
29 +#ifndef OPENSSL_NO_HW_AEP
30 +# define OPENSSL_NO_HW_AEP
31 +#endif
32 +#ifndef OPENSSL_NO_HW_ATALLA
33 +# define OPENSSL_NO_HW_ATALLA
34 +#endif
35 +#ifndef OPENSSL_NO_HW_CHIL
36 +# define OPENSSL_NO_HW_CHIL
37 +#endif
38 +#ifndef OPENSSL_NO_HW_CSWIFT
39 +# define OPENSSL_NO_HW_CSWIFT
40 +#endif
41 +#ifndef OPENSSL_NO_HW_GMP
42 +# define OPENSSL_NO_HW_GMP
43 +#endif
44 +#ifndef OPENSSL_NO_HW_NCIPHER
45 +# define OPENSSL_NO_HW_NCIPHER
46 +#endif
47 +#ifndef OPENSSL_NO_HW_NURON
48 +# define OPENSSL_NO_HW_NURON
49 +#endif
50 +#ifndef OPENSSL_NO_HW_PADLOCK
51 +# define OPENSSL_NO_HW_PADLOCK
52 +#endif
53 +#ifndef OPENSSL_NO_HW_SUREWARE
54 +# define OPENSSL_NO_HW_SUREWARE
55 +#endif
56 +#ifndef OPENSSL_NO_HW_UBSEC
57 +# define OPENSSL_NO_HW_UBSEC
58 +#endif
59 +#ifndef OPENSSL_NO_IDEA
60 +# define OPENSSL_NO_IDEA
61 +#endif
14 62 #ifndef OPENSSL_NO_JPAKE
15 63 # define OPENSSL_NO_JPAKE
16 64 #endif
17 65 #ifndef OPENSSL_NO_KRB5
18 66 # define OPENSSL_NO_KRB5
19 67 #endif
20 -#ifndef OPENSSL_NO_MD2
21 -# define OPENSSL_NO_MD2
68 +#ifndef OPENSSL_NO_MDC2
69 +# define OPENSSL_NO_MDC2
70 +#endif
71 +#ifndef OPENSSL_NO_RC3
72 +# define OPENSSL_NO_RC3
22 73 #endif
23 74 #ifndef OPENSSL_NO_RC5
24 75 # define OPENSSL_NO_RC5
25 76 #endif
26 77 #ifndef OPENSSL_NO_RFC3779
27 78 # define OPENSSL_NO_RFC3779
28 79 #endif
29 80 #ifndef OPENSSL_NO_SCTP
30 81 # define OPENSSL_NO_SCTP
31 82 #endif
83 +#ifndef OPENSSL_NO_SEED
84 +# define OPENSSL_NO_SEED
85 +#endif
32 86 #ifndef OPENSSL_NO_STORE
33 87 # define OPENSSL_NO_STORE
34 88 #endif
35 89 #ifndef OPENSSL_NO_UNIT_TEST
36 90 # define OPENSSL_NO_UNIT_TEST
37 91 #endif
92 +#ifndef OPENSSL_NO_WHIRLPOOL
93 +# define OPENSSL_NO_WHIRLPOOL
94 +#endif
95 +#ifndef OPENSSL_NO_WHRLPOOL
96 +# define OPENSSL_NO_WHRLPOOL
97 +#endif
38 98
39 99 #endif /* OPENSSL_DOING_MAKEDEPEND */
40 100
41 -#ifndef OPENSSL_NO_DYNAMIC_ENGINE
42 -# define OPENSSL_NO_DYNAMIC_ENGINE
101 +#ifndef OPENSSL_THREADS
102 +# define OPENSSL_THREADS
103 +#endif
104 +#ifndef OPENSSL_NO_STATIC_ENGINE
105 +# define OPENSSL_NO_STATIC_ENGINE
43 106 #endif
44 107
45 108 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
46 109 asks for it. This is a transient feature that is provided for those
47 110 who haven't had the time to do the appropriate changes in their
48 111 applications. */
49 112 #ifdef OPENSSL_ALGORITHM_DEFINES
113 +# if defined(OPENSSL_NO_EC) && !defined(NO_EC)
114 +# define NO_EC
115 +# endif
50 116 # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
51 117 # define NO_EC_NISTP_64_GCC_128
52 118 # endif
119 +# if defined(OPENSSL_NO_ECDH) && !defined(NO_ECDH)
120 +# define NO_ECDH
121 +# endif
122 +# if defined(OPENSSL_NO_ECDSA) && !defined(NO_ECDSA)
123 +# define NO_ECDSA
124 +# endif
53 125 # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
54 126 # define NO_GMP
55 127 # endif
128 +# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST)
129 +# define NO_GOST
130 +# endif
131 +# if defined(OPENSSL_NO_HW_4758_CCA) && !defined(NO_HW_4758_CCA)
132 +# define NO_HW_4758_CCA
133 +# endif
134 +# if defined(OPENSSL_NO_HW_AEP) && !defined(NO_HW_AEP)
135 +# define NO_HW_AEP
136 +# endif
137 +# if defined(OPENSSL_NO_HW_ATALLA) && !defined(NO_HW_ATALLA)
138 +# define NO_HW_ATALLA
139 +# endif
140 +# if defined(OPENSSL_NO_HW_CHIL) && !defined(NO_HW_CHIL)
141 +# define NO_HW_CHIL
142 +# endif
143 +# if defined(OPENSSL_NO_HW_CSWIFT) && !defined(NO_HW_CSWIFT)
144 +# define NO_HW_CSWIFT
145 +# endif
146 +# if defined(OPENSSL_NO_HW_GMP) && !defined(NO_HW_GMP)
147 +# define NO_HW_GMP
148 +# endif
149 +# if defined(OPENSSL_NO_HW_NCIPHER) && !defined(NO_HW_NCIPHER)
150 +# define NO_HW_NCIPHER
151 +# endif
152 +# if defined(OPENSSL_NO_HW_NURON) && !defined(NO_HW_NURON)
153 +# define NO_HW_NURON
154 +# endif
155 +# if defined(OPENSSL_NO_HW_PADLOCK) && !defined(NO_HW_PADLOCK)
156 +# define NO_HW_PADLOCK
157 +# endif
158 +# if defined(OPENSSL_NO_HW_SUREWARE) && !defined(NO_HW_SUREWARE)
159 +# define NO_HW_SUREWARE
160 +# endif
161 +# if defined(OPENSSL_NO_HW_UBSEC) && !defined(NO_HW_UBSEC)
162 +# define NO_HW_UBSEC
163 +# endif
164 +# if defined(OPENSSL_NO_IDEA) && !defined(NO_IDEA)
165 +# define NO_IDEA
166 +# endif
56 167 # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
57 168 # define NO_JPAKE
58 169 # endif
59 170 # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
60 171 # define NO_KRB5
61 172 # endif
62 -# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
63 -# define NO_MD2
173 +# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
174 +# define NO_MDC2
175 +# endif
176 +# if defined(OPENSSL_NO_RC3) && !defined(NO_RC3)
177 +# define NO_RC3
64 178 # endif
65 179 # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
66 180 # define NO_RC5
67 181 # endif
68 182 # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
69 183 # define NO_RFC3779
70 184 # endif
71 185 # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
72 186 # define NO_SCTP
73 187 # endif
188 +# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
189 +# define NO_SEED
190 +# endif
74 191 # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
75 192 # define NO_STORE
76 193 # endif
77 194 # if defined(OPENSSL_NO_UNIT_TEST) && !defined(NO_UNIT_TEST)
78 195 # define NO_UNIT_TEST
79 196 # endif
197 +# if defined(OPENSSL_NO_WHIRLPOOL) && !defined(NO_WHIRLPOOL)
198 +# define NO_WHIRLPOOL
199 +# endif
200 +# if defined(OPENSSL_NO_WHRLPOOL) && !defined(NO_WHRLPOOL)
201 +# define NO_WHRLPOOL
202 +# endif
80 203 #endif
81 204
205 +#define OPENSSL_CPUID_OBJ
206 +
82 207 /* crypto/opensslconf.h.in */
83 208
209 +#include <openssl/sunw_prefix.h>
210 +
84 211 /* Generate 80386 code? */
85 212 #undef I386_ONLY
86 213
87 214 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
88 215 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
89 -#define ENGINESDIR "/usr/local/ssl/lib/engines"
90 -#define OPENSSLDIR "/usr/local/ssl"
216 +#if defined(__x86_64)
217 +#define ENGINESDIR "/usr/lib/openssl/engines/64"
218 +#else
219 +#define ENGINESDIR "/usr/lib/openssl/engines"
220 +#endif
221 +#define OPENSSLDIR "/etc/openssl"
91 222 #endif
92 223 #endif
93 224
94 225 #undef OPENSSL_UNISTD
95 226 #define OPENSSL_UNISTD <unistd.h>
96 227
97 228 #undef OPENSSL_EXPORT_VAR_AS_FUNCTION
98 229
99 230 #if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
100 231 #define IDEA_INT unsigned int
101 232 #endif
102 233
103 234 #if defined(HEADER_MD2_H) && !defined(MD2_INT)
104 235 #define MD2_INT unsigned int
105 236 #endif
106 237
107 238 #if defined(HEADER_RC2_H) && !defined(RC2_INT)
108 239 /* I need to put in a mod for the alpha - eay */
109 240 #define RC2_INT unsigned int
110 241 #endif
111 242
112 243 #if defined(HEADER_RC4_H)
113 244 #if !defined(RC4_INT)
114 245 /* using int types make the structure larger but make the code faster
115 246 * on most boxes I have tested - up to %20 faster. */
116 247 /*
117 248 * I don't know what does "most" mean, but declaring "int" is a must on:
|
↓ open down ↓ |
17 lines elided |
↑ open up ↑ |
118 249 * - Intel P6 because partial register stalls are very expensive;
119 250 * - elder Alpha because it lacks byte load/store instructions;
120 251 */
121 252 #define RC4_INT unsigned int
122 253 #endif
123 254 #if !defined(RC4_CHUNK)
124 255 /*
125 256 * This enables code handling data aligned at natural CPU word
126 257 * boundary. See crypto/rc4/rc4_enc.c for further details.
127 258 */
259 +#if defined(__x86_64)
260 +#define RC4_CHUNK unsigned long
261 +#else
128 262 #undef RC4_CHUNK
263 +#endif /* __x86_64 */
129 264 #endif
130 265 #endif
131 266
132 267 #if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
133 268 /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
134 269 * %20 speed up (longs are 8 bytes, int's are 4). */
135 270 #ifndef DES_LONG
271 +#if defined(__x86_64)
272 +#define DES_LONG unsigned int
273 +#else
136 274 #define DES_LONG unsigned long
137 275 #endif
138 276 #endif
277 +#endif
139 278
140 279 #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
141 280 #define CONFIG_HEADER_BN_H
281 +#if defined(__x86_64)
142 282 #undef BN_LLONG
283 +#else
284 +#define BN_LLONG
285 +#endif
143 286
144 287 /* Should we define BN_DIV2W here? */
145 288
146 289 /* Only one for the following should be defined */
290 +#if defined(__x86_64)
291 +#define SIXTY_FOUR_BIT_LONG
292 +#undef THIRTY_TWO_BIT
293 +#else
147 294 #undef SIXTY_FOUR_BIT_LONG
148 295 #undef SIXTY_FOUR_BIT
149 296 #define THIRTY_TWO_BIT
150 297 #endif
298 +#undef SIXTY_FOUR_BIT
299 +#endif
151 300
152 301 #if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
153 302 #define CONFIG_HEADER_RC4_LOCL_H
154 303 /* if this is defined data[i] is used instead of *data, this is a %20
155 304 * speedup on x86 */
156 -#undef RC4_INDEX
305 +#if defined(__x86_64)
306 +#undef RC4_INDEX
307 +#else
308 +#define RC4_INDEX
309 +#endif /* __x86_64 */
157 310 #endif
158 311
159 312 #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
160 313 #define CONFIG_HEADER_BF_LOCL_H
161 -#undef BF_PTR
314 +#define BF_PTR
162 315 #endif /* HEADER_BF_LOCL_H */
163 316
164 317 #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
165 318 #define CONFIG_HEADER_DES_LOCL_H
166 319 #ifndef DES_DEFAULT_OPTIONS
167 320 /* the following is tweaked from a config script, that is why it is a
168 321 * protected undef/define */
169 322 #ifndef DES_PTR
323 +#if defined(__x86_64)
170 324 #undef DES_PTR
325 +#else
326 +#define DES_PTR
327 +#endif /* __x86_64 */
171 328 #endif
172 329
173 330 /* This helps C compiler generate the correct code for multiple functional
174 331 * units. It reduces register dependancies at the expense of 2 more
175 332 * registers */
176 333 #ifndef DES_RISC1
334 +#if defined(__x86_64)
177 335 #undef DES_RISC1
336 +#else
337 +#define DES_RISC1
338 +#endif /* __x86_64 */
178 339 #endif
179 340
180 341 #ifndef DES_RISC2
181 342 #undef DES_RISC2
182 343 #endif
183 344
184 345 #if defined(DES_RISC1) && defined(DES_RISC2)
185 346 YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
186 347 #endif
187 348
188 349 /* Unroll the inner loop, this sometimes helps, sometimes hinders.
189 350 * Very mucy CPU dependant */
190 351 #ifndef DES_UNROLL
191 -#undef DES_UNROLL
352 +#define DES_UNROLL
192 353 #endif
193 354
194 355 /* These default values were supplied by
195 356 * Peter Gutman <pgut001@cs.auckland.ac.nz>
196 357 * They are only used if nothing else has been defined */
197 358 #if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
198 359 /* Special defines which change the way the code is built depending on the
199 360 CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
200 361 even newer MIPS CPU's, but at the moment one size fits all for
201 362 optimization options. Older Sparc's work better with only UNROLL, but
202 363 there's no way to tell at compile time what it is you're running on */
203 364
204 365 #if defined( sun ) /* Newer Sparc's */
205 366 # define DES_PTR
206 367 # define DES_RISC1
207 368 # define DES_UNROLL
208 369 #elif defined( __ultrix ) /* Older MIPS */
209 370 # define DES_PTR
210 371 # define DES_RISC2
211 372 # define DES_UNROLL
212 373 #elif defined( __osf1__ ) /* Alpha */
213 374 # define DES_PTR
214 375 # define DES_RISC2
215 376 #elif defined ( _AIX ) /* RS6000 */
216 377 /* Unknown */
217 378 #elif defined( __hpux ) /* HP-PA */
218 379 /* Unknown */
219 380 #elif defined( __aux ) /* 68K */
220 381 /* Unknown */
221 382 #elif defined( __dgux ) /* 88K (but P6 in latest boxes) */
222 383 # define DES_UNROLL
223 384 #elif defined( __sgi ) /* Newer MIPS */
224 385 # define DES_PTR
225 386 # define DES_RISC2
226 387 # define DES_UNROLL
227 388 #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */
228 389 # define DES_PTR
229 390 # define DES_RISC1
230 391 # define DES_UNROLL
231 392 #endif /* Systems-specific speed defines */
232 393 #endif
233 394
234 395 #endif /* DES_DEFAULT_OPTIONS */
235 396 #endif /* HEADER_DES_LOCL_H */
|
↓ open down ↓ |
34 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX