summaryrefslogtreecommitdiff
path: root/src/lib/libssl/crypto/arch
diff options
context:
space:
mode:
authordjm <>2008-09-06 12:20:16 +0000
committerdjm <>2008-09-06 12:20:16 +0000
commit1cc2a70b2a8b91d243c2e4ac4e779efd950db5a2 (patch)
tree8bad2049c8c0044c7964fd985794ad61777e7163 /src/lib/libssl/crypto/arch
parent6b62d1fdd8a4fd35acfcc0c4bb1bf8b757fa8cda (diff)
downloadopenbsd-1cc2a70b2a8b91d243c2e4ac4e779efd950db5a2.tar.gz
openbsd-1cc2a70b2a8b91d243c2e4ac4e779efd950db5a2.tar.bz2
openbsd-1cc2a70b2a8b91d243c2e4ac4e779efd950db5a2.zip
remerge local tweaks, update per-arch configuration headers, update
Makefiles, crank shlib_version
Diffstat (limited to 'src/lib/libssl/crypto/arch')
-rw-r--r--src/lib/libssl/crypto/arch/alpha/opensslconf.h61
-rw-r--r--src/lib/libssl/crypto/arch/amd64/opensslconf.h65
-rw-r--r--src/lib/libssl/crypto/arch/arm/opensslconf.h57
-rw-r--r--src/lib/libssl/crypto/arch/hppa/opensslconf.h59
-rw-r--r--src/lib/libssl/crypto/arch/i386/opensslconf.h57
-rw-r--r--src/lib/libssl/crypto/arch/m68k/opensslconf.h57
-rw-r--r--src/lib/libssl/crypto/arch/m88k/opensslconf.h57
-rw-r--r--src/lib/libssl/crypto/arch/mips64/opensslconf.h61
-rw-r--r--src/lib/libssl/crypto/arch/powerpc/opensslconf.h57
-rw-r--r--src/lib/libssl/crypto/arch/sh/opensslconf.h57
-rw-r--r--src/lib/libssl/crypto/arch/sparc/opensslconf.h57
-rw-r--r--src/lib/libssl/crypto/arch/sparc64/opensslconf.h59
-rw-r--r--src/lib/libssl/crypto/arch/vax/opensslconf.h57
13 files changed, 738 insertions, 23 deletions
diff --git a/src/lib/libssl/crypto/arch/alpha/opensslconf.h b/src/lib/libssl/crypto/arch/alpha/opensslconf.h
index c33ccc8a0f..0d759a5784 100644
--- a/src/lib/libssl/crypto/arch/alpha/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/alpha/opensslconf.h
@@ -4,20 +4,74 @@
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#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA
9#endif
10#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS
12#endif
13#ifndef OPENSSL_NO_GMP
14# define OPENSSL_NO_GMP
15#endif
7#ifndef OPENSSL_NO_KRB5 16#ifndef OPENSSL_NO_KRB5
8# define OPENSSL_NO_KRB5 17# define OPENSSL_NO_KRB5
9#endif 18#endif
19#ifndef OPENSSL_NO_MDC2
20# define OPENSSL_NO_MDC2
21#endif
22#ifndef OPENSSL_NO_RC5
23# define OPENSSL_NO_RC5
24#endif
25#ifndef OPENSSL_NO_RFC3779
26# define OPENSSL_NO_RFC3779
27#endif
28#ifndef OPENSSL_NO_SEED
29# define OPENSSL_NO_SEED
30#endif
31#ifndef OPENSSL_NO_TLSEXT
32# define OPENSSL_NO_TLSEXT
33#endif
10 34
11#endif /* OPENSSL_DOING_MAKEDEPEND */ 35#endif /* OPENSSL_DOING_MAKEDEPEND */
36#ifndef OPENSSL_THREADS
37# define OPENSSL_THREADS
38#endif
39#ifndef OPENSSL_NO_DYNAMIC_ENGINE
40# define OPENSSL_NO_DYNAMIC_ENGINE
41#endif
12 42
13/* The OPENSSL_NO_* macros are also defined as NO_* if the application 43/* The OPENSSL_NO_* macros are also defined as NO_* if the application
14 asks for it. This is a transient feature that is provided for those 44 asks for it. This is a transient feature that is provided for those
15 who haven't had the time to do the appropriate changes in their 45 who haven't had the time to do the appropriate changes in their
16 applications. */ 46 applications. */
17#ifdef OPENSSL_ALGORITHM_DEFINES 47#ifdef OPENSSL_ALGORITHM_DEFINES
48# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
49# define NO_CAMELLIA
50# endif
51# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
52# define NO_CMS
53# endif
54# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
55# define NO_GMP
56# endif
18# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 57# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
19# define NO_KRB5 58# define NO_KRB5
20# endif 59# endif
60# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
61# define NO_MDC2
62# endif
63# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
64# define NO_RC5
65# endif
66# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
67# define NO_RFC3779
68# endif
69# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
70# define NO_SEED
71# endif
72# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT)
73# define NO_TLSEXT
74# endif
21#endif 75#endif
22 76
23/* crypto/opensslconf.h.in */ 77/* crypto/opensslconf.h.in */
@@ -27,6 +81,7 @@
27 81
28#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ 82#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
29#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 83#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
84#define ENGINESDIR "/usr/lib/engines"
30#define OPENSSLDIR "/etc/ssl" 85#define OPENSSLDIR "/etc/ssl"
31#endif 86#endif
32#endif 87#endif
@@ -65,11 +120,11 @@
65 * This enables code handling data aligned at natural CPU word 120 * This enables code handling data aligned at natural CPU word
66 * boundary. See crypto/rc4/rc4_enc.c for further details. 121 * boundary. See crypto/rc4/rc4_enc.c for further details.
67 */ 122 */
68#undef RC4_CHUNK 123#define RC4_CHUNK unsigned long
69#endif 124#endif
70#endif 125#endif
71 126
72#if (defined(HEADER_DES_H) || defined(HEADER_DES_OLD_H)) && !defined(DES_LONG) 127#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
73/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 128/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
74 * %20 speed up (longs are 8 bytes, int's are 4). */ 129 * %20 speed up (longs are 8 bytes, int's are 4). */
75#ifndef DES_LONG 130#ifndef DES_LONG
@@ -103,7 +158,7 @@
103 158
104#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) 159#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
105#define CONFIG_HEADER_BF_LOCL_H 160#define CONFIG_HEADER_BF_LOCL_H
106#undef BF_PTR 161#define BF_PTR
107#endif /* HEADER_BF_LOCL_H */ 162#endif /* HEADER_BF_LOCL_H */
108 163
109#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) 164#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
diff --git a/src/lib/libssl/crypto/arch/amd64/opensslconf.h b/src/lib/libssl/crypto/arch/amd64/opensslconf.h
index c33ccc8a0f..fd992553a7 100644
--- a/src/lib/libssl/crypto/arch/amd64/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/amd64/opensslconf.h
@@ -4,20 +4,74 @@
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#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA
9#endif
10#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS
12#endif
13#ifndef OPENSSL_NO_GMP
14# define OPENSSL_NO_GMP
15#endif
7#ifndef OPENSSL_NO_KRB5 16#ifndef OPENSSL_NO_KRB5
8# define OPENSSL_NO_KRB5 17# define OPENSSL_NO_KRB5
9#endif 18#endif
19#ifndef OPENSSL_NO_MDC2
20# define OPENSSL_NO_MDC2
21#endif
22#ifndef OPENSSL_NO_RC5
23# define OPENSSL_NO_RC5
24#endif
25#ifndef OPENSSL_NO_RFC3779
26# define OPENSSL_NO_RFC3779
27#endif
28#ifndef OPENSSL_NO_SEED
29# define OPENSSL_NO_SEED
30#endif
31#ifndef OPENSSL_NO_TLSEXT
32# define OPENSSL_NO_TLSEXT
33#endif
10 34
11#endif /* OPENSSL_DOING_MAKEDEPEND */ 35#endif /* OPENSSL_DOING_MAKEDEPEND */
36#ifndef OPENSSL_THREADS
37# define OPENSSL_THREADS
38#endif
39#ifndef OPENSSL_NO_DYNAMIC_ENGINE
40# define OPENSSL_NO_DYNAMIC_ENGINE
41#endif
12 42
13/* The OPENSSL_NO_* macros are also defined as NO_* if the application 43/* The OPENSSL_NO_* macros are also defined as NO_* if the application
14 asks for it. This is a transient feature that is provided for those 44 asks for it. This is a transient feature that is provided for those
15 who haven't had the time to do the appropriate changes in their 45 who haven't had the time to do the appropriate changes in their
16 applications. */ 46 applications. */
17#ifdef OPENSSL_ALGORITHM_DEFINES 47#ifdef OPENSSL_ALGORITHM_DEFINES
48# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
49# define NO_CAMELLIA
50# endif
51# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
52# define NO_CMS
53# endif
54# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
55# define NO_GMP
56# endif
18# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 57# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
19# define NO_KRB5 58# define NO_KRB5
20# endif 59# endif
60# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
61# define NO_MDC2
62# endif
63# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
64# define NO_RC5
65# endif
66# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
67# define NO_RFC3779
68# endif
69# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
70# define NO_SEED
71# endif
72# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT)
73# define NO_TLSEXT
74# endif
21#endif 75#endif
22 76
23/* crypto/opensslconf.h.in */ 77/* crypto/opensslconf.h.in */
@@ -27,6 +81,7 @@
27 81
28#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ 82#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
29#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 83#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
84#define ENGINESDIR "/usr/lib/engines"
30#define OPENSSLDIR "/etc/ssl" 85#define OPENSSLDIR "/etc/ssl"
31#endif 86#endif
32#endif 87#endif
@@ -65,11 +120,11 @@
65 * This enables code handling data aligned at natural CPU word 120 * This enables code handling data aligned at natural CPU word
66 * boundary. See crypto/rc4/rc4_enc.c for further details. 121 * boundary. See crypto/rc4/rc4_enc.c for further details.
67 */ 122 */
68#undef RC4_CHUNK 123#define RC4_CHUNK unsigned long
69#endif 124#endif
70#endif 125#endif
71 126
72#if (defined(HEADER_DES_H) || defined(HEADER_DES_OLD_H)) && !defined(DES_LONG) 127#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
73/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 128/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
74 * %20 speed up (longs are 8 bytes, int's are 4). */ 129 * %20 speed up (longs are 8 bytes, int's are 4). */
75#ifndef DES_LONG 130#ifndef DES_LONG
@@ -112,7 +167,7 @@
112/* the following is tweaked from a config script, that is why it is a 167/* the following is tweaked from a config script, that is why it is a
113 * protected undef/define */ 168 * protected undef/define */
114#ifndef DES_PTR 169#ifndef DES_PTR
115#define DES_PTR 170#undef DES_PTR
116#endif 171#endif
117 172
118/* This helps C compiler generate the correct code for multiple functional 173/* This helps C compiler generate the correct code for multiple functional
@@ -123,7 +178,7 @@
123#endif 178#endif
124 179
125#ifndef DES_RISC2 180#ifndef DES_RISC2
126#define DES_RISC2 181#undef DES_RISC2
127#endif 182#endif
128 183
129#if defined(DES_RISC1) && defined(DES_RISC2) 184#if defined(DES_RISC1) && defined(DES_RISC2)
@@ -133,7 +188,7 @@ YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
133/* Unroll the inner loop, this sometimes helps, sometimes hinders. 188/* Unroll the inner loop, this sometimes helps, sometimes hinders.
134 * Very mucy CPU dependant */ 189 * Very mucy CPU dependant */
135#ifndef DES_UNROLL 190#ifndef DES_UNROLL
136#undef DES_UNROLL 191#define DES_UNROLL
137#endif 192#endif
138 193
139/* These default values were supplied by 194/* These default values were supplied by
diff --git a/src/lib/libssl/crypto/arch/arm/opensslconf.h b/src/lib/libssl/crypto/arch/arm/opensslconf.h
index 47a6dd8596..94d322270b 100644
--- a/src/lib/libssl/crypto/arch/arm/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/arm/opensslconf.h
@@ -4,20 +4,74 @@
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#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA
9#endif
10#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS
12#endif
13#ifndef OPENSSL_NO_GMP
14# define OPENSSL_NO_GMP
15#endif
7#ifndef OPENSSL_NO_KRB5 16#ifndef OPENSSL_NO_KRB5
8# define OPENSSL_NO_KRB5 17# define OPENSSL_NO_KRB5
9#endif 18#endif
19#ifndef OPENSSL_NO_MDC2
20# define OPENSSL_NO_MDC2
21#endif
22#ifndef OPENSSL_NO_RC5
23# define OPENSSL_NO_RC5
24#endif
25#ifndef OPENSSL_NO_RFC3779
26# define OPENSSL_NO_RFC3779
27#endif
28#ifndef OPENSSL_NO_SEED
29# define OPENSSL_NO_SEED
30#endif
31#ifndef OPENSSL_NO_TLSEXT
32# define OPENSSL_NO_TLSEXT
33#endif
10 34
11#endif /* OPENSSL_DOING_MAKEDEPEND */ 35#endif /* OPENSSL_DOING_MAKEDEPEND */
36#ifndef OPENSSL_THREADS
37# define OPENSSL_THREADS
38#endif
39#ifndef OPENSSL_NO_DYNAMIC_ENGINE
40# define OPENSSL_NO_DYNAMIC_ENGINE
41#endif
12 42
13/* The OPENSSL_NO_* macros are also defined as NO_* if the application 43/* The OPENSSL_NO_* macros are also defined as NO_* if the application
14 asks for it. This is a transient feature that is provided for those 44 asks for it. This is a transient feature that is provided for those
15 who haven't had the time to do the appropriate changes in their 45 who haven't had the time to do the appropriate changes in their
16 applications. */ 46 applications. */
17#ifdef OPENSSL_ALGORITHM_DEFINES 47#ifdef OPENSSL_ALGORITHM_DEFINES
48# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
49# define NO_CAMELLIA
50# endif
51# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
52# define NO_CMS
53# endif
54# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
55# define NO_GMP
56# endif
18# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 57# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
19# define NO_KRB5 58# define NO_KRB5
20# endif 59# endif
60# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
61# define NO_MDC2
62# endif
63# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
64# define NO_RC5
65# endif
66# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
67# define NO_RFC3779
68# endif
69# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
70# define NO_SEED
71# endif
72# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT)
73# define NO_TLSEXT
74# endif
21#endif 75#endif
22 76
23/* crypto/opensslconf.h.in */ 77/* crypto/opensslconf.h.in */
@@ -27,6 +81,7 @@
27 81
28#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ 82#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
29#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 83#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
84#define ENGINESDIR "/usr/lib/engines"
30#define OPENSSLDIR "/etc/ssl" 85#define OPENSSLDIR "/etc/ssl"
31#endif 86#endif
32#endif 87#endif
@@ -69,7 +124,7 @@
69#endif 124#endif
70#endif 125#endif
71 126
72#if (defined(HEADER_DES_H) || defined(HEADER_DES_OLD_H)) && !defined(DES_LONG) 127#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
73/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 128/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
74 * %20 speed up (longs are 8 bytes, int's are 4). */ 129 * %20 speed up (longs are 8 bytes, int's are 4). */
75#ifndef DES_LONG 130#ifndef DES_LONG
diff --git a/src/lib/libssl/crypto/arch/hppa/opensslconf.h b/src/lib/libssl/crypto/arch/hppa/opensslconf.h
index 0334dbdfc6..94d322270b 100644
--- a/src/lib/libssl/crypto/arch/hppa/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/hppa/opensslconf.h
@@ -4,20 +4,74 @@
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#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA
9#endif
10#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS
12#endif
13#ifndef OPENSSL_NO_GMP
14# define OPENSSL_NO_GMP
15#endif
7#ifndef OPENSSL_NO_KRB5 16#ifndef OPENSSL_NO_KRB5
8# define OPENSSL_NO_KRB5 17# define OPENSSL_NO_KRB5
9#endif 18#endif
19#ifndef OPENSSL_NO_MDC2
20# define OPENSSL_NO_MDC2
21#endif
22#ifndef OPENSSL_NO_RC5
23# define OPENSSL_NO_RC5
24#endif
25#ifndef OPENSSL_NO_RFC3779
26# define OPENSSL_NO_RFC3779
27#endif
28#ifndef OPENSSL_NO_SEED
29# define OPENSSL_NO_SEED
30#endif
31#ifndef OPENSSL_NO_TLSEXT
32# define OPENSSL_NO_TLSEXT
33#endif
10 34
11#endif /* OPENSSL_DOING_MAKEDEPEND */ 35#endif /* OPENSSL_DOING_MAKEDEPEND */
36#ifndef OPENSSL_THREADS
37# define OPENSSL_THREADS
38#endif
39#ifndef OPENSSL_NO_DYNAMIC_ENGINE
40# define OPENSSL_NO_DYNAMIC_ENGINE
41#endif
12 42
13/* The OPENSSL_NO_* macros are also defined as NO_* if the application 43/* The OPENSSL_NO_* macros are also defined as NO_* if the application
14 asks for it. This is a transient feature that is provided for those 44 asks for it. This is a transient feature that is provided for those
15 who haven't had the time to do the appropriate changes in their 45 who haven't had the time to do the appropriate changes in their
16 applications. */ 46 applications. */
17#ifdef OPENSSL_ALGORITHM_DEFINES 47#ifdef OPENSSL_ALGORITHM_DEFINES
48# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
49# define NO_CAMELLIA
50# endif
51# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
52# define NO_CMS
53# endif
54# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
55# define NO_GMP
56# endif
18# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 57# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
19# define NO_KRB5 58# define NO_KRB5
20# endif 59# endif
60# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
61# define NO_MDC2
62# endif
63# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
64# define NO_RC5
65# endif
66# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
67# define NO_RFC3779
68# endif
69# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
70# define NO_SEED
71# endif
72# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT)
73# define NO_TLSEXT
74# endif
21#endif 75#endif
22 76
23/* crypto/opensslconf.h.in */ 77/* crypto/opensslconf.h.in */
@@ -27,6 +81,7 @@
27 81
28#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ 82#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
29#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 83#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
84#define ENGINESDIR "/usr/lib/engines"
30#define OPENSSLDIR "/etc/ssl" 85#define OPENSSLDIR "/etc/ssl"
31#endif 86#endif
32#endif 87#endif
@@ -69,11 +124,11 @@
69#endif 124#endif
70#endif 125#endif
71 126
72#if (defined(HEADER_DES_H) || defined(HEADER_DES_OLD_H)) && !defined(DES_LONG) 127#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
73/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 128/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
74 * %20 speed up (longs are 8 bytes, int's are 4). */ 129 * %20 speed up (longs are 8 bytes, int's are 4). */
75#ifndef DES_LONG 130#ifndef DES_LONG
76#define DES_LONG unsigned long 131#define DES_LONG unsigned int
77#endif 132#endif
78#endif 133#endif
79 134
diff --git a/src/lib/libssl/crypto/arch/i386/opensslconf.h b/src/lib/libssl/crypto/arch/i386/opensslconf.h
index 7361ac56a1..98b7b58408 100644
--- a/src/lib/libssl/crypto/arch/i386/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/i386/opensslconf.h
@@ -4,20 +4,74 @@
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#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA
9#endif
10#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS
12#endif
13#ifndef OPENSSL_NO_GMP
14# define OPENSSL_NO_GMP
15#endif
7#ifndef OPENSSL_NO_KRB5 16#ifndef OPENSSL_NO_KRB5
8# define OPENSSL_NO_KRB5 17# define OPENSSL_NO_KRB5
9#endif 18#endif
19#ifndef OPENSSL_NO_MDC2
20# define OPENSSL_NO_MDC2
21#endif
22#ifndef OPENSSL_NO_RC5
23# define OPENSSL_NO_RC5
24#endif
25#ifndef OPENSSL_NO_RFC3779
26# define OPENSSL_NO_RFC3779
27#endif
28#ifndef OPENSSL_NO_SEED
29# define OPENSSL_NO_SEED
30#endif
31#ifndef OPENSSL_NO_TLSEXT
32# define OPENSSL_NO_TLSEXT
33#endif
10 34
11#endif /* OPENSSL_DOING_MAKEDEPEND */ 35#endif /* OPENSSL_DOING_MAKEDEPEND */
36#ifndef OPENSSL_THREADS
37# define OPENSSL_THREADS
38#endif
39#ifndef OPENSSL_NO_DYNAMIC_ENGINE
40# define OPENSSL_NO_DYNAMIC_ENGINE
41#endif
12 42
13/* The OPENSSL_NO_* macros are also defined as NO_* if the application 43/* The OPENSSL_NO_* macros are also defined as NO_* if the application
14 asks for it. This is a transient feature that is provided for those 44 asks for it. This is a transient feature that is provided for those
15 who haven't had the time to do the appropriate changes in their 45 who haven't had the time to do the appropriate changes in their
16 applications. */ 46 applications. */
17#ifdef OPENSSL_ALGORITHM_DEFINES 47#ifdef OPENSSL_ALGORITHM_DEFINES
48# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
49# define NO_CAMELLIA
50# endif
51# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
52# define NO_CMS
53# endif
54# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
55# define NO_GMP
56# endif
18# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 57# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
19# define NO_KRB5 58# define NO_KRB5
20# endif 59# endif
60# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
61# define NO_MDC2
62# endif
63# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
64# define NO_RC5
65# endif
66# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
67# define NO_RFC3779
68# endif
69# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
70# define NO_SEED
71# endif
72# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT)
73# define NO_TLSEXT
74# endif
21#endif 75#endif
22 76
23/* crypto/opensslconf.h.in */ 77/* crypto/opensslconf.h.in */
@@ -27,6 +81,7 @@
27 81
28#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ 82#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
29#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 83#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
84#define ENGINESDIR "/usr/lib/engines"
30#define OPENSSLDIR "/etc/ssl" 85#define OPENSSLDIR "/etc/ssl"
31#endif 86#endif
32#endif 87#endif
@@ -69,7 +124,7 @@
69#endif 124#endif
70#endif 125#endif
71 126
72#if (defined(HEADER_DES_H) || defined(HEADER_DES_OLD_H)) && !defined(DES_LONG) 127#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
73/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 128/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
74 * %20 speed up (longs are 8 bytes, int's are 4). */ 129 * %20 speed up (longs are 8 bytes, int's are 4). */
75#ifndef DES_LONG 130#ifndef DES_LONG
diff --git a/src/lib/libssl/crypto/arch/m68k/opensslconf.h b/src/lib/libssl/crypto/arch/m68k/opensslconf.h
index 47a6dd8596..94d322270b 100644
--- a/src/lib/libssl/crypto/arch/m68k/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/m68k/opensslconf.h
@@ -4,20 +4,74 @@
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#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA
9#endif
10#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS
12#endif
13#ifndef OPENSSL_NO_GMP
14# define OPENSSL_NO_GMP
15#endif
7#ifndef OPENSSL_NO_KRB5 16#ifndef OPENSSL_NO_KRB5
8# define OPENSSL_NO_KRB5 17# define OPENSSL_NO_KRB5
9#endif 18#endif
19#ifndef OPENSSL_NO_MDC2
20# define OPENSSL_NO_MDC2
21#endif
22#ifndef OPENSSL_NO_RC5
23# define OPENSSL_NO_RC5
24#endif
25#ifndef OPENSSL_NO_RFC3779
26# define OPENSSL_NO_RFC3779
27#endif
28#ifndef OPENSSL_NO_SEED
29# define OPENSSL_NO_SEED
30#endif
31#ifndef OPENSSL_NO_TLSEXT
32# define OPENSSL_NO_TLSEXT
33#endif
10 34
11#endif /* OPENSSL_DOING_MAKEDEPEND */ 35#endif /* OPENSSL_DOING_MAKEDEPEND */
36#ifndef OPENSSL_THREADS
37# define OPENSSL_THREADS
38#endif
39#ifndef OPENSSL_NO_DYNAMIC_ENGINE
40# define OPENSSL_NO_DYNAMIC_ENGINE
41#endif
12 42
13/* The OPENSSL_NO_* macros are also defined as NO_* if the application 43/* The OPENSSL_NO_* macros are also defined as NO_* if the application
14 asks for it. This is a transient feature that is provided for those 44 asks for it. This is a transient feature that is provided for those
15 who haven't had the time to do the appropriate changes in their 45 who haven't had the time to do the appropriate changes in their
16 applications. */ 46 applications. */
17#ifdef OPENSSL_ALGORITHM_DEFINES 47#ifdef OPENSSL_ALGORITHM_DEFINES
48# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
49# define NO_CAMELLIA
50# endif
51# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
52# define NO_CMS
53# endif
54# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
55# define NO_GMP
56# endif
18# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 57# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
19# define NO_KRB5 58# define NO_KRB5
20# endif 59# endif
60# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
61# define NO_MDC2
62# endif
63# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
64# define NO_RC5
65# endif
66# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
67# define NO_RFC3779
68# endif
69# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
70# define NO_SEED
71# endif
72# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT)
73# define NO_TLSEXT
74# endif
21#endif 75#endif
22 76
23/* crypto/opensslconf.h.in */ 77/* crypto/opensslconf.h.in */
@@ -27,6 +81,7 @@
27 81
28#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ 82#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
29#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 83#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
84#define ENGINESDIR "/usr/lib/engines"
30#define OPENSSLDIR "/etc/ssl" 85#define OPENSSLDIR "/etc/ssl"
31#endif 86#endif
32#endif 87#endif
@@ -69,7 +124,7 @@
69#endif 124#endif
70#endif 125#endif
71 126
72#if (defined(HEADER_DES_H) || defined(HEADER_DES_OLD_H)) && !defined(DES_LONG) 127#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
73/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 128/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
74 * %20 speed up (longs are 8 bytes, int's are 4). */ 129 * %20 speed up (longs are 8 bytes, int's are 4). */
75#ifndef DES_LONG 130#ifndef DES_LONG
diff --git a/src/lib/libssl/crypto/arch/m88k/opensslconf.h b/src/lib/libssl/crypto/arch/m88k/opensslconf.h
index 47a6dd8596..94d322270b 100644
--- a/src/lib/libssl/crypto/arch/m88k/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/m88k/opensslconf.h
@@ -4,20 +4,74 @@
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#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA
9#endif
10#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS
12#endif
13#ifndef OPENSSL_NO_GMP
14# define OPENSSL_NO_GMP
15#endif
7#ifndef OPENSSL_NO_KRB5 16#ifndef OPENSSL_NO_KRB5
8# define OPENSSL_NO_KRB5 17# define OPENSSL_NO_KRB5
9#endif 18#endif
19#ifndef OPENSSL_NO_MDC2
20# define OPENSSL_NO_MDC2
21#endif
22#ifndef OPENSSL_NO_RC5
23# define OPENSSL_NO_RC5
24#endif
25#ifndef OPENSSL_NO_RFC3779
26# define OPENSSL_NO_RFC3779
27#endif
28#ifndef OPENSSL_NO_SEED
29# define OPENSSL_NO_SEED
30#endif
31#ifndef OPENSSL_NO_TLSEXT
32# define OPENSSL_NO_TLSEXT
33#endif
10 34
11#endif /* OPENSSL_DOING_MAKEDEPEND */ 35#endif /* OPENSSL_DOING_MAKEDEPEND */
36#ifndef OPENSSL_THREADS
37# define OPENSSL_THREADS
38#endif
39#ifndef OPENSSL_NO_DYNAMIC_ENGINE
40# define OPENSSL_NO_DYNAMIC_ENGINE
41#endif
12 42
13/* The OPENSSL_NO_* macros are also defined as NO_* if the application 43/* The OPENSSL_NO_* macros are also defined as NO_* if the application
14 asks for it. This is a transient feature that is provided for those 44 asks for it. This is a transient feature that is provided for those
15 who haven't had the time to do the appropriate changes in their 45 who haven't had the time to do the appropriate changes in their
16 applications. */ 46 applications. */
17#ifdef OPENSSL_ALGORITHM_DEFINES 47#ifdef OPENSSL_ALGORITHM_DEFINES
48# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
49# define NO_CAMELLIA
50# endif
51# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
52# define NO_CMS
53# endif
54# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
55# define NO_GMP
56# endif
18# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 57# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
19# define NO_KRB5 58# define NO_KRB5
20# endif 59# endif
60# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
61# define NO_MDC2
62# endif
63# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
64# define NO_RC5
65# endif
66# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
67# define NO_RFC3779
68# endif
69# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
70# define NO_SEED
71# endif
72# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT)
73# define NO_TLSEXT
74# endif
21#endif 75#endif
22 76
23/* crypto/opensslconf.h.in */ 77/* crypto/opensslconf.h.in */
@@ -27,6 +81,7 @@
27 81
28#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ 82#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
29#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 83#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
84#define ENGINESDIR "/usr/lib/engines"
30#define OPENSSLDIR "/etc/ssl" 85#define OPENSSLDIR "/etc/ssl"
31#endif 86#endif
32#endif 87#endif
@@ -69,7 +124,7 @@
69#endif 124#endif
70#endif 125#endif
71 126
72#if (defined(HEADER_DES_H) || defined(HEADER_DES_OLD_H)) && !defined(DES_LONG) 127#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
73/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 128/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
74 * %20 speed up (longs are 8 bytes, int's are 4). */ 129 * %20 speed up (longs are 8 bytes, int's are 4). */
75#ifndef DES_LONG 130#ifndef DES_LONG
diff --git a/src/lib/libssl/crypto/arch/mips64/opensslconf.h b/src/lib/libssl/crypto/arch/mips64/opensslconf.h
index c33ccc8a0f..0d759a5784 100644
--- a/src/lib/libssl/crypto/arch/mips64/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/mips64/opensslconf.h
@@ -4,20 +4,74 @@
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#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA
9#endif
10#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS
12#endif
13#ifndef OPENSSL_NO_GMP
14# define OPENSSL_NO_GMP
15#endif
7#ifndef OPENSSL_NO_KRB5 16#ifndef OPENSSL_NO_KRB5
8# define OPENSSL_NO_KRB5 17# define OPENSSL_NO_KRB5
9#endif 18#endif
19#ifndef OPENSSL_NO_MDC2
20# define OPENSSL_NO_MDC2
21#endif
22#ifndef OPENSSL_NO_RC5
23# define OPENSSL_NO_RC5
24#endif
25#ifndef OPENSSL_NO_RFC3779
26# define OPENSSL_NO_RFC3779
27#endif
28#ifndef OPENSSL_NO_SEED
29# define OPENSSL_NO_SEED
30#endif
31#ifndef OPENSSL_NO_TLSEXT
32# define OPENSSL_NO_TLSEXT
33#endif
10 34
11#endif /* OPENSSL_DOING_MAKEDEPEND */ 35#endif /* OPENSSL_DOING_MAKEDEPEND */
36#ifndef OPENSSL_THREADS
37# define OPENSSL_THREADS
38#endif
39#ifndef OPENSSL_NO_DYNAMIC_ENGINE
40# define OPENSSL_NO_DYNAMIC_ENGINE
41#endif
12 42
13/* The OPENSSL_NO_* macros are also defined as NO_* if the application 43/* The OPENSSL_NO_* macros are also defined as NO_* if the application
14 asks for it. This is a transient feature that is provided for those 44 asks for it. This is a transient feature that is provided for those
15 who haven't had the time to do the appropriate changes in their 45 who haven't had the time to do the appropriate changes in their
16 applications. */ 46 applications. */
17#ifdef OPENSSL_ALGORITHM_DEFINES 47#ifdef OPENSSL_ALGORITHM_DEFINES
48# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
49# define NO_CAMELLIA
50# endif
51# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
52# define NO_CMS
53# endif
54# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
55# define NO_GMP
56# endif
18# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 57# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
19# define NO_KRB5 58# define NO_KRB5
20# endif 59# endif
60# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
61# define NO_MDC2
62# endif
63# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
64# define NO_RC5
65# endif
66# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
67# define NO_RFC3779
68# endif
69# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
70# define NO_SEED
71# endif
72# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT)
73# define NO_TLSEXT
74# endif
21#endif 75#endif
22 76
23/* crypto/opensslconf.h.in */ 77/* crypto/opensslconf.h.in */
@@ -27,6 +81,7 @@
27 81
28#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ 82#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
29#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 83#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
84#define ENGINESDIR "/usr/lib/engines"
30#define OPENSSLDIR "/etc/ssl" 85#define OPENSSLDIR "/etc/ssl"
31#endif 86#endif
32#endif 87#endif
@@ -65,11 +120,11 @@
65 * This enables code handling data aligned at natural CPU word 120 * This enables code handling data aligned at natural CPU word
66 * boundary. See crypto/rc4/rc4_enc.c for further details. 121 * boundary. See crypto/rc4/rc4_enc.c for further details.
67 */ 122 */
68#undef RC4_CHUNK 123#define RC4_CHUNK unsigned long
69#endif 124#endif
70#endif 125#endif
71 126
72#if (defined(HEADER_DES_H) || defined(HEADER_DES_OLD_H)) && !defined(DES_LONG) 127#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
73/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 128/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
74 * %20 speed up (longs are 8 bytes, int's are 4). */ 129 * %20 speed up (longs are 8 bytes, int's are 4). */
75#ifndef DES_LONG 130#ifndef DES_LONG
@@ -103,7 +158,7 @@
103 158
104#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) 159#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
105#define CONFIG_HEADER_BF_LOCL_H 160#define CONFIG_HEADER_BF_LOCL_H
106#undef BF_PTR 161#define BF_PTR
107#endif /* HEADER_BF_LOCL_H */ 162#endif /* HEADER_BF_LOCL_H */
108 163
109#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) 164#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
diff --git a/src/lib/libssl/crypto/arch/powerpc/opensslconf.h b/src/lib/libssl/crypto/arch/powerpc/opensslconf.h
index 47a6dd8596..94d322270b 100644
--- a/src/lib/libssl/crypto/arch/powerpc/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/powerpc/opensslconf.h
@@ -4,20 +4,74 @@
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#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA
9#endif
10#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS
12#endif
13#ifndef OPENSSL_NO_GMP
14# define OPENSSL_NO_GMP
15#endif
7#ifndef OPENSSL_NO_KRB5 16#ifndef OPENSSL_NO_KRB5
8# define OPENSSL_NO_KRB5 17# define OPENSSL_NO_KRB5
9#endif 18#endif
19#ifndef OPENSSL_NO_MDC2
20# define OPENSSL_NO_MDC2
21#endif
22#ifndef OPENSSL_NO_RC5
23# define OPENSSL_NO_RC5
24#endif
25#ifndef OPENSSL_NO_RFC3779
26# define OPENSSL_NO_RFC3779
27#endif
28#ifndef OPENSSL_NO_SEED
29# define OPENSSL_NO_SEED
30#endif
31#ifndef OPENSSL_NO_TLSEXT
32# define OPENSSL_NO_TLSEXT
33#endif
10 34
11#endif /* OPENSSL_DOING_MAKEDEPEND */ 35#endif /* OPENSSL_DOING_MAKEDEPEND */
36#ifndef OPENSSL_THREADS
37# define OPENSSL_THREADS
38#endif
39#ifndef OPENSSL_NO_DYNAMIC_ENGINE
40# define OPENSSL_NO_DYNAMIC_ENGINE
41#endif
12 42
13/* The OPENSSL_NO_* macros are also defined as NO_* if the application 43/* The OPENSSL_NO_* macros are also defined as NO_* if the application
14 asks for it. This is a transient feature that is provided for those 44 asks for it. This is a transient feature that is provided for those
15 who haven't had the time to do the appropriate changes in their 45 who haven't had the time to do the appropriate changes in their
16 applications. */ 46 applications. */
17#ifdef OPENSSL_ALGORITHM_DEFINES 47#ifdef OPENSSL_ALGORITHM_DEFINES
48# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
49# define NO_CAMELLIA
50# endif
51# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
52# define NO_CMS
53# endif
54# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
55# define NO_GMP
56# endif
18# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 57# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
19# define NO_KRB5 58# define NO_KRB5
20# endif 59# endif
60# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
61# define NO_MDC2
62# endif
63# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
64# define NO_RC5
65# endif
66# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
67# define NO_RFC3779
68# endif
69# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
70# define NO_SEED
71# endif
72# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT)
73# define NO_TLSEXT
74# endif
21#endif 75#endif
22 76
23/* crypto/opensslconf.h.in */ 77/* crypto/opensslconf.h.in */
@@ -27,6 +81,7 @@
27 81
28#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ 82#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
29#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 83#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
84#define ENGINESDIR "/usr/lib/engines"
30#define OPENSSLDIR "/etc/ssl" 85#define OPENSSLDIR "/etc/ssl"
31#endif 86#endif
32#endif 87#endif
@@ -69,7 +124,7 @@
69#endif 124#endif
70#endif 125#endif
71 126
72#if (defined(HEADER_DES_H) || defined(HEADER_DES_OLD_H)) && !defined(DES_LONG) 127#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
73/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 128/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
74 * %20 speed up (longs are 8 bytes, int's are 4). */ 129 * %20 speed up (longs are 8 bytes, int's are 4). */
75#ifndef DES_LONG 130#ifndef DES_LONG
diff --git a/src/lib/libssl/crypto/arch/sh/opensslconf.h b/src/lib/libssl/crypto/arch/sh/opensslconf.h
index 47a6dd8596..94d322270b 100644
--- a/src/lib/libssl/crypto/arch/sh/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/sh/opensslconf.h
@@ -4,20 +4,74 @@
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#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA
9#endif
10#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS
12#endif
13#ifndef OPENSSL_NO_GMP
14# define OPENSSL_NO_GMP
15#endif
7#ifndef OPENSSL_NO_KRB5 16#ifndef OPENSSL_NO_KRB5
8# define OPENSSL_NO_KRB5 17# define OPENSSL_NO_KRB5
9#endif 18#endif
19#ifndef OPENSSL_NO_MDC2
20# define OPENSSL_NO_MDC2
21#endif
22#ifndef OPENSSL_NO_RC5
23# define OPENSSL_NO_RC5
24#endif
25#ifndef OPENSSL_NO_RFC3779
26# define OPENSSL_NO_RFC3779
27#endif
28#ifndef OPENSSL_NO_SEED
29# define OPENSSL_NO_SEED
30#endif
31#ifndef OPENSSL_NO_TLSEXT
32# define OPENSSL_NO_TLSEXT
33#endif
10 34
11#endif /* OPENSSL_DOING_MAKEDEPEND */ 35#endif /* OPENSSL_DOING_MAKEDEPEND */
36#ifndef OPENSSL_THREADS
37# define OPENSSL_THREADS
38#endif
39#ifndef OPENSSL_NO_DYNAMIC_ENGINE
40# define OPENSSL_NO_DYNAMIC_ENGINE
41#endif
12 42
13/* The OPENSSL_NO_* macros are also defined as NO_* if the application 43/* The OPENSSL_NO_* macros are also defined as NO_* if the application
14 asks for it. This is a transient feature that is provided for those 44 asks for it. This is a transient feature that is provided for those
15 who haven't had the time to do the appropriate changes in their 45 who haven't had the time to do the appropriate changes in their
16 applications. */ 46 applications. */
17#ifdef OPENSSL_ALGORITHM_DEFINES 47#ifdef OPENSSL_ALGORITHM_DEFINES
48# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
49# define NO_CAMELLIA
50# endif
51# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
52# define NO_CMS
53# endif
54# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
55# define NO_GMP
56# endif
18# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 57# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
19# define NO_KRB5 58# define NO_KRB5
20# endif 59# endif
60# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
61# define NO_MDC2
62# endif
63# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
64# define NO_RC5
65# endif
66# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
67# define NO_RFC3779
68# endif
69# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
70# define NO_SEED
71# endif
72# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT)
73# define NO_TLSEXT
74# endif
21#endif 75#endif
22 76
23/* crypto/opensslconf.h.in */ 77/* crypto/opensslconf.h.in */
@@ -27,6 +81,7 @@
27 81
28#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ 82#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
29#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 83#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
84#define ENGINESDIR "/usr/lib/engines"
30#define OPENSSLDIR "/etc/ssl" 85#define OPENSSLDIR "/etc/ssl"
31#endif 86#endif
32#endif 87#endif
@@ -69,7 +124,7 @@
69#endif 124#endif
70#endif 125#endif
71 126
72#if (defined(HEADER_DES_H) || defined(HEADER_DES_OLD_H)) && !defined(DES_LONG) 127#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
73/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 128/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
74 * %20 speed up (longs are 8 bytes, int's are 4). */ 129 * %20 speed up (longs are 8 bytes, int's are 4). */
75#ifndef DES_LONG 130#ifndef DES_LONG
diff --git a/src/lib/libssl/crypto/arch/sparc/opensslconf.h b/src/lib/libssl/crypto/arch/sparc/opensslconf.h
index 47a6dd8596..94d322270b 100644
--- a/src/lib/libssl/crypto/arch/sparc/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/sparc/opensslconf.h
@@ -4,20 +4,74 @@
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#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA
9#endif
10#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS
12#endif
13#ifndef OPENSSL_NO_GMP
14# define OPENSSL_NO_GMP
15#endif
7#ifndef OPENSSL_NO_KRB5 16#ifndef OPENSSL_NO_KRB5
8# define OPENSSL_NO_KRB5 17# define OPENSSL_NO_KRB5
9#endif 18#endif
19#ifndef OPENSSL_NO_MDC2
20# define OPENSSL_NO_MDC2
21#endif
22#ifndef OPENSSL_NO_RC5
23# define OPENSSL_NO_RC5
24#endif
25#ifndef OPENSSL_NO_RFC3779
26# define OPENSSL_NO_RFC3779
27#endif
28#ifndef OPENSSL_NO_SEED
29# define OPENSSL_NO_SEED
30#endif
31#ifndef OPENSSL_NO_TLSEXT
32# define OPENSSL_NO_TLSEXT
33#endif
10 34
11#endif /* OPENSSL_DOING_MAKEDEPEND */ 35#endif /* OPENSSL_DOING_MAKEDEPEND */
36#ifndef OPENSSL_THREADS
37# define OPENSSL_THREADS
38#endif
39#ifndef OPENSSL_NO_DYNAMIC_ENGINE
40# define OPENSSL_NO_DYNAMIC_ENGINE
41#endif
12 42
13/* The OPENSSL_NO_* macros are also defined as NO_* if the application 43/* The OPENSSL_NO_* macros are also defined as NO_* if the application
14 asks for it. This is a transient feature that is provided for those 44 asks for it. This is a transient feature that is provided for those
15 who haven't had the time to do the appropriate changes in their 45 who haven't had the time to do the appropriate changes in their
16 applications. */ 46 applications. */
17#ifdef OPENSSL_ALGORITHM_DEFINES 47#ifdef OPENSSL_ALGORITHM_DEFINES
48# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
49# define NO_CAMELLIA
50# endif
51# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
52# define NO_CMS
53# endif
54# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
55# define NO_GMP
56# endif
18# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 57# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
19# define NO_KRB5 58# define NO_KRB5
20# endif 59# endif
60# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
61# define NO_MDC2
62# endif
63# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
64# define NO_RC5
65# endif
66# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
67# define NO_RFC3779
68# endif
69# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
70# define NO_SEED
71# endif
72# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT)
73# define NO_TLSEXT
74# endif
21#endif 75#endif
22 76
23/* crypto/opensslconf.h.in */ 77/* crypto/opensslconf.h.in */
@@ -27,6 +81,7 @@
27 81
28#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ 82#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
29#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 83#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
84#define ENGINESDIR "/usr/lib/engines"
30#define OPENSSLDIR "/etc/ssl" 85#define OPENSSLDIR "/etc/ssl"
31#endif 86#endif
32#endif 87#endif
@@ -69,7 +124,7 @@
69#endif 124#endif
70#endif 125#endif
71 126
72#if (defined(HEADER_DES_H) || defined(HEADER_DES_OLD_H)) && !defined(DES_LONG) 127#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
73/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 128/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
74 * %20 speed up (longs are 8 bytes, int's are 4). */ 129 * %20 speed up (longs are 8 bytes, int's are 4). */
75#ifndef DES_LONG 130#ifndef DES_LONG
diff --git a/src/lib/libssl/crypto/arch/sparc64/opensslconf.h b/src/lib/libssl/crypto/arch/sparc64/opensslconf.h
index 053308653b..0d759a5784 100644
--- a/src/lib/libssl/crypto/arch/sparc64/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/sparc64/opensslconf.h
@@ -4,20 +4,74 @@
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#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA
9#endif
10#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS
12#endif
13#ifndef OPENSSL_NO_GMP
14# define OPENSSL_NO_GMP
15#endif
7#ifndef OPENSSL_NO_KRB5 16#ifndef OPENSSL_NO_KRB5
8# define OPENSSL_NO_KRB5 17# define OPENSSL_NO_KRB5
9#endif 18#endif
19#ifndef OPENSSL_NO_MDC2
20# define OPENSSL_NO_MDC2
21#endif
22#ifndef OPENSSL_NO_RC5
23# define OPENSSL_NO_RC5
24#endif
25#ifndef OPENSSL_NO_RFC3779
26# define OPENSSL_NO_RFC3779
27#endif
28#ifndef OPENSSL_NO_SEED
29# define OPENSSL_NO_SEED
30#endif
31#ifndef OPENSSL_NO_TLSEXT
32# define OPENSSL_NO_TLSEXT
33#endif
10 34
11#endif /* OPENSSL_DOING_MAKEDEPEND */ 35#endif /* OPENSSL_DOING_MAKEDEPEND */
36#ifndef OPENSSL_THREADS
37# define OPENSSL_THREADS
38#endif
39#ifndef OPENSSL_NO_DYNAMIC_ENGINE
40# define OPENSSL_NO_DYNAMIC_ENGINE
41#endif
12 42
13/* The OPENSSL_NO_* macros are also defined as NO_* if the application 43/* The OPENSSL_NO_* macros are also defined as NO_* if the application
14 asks for it. This is a transient feature that is provided for those 44 asks for it. This is a transient feature that is provided for those
15 who haven't had the time to do the appropriate changes in their 45 who haven't had the time to do the appropriate changes in their
16 applications. */ 46 applications. */
17#ifdef OPENSSL_ALGORITHM_DEFINES 47#ifdef OPENSSL_ALGORITHM_DEFINES
48# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
49# define NO_CAMELLIA
50# endif
51# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
52# define NO_CMS
53# endif
54# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
55# define NO_GMP
56# endif
18# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 57# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
19# define NO_KRB5 58# define NO_KRB5
20# endif 59# endif
60# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
61# define NO_MDC2
62# endif
63# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
64# define NO_RC5
65# endif
66# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
67# define NO_RFC3779
68# endif
69# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
70# define NO_SEED
71# endif
72# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT)
73# define NO_TLSEXT
74# endif
21#endif 75#endif
22 76
23/* crypto/opensslconf.h.in */ 77/* crypto/opensslconf.h.in */
@@ -27,6 +81,7 @@
27 81
28#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ 82#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
29#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 83#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
84#define ENGINESDIR "/usr/lib/engines"
30#define OPENSSLDIR "/etc/ssl" 85#define OPENSSLDIR "/etc/ssl"
31#endif 86#endif
32#endif 87#endif
@@ -65,11 +120,11 @@
65 * This enables code handling data aligned at natural CPU word 120 * This enables code handling data aligned at natural CPU word
66 * boundary. See crypto/rc4/rc4_enc.c for further details. 121 * boundary. See crypto/rc4/rc4_enc.c for further details.
67 */ 122 */
68#undef RC4_CHUNK 123#define RC4_CHUNK unsigned long
69#endif 124#endif
70#endif 125#endif
71 126
72#if (defined(HEADER_DES_H) || defined(HEADER_DES_OLD_H)) && !defined(DES_LONG) 127#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
73/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 128/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
74 * %20 speed up (longs are 8 bytes, int's are 4). */ 129 * %20 speed up (longs are 8 bytes, int's are 4). */
75#ifndef DES_LONG 130#ifndef DES_LONG
diff --git a/src/lib/libssl/crypto/arch/vax/opensslconf.h b/src/lib/libssl/crypto/arch/vax/opensslconf.h
index 47a6dd8596..94d322270b 100644
--- a/src/lib/libssl/crypto/arch/vax/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/vax/opensslconf.h
@@ -4,20 +4,74 @@
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#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA
9#endif
10#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS
12#endif
13#ifndef OPENSSL_NO_GMP
14# define OPENSSL_NO_GMP
15#endif
7#ifndef OPENSSL_NO_KRB5 16#ifndef OPENSSL_NO_KRB5
8# define OPENSSL_NO_KRB5 17# define OPENSSL_NO_KRB5
9#endif 18#endif
19#ifndef OPENSSL_NO_MDC2
20# define OPENSSL_NO_MDC2
21#endif
22#ifndef OPENSSL_NO_RC5
23# define OPENSSL_NO_RC5
24#endif
25#ifndef OPENSSL_NO_RFC3779
26# define OPENSSL_NO_RFC3779
27#endif
28#ifndef OPENSSL_NO_SEED
29# define OPENSSL_NO_SEED
30#endif
31#ifndef OPENSSL_NO_TLSEXT
32# define OPENSSL_NO_TLSEXT
33#endif
10 34
11#endif /* OPENSSL_DOING_MAKEDEPEND */ 35#endif /* OPENSSL_DOING_MAKEDEPEND */
36#ifndef OPENSSL_THREADS
37# define OPENSSL_THREADS
38#endif
39#ifndef OPENSSL_NO_DYNAMIC_ENGINE
40# define OPENSSL_NO_DYNAMIC_ENGINE
41#endif
12 42
13/* The OPENSSL_NO_* macros are also defined as NO_* if the application 43/* The OPENSSL_NO_* macros are also defined as NO_* if the application
14 asks for it. This is a transient feature that is provided for those 44 asks for it. This is a transient feature that is provided for those
15 who haven't had the time to do the appropriate changes in their 45 who haven't had the time to do the appropriate changes in their
16 applications. */ 46 applications. */
17#ifdef OPENSSL_ALGORITHM_DEFINES 47#ifdef OPENSSL_ALGORITHM_DEFINES
48# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
49# define NO_CAMELLIA
50# endif
51# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
52# define NO_CMS
53# endif
54# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
55# define NO_GMP
56# endif
18# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 57# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
19# define NO_KRB5 58# define NO_KRB5
20# endif 59# endif
60# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
61# define NO_MDC2
62# endif
63# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
64# define NO_RC5
65# endif
66# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
67# define NO_RFC3779
68# endif
69# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
70# define NO_SEED
71# endif
72# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT)
73# define NO_TLSEXT
74# endif
21#endif 75#endif
22 76
23/* crypto/opensslconf.h.in */ 77/* crypto/opensslconf.h.in */
@@ -27,6 +81,7 @@
27 81
28#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ 82#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
29#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 83#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
84#define ENGINESDIR "/usr/lib/engines"
30#define OPENSSLDIR "/etc/ssl" 85#define OPENSSLDIR "/etc/ssl"
31#endif 86#endif
32#endif 87#endif
@@ -69,7 +124,7 @@
69#endif 124#endif
70#endif 125#endif
71 126
72#if (defined(HEADER_DES_H) || defined(HEADER_DES_OLD_H)) && !defined(DES_LONG) 127#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
73/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 128/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
74 * %20 speed up (longs are 8 bytes, int's are 4). */ 129 * %20 speed up (longs are 8 bytes, int's are 4). */
75#ifndef DES_LONG 130#ifndef DES_LONG
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-10-19 00:29:29 +0000