summaryrefslogtreecommitdiff
path: root/src/lib/libssl/crypto/arch
diff options
context:
space:
mode:
authordjm <>2012-10-13 21:31:56 +0000
committerdjm <>2012-10-13 21:31:56 +0000
commit3ad9227df9edaac3e94f314891deeb4d52d16b4a (patch)
tree9beee213390c7fe7c871fe08bb1fa191121ea7a1 /src/lib/libssl/crypto/arch
parent8166adb2a4429611ffe32cf5a310b5f27d3909cd (diff)
downloadopenbsd-3ad9227df9edaac3e94f314891deeb4d52d16b4a.tar.gz
openbsd-3ad9227df9edaac3e94f314891deeb4d52d16b4a.tar.bz2
openbsd-3ad9227df9edaac3e94f314891deeb4d52d16b4a.zip
Makefile and header changes for OpenSSL-1.0.1c
major cranks
Diffstat (limited to 'src/lib/libssl/crypto/arch')
-rw-r--r--src/lib/libssl/crypto/arch/alpha/opensslconf.h26
-rw-r--r--src/lib/libssl/crypto/arch/amd64/opensslconf.h29
-rw-r--r--src/lib/libssl/crypto/arch/arm/opensslconf.h26
-rw-r--r--src/lib/libssl/crypto/arch/hppa/opensslconf.h26
-rw-r--r--src/lib/libssl/crypto/arch/hppa64/opensslconf.h26
-rw-r--r--src/lib/libssl/crypto/arch/i386/opensslconf.h28
-rw-r--r--src/lib/libssl/crypto/arch/m68k/opensslconf.h26
-rw-r--r--src/lib/libssl/crypto/arch/m88k/opensslconf.h26
-rw-r--r--src/lib/libssl/crypto/arch/mips64/opensslconf.h26
-rw-r--r--src/lib/libssl/crypto/arch/powerpc/opensslconf.h26
-rw-r--r--src/lib/libssl/crypto/arch/sh/opensslconf.h26
-rw-r--r--src/lib/libssl/crypto/arch/sparc/opensslconf.h26
-rw-r--r--src/lib/libssl/crypto/arch/sparc64/opensslconf.h26
-rw-r--r--src/lib/libssl/crypto/arch/vax/bn_asm_vax.S2
-rw-r--r--src/lib/libssl/crypto/arch/vax/opensslconf.h26
15 files changed, 282 insertions, 89 deletions
diff --git a/src/lib/libssl/crypto/arch/alpha/opensslconf.h b/src/lib/libssl/crypto/arch/alpha/opensslconf.h
index 3dfec8c8b7..30f6acfbb1 100644
--- a/src/lib/libssl/crypto/arch/alpha/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/alpha/opensslconf.h
@@ -4,9 +4,13 @@
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#ifndef OPENSSL_NO_CAMELLIA 8#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA 9# define OPENSSL_NO_CAMELLIA
9#endif 10#endif
11#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
12# define OPENSSL_NO_EC_NISTP_64_GCC_128
13#endif
10#ifndef OPENSSL_NO_CMS 14#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS 15# define OPENSSL_NO_CMS
12#endif 16#endif
@@ -25,18 +29,21 @@
25#ifndef OPENSSL_NO_MD2 29#ifndef OPENSSL_NO_MD2
26# define OPENSSL_NO_MD2 30# define OPENSSL_NO_MD2
27#endif 31#endif
28#ifndef OPENSSL_NO_MDC2
29# define OPENSSL_NO_MDC2
30#endif
31#ifndef OPENSSL_NO_RC5 32#ifndef OPENSSL_NO_RC5
32# define OPENSSL_NO_RC5 33# define OPENSSL_NO_RC5
33#endif 34#endif
34#ifndef OPENSSL_NO_RFC3779 35#ifndef OPENSSL_NO_RFC3779
35# define OPENSSL_NO_RFC3779 36# define OPENSSL_NO_RFC3779
36#endif 37#endif
38#ifndef OPENSSL_NO_SCTP
39# define OPENSSL_NO_SCTP
40#endif
37#ifndef OPENSSL_NO_SEED 41#ifndef OPENSSL_NO_SEED
38# define OPENSSL_NO_SEED 42# define OPENSSL_NO_SEED
39#endif 43#endif
44#ifndef OPENSSL_NO_SRP
45# define OPENSSL_NO_SRP
46#endif
40#ifndef OPENSSL_NO_SSL2 47#ifndef OPENSSL_NO_SSL2
41# define OPENSSL_NO_SSL2 48# define OPENSSL_NO_SSL2
42#endif 49#endif
@@ -45,6 +52,7 @@
45#endif 52#endif
46 53
47#endif /* OPENSSL_DOING_MAKEDEPEND */ 54#endif /* OPENSSL_DOING_MAKEDEPEND */
55
48#ifndef OPENSSL_THREADS 56#ifndef OPENSSL_THREADS
49# define OPENSSL_THREADS 57# define OPENSSL_THREADS
50#endif 58#endif
@@ -60,6 +68,9 @@
60# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) 68# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
61# define NO_CAMELLIA 69# define NO_CAMELLIA
62# endif 70# endif
71# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
72# define NO_EC_NISTP_64_GCC_128
73# endif
63# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) 74# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
64# define NO_CMS 75# define NO_CMS
65# endif 76# endif
@@ -78,18 +89,21 @@
78# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) 89# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
79# define NO_MD2 90# define NO_MD2
80# endif 91# endif
81# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
82# define NO_MDC2
83# endif
84# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) 92# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
85# define NO_RC5 93# define NO_RC5
86# endif 94# endif
87# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) 95# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
88# define NO_RFC3779 96# define NO_RFC3779
89# endif 97# endif
98# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
99# define NO_SCTP
100# endif
90# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 101# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
91# define NO_SEED 102# define NO_SEED
92# endif 103# endif
104# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP)
105# define NO_SRP
106# endif
93# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) 107# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
94# define NO_SSL2 108# define NO_SSL2
95# endif 109# endif
diff --git a/src/lib/libssl/crypto/arch/amd64/opensslconf.h b/src/lib/libssl/crypto/arch/amd64/opensslconf.h
index 6a6029013f..f969fd75e4 100644
--- a/src/lib/libssl/crypto/arch/amd64/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/amd64/opensslconf.h
@@ -4,9 +4,13 @@
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#ifndef OPENSSL_NO_CAMELLIA 8#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA 9# define OPENSSL_NO_CAMELLIA
9#endif 10#endif
11#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
12# define OPENSSL_NO_EC_NISTP_64_GCC_128
13#endif
10#ifndef OPENSSL_NO_CMS 14#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS 15# define OPENSSL_NO_CMS
12#endif 16#endif
@@ -25,18 +29,21 @@
25#ifndef OPENSSL_NO_MD2 29#ifndef OPENSSL_NO_MD2
26# define OPENSSL_NO_MD2 30# define OPENSSL_NO_MD2
27#endif 31#endif
28#ifndef OPENSSL_NO_MDC2
29# define OPENSSL_NO_MDC2
30#endif
31#ifndef OPENSSL_NO_RC5 32#ifndef OPENSSL_NO_RC5
32# define OPENSSL_NO_RC5 33# define OPENSSL_NO_RC5
33#endif 34#endif
34#ifndef OPENSSL_NO_RFC3779 35#ifndef OPENSSL_NO_RFC3779
35# define OPENSSL_NO_RFC3779 36# define OPENSSL_NO_RFC3779
36#endif 37#endif
38#ifndef OPENSSL_NO_SCTP
39# define OPENSSL_NO_SCTP
40#endif
37#ifndef OPENSSL_NO_SEED 41#ifndef OPENSSL_NO_SEED
38# define OPENSSL_NO_SEED 42# define OPENSSL_NO_SEED
39#endif 43#endif
44#ifndef OPENSSL_NO_SRP
45# define OPENSSL_NO_SRP
46#endif
40#ifndef OPENSSL_NO_SSL2 47#ifndef OPENSSL_NO_SSL2
41# define OPENSSL_NO_SSL2 48# define OPENSSL_NO_SSL2
42#endif 49#endif
@@ -45,6 +52,7 @@
45#endif 52#endif
46 53
47#endif /* OPENSSL_DOING_MAKEDEPEND */ 54#endif /* OPENSSL_DOING_MAKEDEPEND */
55
48#ifndef OPENSSL_THREADS 56#ifndef OPENSSL_THREADS
49# define OPENSSL_THREADS 57# define OPENSSL_THREADS
50#endif 58#endif
@@ -60,6 +68,9 @@
60# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) 68# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
61# define NO_CAMELLIA 69# define NO_CAMELLIA
62# endif 70# endif
71# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
72# define NO_EC_NISTP_64_GCC_128
73# endif
63# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) 74# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
64# define NO_CMS 75# define NO_CMS
65# endif 76# endif
@@ -78,18 +89,21 @@
78# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) 89# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
79# define NO_MD2 90# define NO_MD2
80# endif 91# endif
81# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
82# define NO_MDC2
83# endif
84# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) 92# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
85# define NO_RC5 93# define NO_RC5
86# endif 94# endif
87# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) 95# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
88# define NO_RFC3779 96# define NO_RFC3779
89# endif 97# endif
98# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
99# define NO_SCTP
100# endif
90# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 101# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
91# define NO_SEED 102# define NO_SEED
92# endif 103# endif
104# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP)
105# define NO_SRP
106# endif
93# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) 107# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
94# define NO_SSL2 108# define NO_SSL2
95# endif 109# endif
@@ -163,9 +177,6 @@
163/* Should we define BN_DIV2W here? */ 177/* Should we define BN_DIV2W here? */
164 178
165/* Only one for the following should be defined */ 179/* Only one for the following should be defined */
166/* The prime number generation stuff may not work when
167 * EIGHT_BIT but I don't care since I've only used this mode
168 * for debuging the bignum libraries */
169#define SIXTY_FOUR_BIT_LONG 180#define SIXTY_FOUR_BIT_LONG
170#undef SIXTY_FOUR_BIT 181#undef SIXTY_FOUR_BIT
171#undef THIRTY_TWO_BIT 182#undef THIRTY_TWO_BIT
diff --git a/src/lib/libssl/crypto/arch/arm/opensslconf.h b/src/lib/libssl/crypto/arch/arm/opensslconf.h
index 7c7015c9b7..fc5ea38470 100644
--- a/src/lib/libssl/crypto/arch/arm/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/arm/opensslconf.h
@@ -4,9 +4,13 @@
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#ifndef OPENSSL_NO_CAMELLIA 8#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA 9# define OPENSSL_NO_CAMELLIA
9#endif 10#endif
11#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
12# define OPENSSL_NO_EC_NISTP_64_GCC_128
13#endif
10#ifndef OPENSSL_NO_CMS 14#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS 15# define OPENSSL_NO_CMS
12#endif 16#endif
@@ -25,18 +29,21 @@
25#ifndef OPENSSL_NO_MD2 29#ifndef OPENSSL_NO_MD2
26# define OPENSSL_NO_MD2 30# define OPENSSL_NO_MD2
27#endif 31#endif
28#ifndef OPENSSL_NO_MDC2
29# define OPENSSL_NO_MDC2
30#endif
31#ifndef OPENSSL_NO_RC5 32#ifndef OPENSSL_NO_RC5
32# define OPENSSL_NO_RC5 33# define OPENSSL_NO_RC5
33#endif 34#endif
34#ifndef OPENSSL_NO_RFC3779 35#ifndef OPENSSL_NO_RFC3779
35# define OPENSSL_NO_RFC3779 36# define OPENSSL_NO_RFC3779
36#endif 37#endif
38#ifndef OPENSSL_NO_SCTP
39# define OPENSSL_NO_SCTP
40#endif
37#ifndef OPENSSL_NO_SEED 41#ifndef OPENSSL_NO_SEED
38# define OPENSSL_NO_SEED 42# define OPENSSL_NO_SEED
39#endif 43#endif
44#ifndef OPENSSL_NO_SRP
45# define OPENSSL_NO_SRP
46#endif
40#ifndef OPENSSL_NO_SSL2 47#ifndef OPENSSL_NO_SSL2
41# define OPENSSL_NO_SSL2 48# define OPENSSL_NO_SSL2
42#endif 49#endif
@@ -45,6 +52,7 @@
45#endif 52#endif
46 53
47#endif /* OPENSSL_DOING_MAKEDEPEND */ 54#endif /* OPENSSL_DOING_MAKEDEPEND */
55
48#ifndef OPENSSL_THREADS 56#ifndef OPENSSL_THREADS
49# define OPENSSL_THREADS 57# define OPENSSL_THREADS
50#endif 58#endif
@@ -60,6 +68,9 @@
60# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) 68# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
61# define NO_CAMELLIA 69# define NO_CAMELLIA
62# endif 70# endif
71# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
72# define NO_EC_NISTP_64_GCC_128
73# endif
63# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) 74# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
64# define NO_CMS 75# define NO_CMS
65# endif 76# endif
@@ -78,18 +89,21 @@
78# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) 89# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
79# define NO_MD2 90# define NO_MD2
80# endif 91# endif
81# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
82# define NO_MDC2
83# endif
84# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) 92# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
85# define NO_RC5 93# define NO_RC5
86# endif 94# endif
87# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) 95# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
88# define NO_RFC3779 96# define NO_RFC3779
89# endif 97# endif
98# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
99# define NO_SCTP
100# endif
90# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 101# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
91# define NO_SEED 102# define NO_SEED
92# endif 103# endif
104# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP)
105# define NO_SRP
106# endif
93# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) 107# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
94# define NO_SSL2 108# define NO_SSL2
95# endif 109# endif
diff --git a/src/lib/libssl/crypto/arch/hppa/opensslconf.h b/src/lib/libssl/crypto/arch/hppa/opensslconf.h
index 7c7015c9b7..fc5ea38470 100644
--- a/src/lib/libssl/crypto/arch/hppa/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/hppa/opensslconf.h
@@ -4,9 +4,13 @@
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#ifndef OPENSSL_NO_CAMELLIA 8#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA 9# define OPENSSL_NO_CAMELLIA
9#endif 10#endif
11#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
12# define OPENSSL_NO_EC_NISTP_64_GCC_128
13#endif
10#ifndef OPENSSL_NO_CMS 14#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS 15# define OPENSSL_NO_CMS
12#endif 16#endif
@@ -25,18 +29,21 @@
25#ifndef OPENSSL_NO_MD2 29#ifndef OPENSSL_NO_MD2
26# define OPENSSL_NO_MD2 30# define OPENSSL_NO_MD2
27#endif 31#endif
28#ifndef OPENSSL_NO_MDC2
29# define OPENSSL_NO_MDC2
30#endif
31#ifndef OPENSSL_NO_RC5 32#ifndef OPENSSL_NO_RC5
32# define OPENSSL_NO_RC5 33# define OPENSSL_NO_RC5
33#endif 34#endif
34#ifndef OPENSSL_NO_RFC3779 35#ifndef OPENSSL_NO_RFC3779
35# define OPENSSL_NO_RFC3779 36# define OPENSSL_NO_RFC3779
36#endif 37#endif
38#ifndef OPENSSL_NO_SCTP
39# define OPENSSL_NO_SCTP
40#endif
37#ifndef OPENSSL_NO_SEED 41#ifndef OPENSSL_NO_SEED
38# define OPENSSL_NO_SEED 42# define OPENSSL_NO_SEED
39#endif 43#endif
44#ifndef OPENSSL_NO_SRP
45# define OPENSSL_NO_SRP
46#endif
40#ifndef OPENSSL_NO_SSL2 47#ifndef OPENSSL_NO_SSL2
41# define OPENSSL_NO_SSL2 48# define OPENSSL_NO_SSL2
42#endif 49#endif
@@ -45,6 +52,7 @@
45#endif 52#endif
46 53
47#endif /* OPENSSL_DOING_MAKEDEPEND */ 54#endif /* OPENSSL_DOING_MAKEDEPEND */
55
48#ifndef OPENSSL_THREADS 56#ifndef OPENSSL_THREADS
49# define OPENSSL_THREADS 57# define OPENSSL_THREADS
50#endif 58#endif
@@ -60,6 +68,9 @@
60# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) 68# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
61# define NO_CAMELLIA 69# define NO_CAMELLIA
62# endif 70# endif
71# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
72# define NO_EC_NISTP_64_GCC_128
73# endif
63# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) 74# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
64# define NO_CMS 75# define NO_CMS
65# endif 76# endif
@@ -78,18 +89,21 @@
78# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) 89# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
79# define NO_MD2 90# define NO_MD2
80# endif 91# endif
81# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
82# define NO_MDC2
83# endif
84# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) 92# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
85# define NO_RC5 93# define NO_RC5
86# endif 94# endif
87# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) 95# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
88# define NO_RFC3779 96# define NO_RFC3779
89# endif 97# endif
98# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
99# define NO_SCTP
100# endif
90# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 101# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
91# define NO_SEED 102# define NO_SEED
92# endif 103# endif
104# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP)
105# define NO_SRP
106# endif
93# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) 107# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
94# define NO_SSL2 108# define NO_SSL2
95# endif 109# endif
diff --git a/src/lib/libssl/crypto/arch/hppa64/opensslconf.h b/src/lib/libssl/crypto/arch/hppa64/opensslconf.h
index 7199268572..f8f478ff52 100644
--- a/src/lib/libssl/crypto/arch/hppa64/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/hppa64/opensslconf.h
@@ -4,9 +4,13 @@
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#ifndef OPENSSL_NO_CAMELLIA 8#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA 9# define OPENSSL_NO_CAMELLIA
9#endif 10#endif
11#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
12# define OPENSSL_NO_EC_NISTP_64_GCC_128
13#endif
10#ifndef OPENSSL_NO_CMS 14#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS 15# define OPENSSL_NO_CMS
12#endif 16#endif
@@ -25,18 +29,21 @@
25#ifndef OPENSSL_NO_MD2 29#ifndef OPENSSL_NO_MD2
26# define OPENSSL_NO_MD2 30# define OPENSSL_NO_MD2
27#endif 31#endif
28#ifndef OPENSSL_NO_MDC2
29# define OPENSSL_NO_MDC2
30#endif
31#ifndef OPENSSL_NO_RC5 32#ifndef OPENSSL_NO_RC5
32# define OPENSSL_NO_RC5 33# define OPENSSL_NO_RC5
33#endif 34#endif
34#ifndef OPENSSL_NO_RFC3779 35#ifndef OPENSSL_NO_RFC3779
35# define OPENSSL_NO_RFC3779 36# define OPENSSL_NO_RFC3779
36#endif 37#endif
38#ifndef OPENSSL_NO_SCTP
39# define OPENSSL_NO_SCTP
40#endif
37#ifndef OPENSSL_NO_SEED 41#ifndef OPENSSL_NO_SEED
38# define OPENSSL_NO_SEED 42# define OPENSSL_NO_SEED
39#endif 43#endif
44#ifndef OPENSSL_NO_SRP
45# define OPENSSL_NO_SRP
46#endif
40#ifndef OPENSSL_NO_SSL2 47#ifndef OPENSSL_NO_SSL2
41# define OPENSSL_NO_SSL2 48# define OPENSSL_NO_SSL2
42#endif 49#endif
@@ -45,6 +52,7 @@
45#endif 52#endif
46 53
47#endif /* OPENSSL_DOING_MAKEDEPEND */ 54#endif /* OPENSSL_DOING_MAKEDEPEND */
55
48#ifndef OPENSSL_THREADS 56#ifndef OPENSSL_THREADS
49# define OPENSSL_THREADS 57# define OPENSSL_THREADS
50#endif 58#endif
@@ -60,6 +68,9 @@
60# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) 68# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
61# define NO_CAMELLIA 69# define NO_CAMELLIA
62# endif 70# endif
71# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
72# define NO_EC_NISTP_64_GCC_128
73# endif
63# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) 74# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
64# define NO_CMS 75# define NO_CMS
65# endif 76# endif
@@ -78,18 +89,21 @@
78# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) 89# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
79# define NO_MD2 90# define NO_MD2
80# endif 91# endif
81# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
82# define NO_MDC2
83# endif
84# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) 92# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
85# define NO_RC5 93# define NO_RC5
86# endif 94# endif
87# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) 95# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
88# define NO_RFC3779 96# define NO_RFC3779
89# endif 97# endif
98# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
99# define NO_SCTP
100# endif
90# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 101# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
91# define NO_SEED 102# define NO_SEED
92# endif 103# endif
104# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP)
105# define NO_SRP
106# endif
93# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) 107# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
94# define NO_SSL2 108# define NO_SSL2
95# endif 109# endif
diff --git a/src/lib/libssl/crypto/arch/i386/opensslconf.h b/src/lib/libssl/crypto/arch/i386/opensslconf.h
index b9e4249fed..f7b5a6dc38 100644
--- a/src/lib/libssl/crypto/arch/i386/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/i386/opensslconf.h
@@ -4,9 +4,13 @@
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#ifndef OPENSSL_NO_CAMELLIA 8#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA 9# define OPENSSL_NO_CAMELLIA
9#endif 10#endif
11#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
12# define OPENSSL_NO_EC_NISTP_64_GCC_128
13#endif
10#ifndef OPENSSL_NO_CMS 14#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS 15# define OPENSSL_NO_CMS
12#endif 16#endif
@@ -25,18 +29,21 @@
25#ifndef OPENSSL_NO_MD2 29#ifndef OPENSSL_NO_MD2
26# define OPENSSL_NO_MD2 30# define OPENSSL_NO_MD2
27#endif 31#endif
28#ifndef OPENSSL_NO_MDC2
29# define OPENSSL_NO_MDC2
30#endif
31#ifndef OPENSSL_NO_RC5 32#ifndef OPENSSL_NO_RC5
32# define OPENSSL_NO_RC5 33# define OPENSSL_NO_RC5
33#endif 34#endif
34#ifndef OPENSSL_NO_RFC3779 35#ifndef OPENSSL_NO_RFC3779
35# define OPENSSL_NO_RFC3779 36# define OPENSSL_NO_RFC3779
36#endif 37#endif
38#ifndef OPENSSL_NO_SCTP
39# define OPENSSL_NO_SCTP
40#endif
37#ifndef OPENSSL_NO_SEED 41#ifndef OPENSSL_NO_SEED
38# define OPENSSL_NO_SEED 42# define OPENSSL_NO_SEED
39#endif 43#endif
44#ifndef OPENSSL_NO_SRP
45# define OPENSSL_NO_SRP
46#endif
40#ifndef OPENSSL_NO_SSL2 47#ifndef OPENSSL_NO_SSL2
41# define OPENSSL_NO_SSL2 48# define OPENSSL_NO_SSL2
42#endif 49#endif
@@ -45,6 +52,7 @@
45#endif 52#endif
46 53
47#endif /* OPENSSL_DOING_MAKEDEPEND */ 54#endif /* OPENSSL_DOING_MAKEDEPEND */
55
48#ifndef OPENSSL_THREADS 56#ifndef OPENSSL_THREADS
49# define OPENSSL_THREADS 57# define OPENSSL_THREADS
50#endif 58#endif
@@ -60,6 +68,9 @@
60# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) 68# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
61# define NO_CAMELLIA 69# define NO_CAMELLIA
62# endif 70# endif
71# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
72# define NO_EC_NISTP_64_GCC_128
73# endif
63# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) 74# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
64# define NO_CMS 75# define NO_CMS
65# endif 76# endif
@@ -78,18 +89,21 @@
78# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) 89# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
79# define NO_MD2 90# define NO_MD2
80# endif 91# endif
81# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
82# define NO_MDC2
83# endif
84# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) 92# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
85# define NO_RC5 93# define NO_RC5
86# endif 94# endif
87# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) 95# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
88# define NO_RFC3779 96# define NO_RFC3779
89# endif 97# endif
98# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
99# define NO_SCTP
100# endif
90# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 101# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
91# define NO_SEED 102# define NO_SEED
92# endif 103# endif
104# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP)
105# define NO_SRP
106# endif
93# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) 107# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
94# define NO_SSL2 108# define NO_SSL2
95# endif 109# endif
@@ -152,7 +166,7 @@
152/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 166/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
153 * %20 speed up (longs are 8 bytes, int's are 4). */ 167 * %20 speed up (longs are 8 bytes, int's are 4). */
154#ifndef DES_LONG 168#ifndef DES_LONG
155#define DES_LONG unsigned int 169#define DES_LONG unsigned long
156#endif 170#endif
157#endif 171#endif
158 172
diff --git a/src/lib/libssl/crypto/arch/m68k/opensslconf.h b/src/lib/libssl/crypto/arch/m68k/opensslconf.h
index 7c7015c9b7..fc5ea38470 100644
--- a/src/lib/libssl/crypto/arch/m68k/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/m68k/opensslconf.h
@@ -4,9 +4,13 @@
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#ifndef OPENSSL_NO_CAMELLIA 8#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA 9# define OPENSSL_NO_CAMELLIA
9#endif 10#endif
11#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
12# define OPENSSL_NO_EC_NISTP_64_GCC_128
13#endif
10#ifndef OPENSSL_NO_CMS 14#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS 15# define OPENSSL_NO_CMS
12#endif 16#endif
@@ -25,18 +29,21 @@
25#ifndef OPENSSL_NO_MD2 29#ifndef OPENSSL_NO_MD2
26# define OPENSSL_NO_MD2 30# define OPENSSL_NO_MD2
27#endif 31#endif
28#ifndef OPENSSL_NO_MDC2
29# define OPENSSL_NO_MDC2
30#endif
31#ifndef OPENSSL_NO_RC5 32#ifndef OPENSSL_NO_RC5
32# define OPENSSL_NO_RC5 33# define OPENSSL_NO_RC5
33#endif 34#endif
34#ifndef OPENSSL_NO_RFC3779 35#ifndef OPENSSL_NO_RFC3779
35# define OPENSSL_NO_RFC3779 36# define OPENSSL_NO_RFC3779
36#endif 37#endif
38#ifndef OPENSSL_NO_SCTP
39# define OPENSSL_NO_SCTP
40#endif
37#ifndef OPENSSL_NO_SEED 41#ifndef OPENSSL_NO_SEED
38# define OPENSSL_NO_SEED 42# define OPENSSL_NO_SEED
39#endif 43#endif
44#ifndef OPENSSL_NO_SRP
45# define OPENSSL_NO_SRP
46#endif
40#ifndef OPENSSL_NO_SSL2 47#ifndef OPENSSL_NO_SSL2
41# define OPENSSL_NO_SSL2 48# define OPENSSL_NO_SSL2
42#endif 49#endif
@@ -45,6 +52,7 @@
45#endif 52#endif
46 53
47#endif /* OPENSSL_DOING_MAKEDEPEND */ 54#endif /* OPENSSL_DOING_MAKEDEPEND */
55
48#ifndef OPENSSL_THREADS 56#ifndef OPENSSL_THREADS
49# define OPENSSL_THREADS 57# define OPENSSL_THREADS
50#endif 58#endif
@@ -60,6 +68,9 @@
60# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) 68# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
61# define NO_CAMELLIA 69# define NO_CAMELLIA
62# endif 70# endif
71# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
72# define NO_EC_NISTP_64_GCC_128
73# endif
63# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) 74# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
64# define NO_CMS 75# define NO_CMS
65# endif 76# endif
@@ -78,18 +89,21 @@
78# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) 89# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
79# define NO_MD2 90# define NO_MD2
80# endif 91# endif
81# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
82# define NO_MDC2
83# endif
84# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) 92# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
85# define NO_RC5 93# define NO_RC5
86# endif 94# endif
87# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) 95# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
88# define NO_RFC3779 96# define NO_RFC3779
89# endif 97# endif
98# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
99# define NO_SCTP
100# endif
90# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 101# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
91# define NO_SEED 102# define NO_SEED
92# endif 103# endif
104# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP)
105# define NO_SRP
106# endif
93# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) 107# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
94# define NO_SSL2 108# define NO_SSL2
95# endif 109# endif
diff --git a/src/lib/libssl/crypto/arch/m88k/opensslconf.h b/src/lib/libssl/crypto/arch/m88k/opensslconf.h
index 7c7015c9b7..fc5ea38470 100644
--- a/src/lib/libssl/crypto/arch/m88k/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/m88k/opensslconf.h
@@ -4,9 +4,13 @@
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#ifndef OPENSSL_NO_CAMELLIA 8#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA 9# define OPENSSL_NO_CAMELLIA
9#endif 10#endif
11#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
12# define OPENSSL_NO_EC_NISTP_64_GCC_128
13#endif
10#ifndef OPENSSL_NO_CMS 14#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS 15# define OPENSSL_NO_CMS
12#endif 16#endif
@@ -25,18 +29,21 @@
25#ifndef OPENSSL_NO_MD2 29#ifndef OPENSSL_NO_MD2
26# define OPENSSL_NO_MD2 30# define OPENSSL_NO_MD2
27#endif 31#endif
28#ifndef OPENSSL_NO_MDC2
29# define OPENSSL_NO_MDC2
30#endif
31#ifndef OPENSSL_NO_RC5 32#ifndef OPENSSL_NO_RC5
32# define OPENSSL_NO_RC5 33# define OPENSSL_NO_RC5
33#endif 34#endif
34#ifndef OPENSSL_NO_RFC3779 35#ifndef OPENSSL_NO_RFC3779
35# define OPENSSL_NO_RFC3779 36# define OPENSSL_NO_RFC3779
36#endif 37#endif
38#ifndef OPENSSL_NO_SCTP
39# define OPENSSL_NO_SCTP
40#endif
37#ifndef OPENSSL_NO_SEED 41#ifndef OPENSSL_NO_SEED
38# define OPENSSL_NO_SEED 42# define OPENSSL_NO_SEED
39#endif 43#endif
44#ifndef OPENSSL_NO_SRP
45# define OPENSSL_NO_SRP
46#endif
40#ifndef OPENSSL_NO_SSL2 47#ifndef OPENSSL_NO_SSL2
41# define OPENSSL_NO_SSL2 48# define OPENSSL_NO_SSL2
42#endif 49#endif
@@ -45,6 +52,7 @@
45#endif 52#endif
46 53
47#endif /* OPENSSL_DOING_MAKEDEPEND */ 54#endif /* OPENSSL_DOING_MAKEDEPEND */
55
48#ifndef OPENSSL_THREADS 56#ifndef OPENSSL_THREADS
49# define OPENSSL_THREADS 57# define OPENSSL_THREADS
50#endif 58#endif
@@ -60,6 +68,9 @@
60# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) 68# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
61# define NO_CAMELLIA 69# define NO_CAMELLIA
62# endif 70# endif
71# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
72# define NO_EC_NISTP_64_GCC_128
73# endif
63# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) 74# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
64# define NO_CMS 75# define NO_CMS
65# endif 76# endif
@@ -78,18 +89,21 @@
78# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) 89# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
79# define NO_MD2 90# define NO_MD2
80# endif 91# endif
81# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
82# define NO_MDC2
83# endif
84# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) 92# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
85# define NO_RC5 93# define NO_RC5
86# endif 94# endif
87# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) 95# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
88# define NO_RFC3779 96# define NO_RFC3779
89# endif 97# endif
98# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
99# define NO_SCTP
100# endif
90# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 101# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
91# define NO_SEED 102# define NO_SEED
92# endif 103# endif
104# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP)
105# define NO_SRP
106# endif
93# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) 107# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
94# define NO_SSL2 108# define NO_SSL2
95# endif 109# endif
diff --git a/src/lib/libssl/crypto/arch/mips64/opensslconf.h b/src/lib/libssl/crypto/arch/mips64/opensslconf.h
index e481da68bf..e55282fd63 100644
--- a/src/lib/libssl/crypto/arch/mips64/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/mips64/opensslconf.h
@@ -4,9 +4,13 @@
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#ifndef OPENSSL_NO_CAMELLIA 8#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA 9# define OPENSSL_NO_CAMELLIA
9#endif 10#endif
11#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
12# define OPENSSL_NO_EC_NISTP_64_GCC_128
13#endif
10#ifndef OPENSSL_NO_CMS 14#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS 15# define OPENSSL_NO_CMS
12#endif 16#endif
@@ -25,18 +29,21 @@
25#ifndef OPENSSL_NO_MD2 29#ifndef OPENSSL_NO_MD2
26# define OPENSSL_NO_MD2 30# define OPENSSL_NO_MD2
27#endif 31#endif
28#ifndef OPENSSL_NO_MDC2
29# define OPENSSL_NO_MDC2
30#endif
31#ifndef OPENSSL_NO_RC5 32#ifndef OPENSSL_NO_RC5
32# define OPENSSL_NO_RC5 33# define OPENSSL_NO_RC5
33#endif 34#endif
34#ifndef OPENSSL_NO_RFC3779 35#ifndef OPENSSL_NO_RFC3779
35# define OPENSSL_NO_RFC3779 36# define OPENSSL_NO_RFC3779
36#endif 37#endif
38#ifndef OPENSSL_NO_SCTP
39# define OPENSSL_NO_SCTP
40#endif
37#ifndef OPENSSL_NO_SEED 41#ifndef OPENSSL_NO_SEED
38# define OPENSSL_NO_SEED 42# define OPENSSL_NO_SEED
39#endif 43#endif
44#ifndef OPENSSL_NO_SRP
45# define OPENSSL_NO_SRP
46#endif
40#ifndef OPENSSL_NO_SSL2 47#ifndef OPENSSL_NO_SSL2
41# define OPENSSL_NO_SSL2 48# define OPENSSL_NO_SSL2
42#endif 49#endif
@@ -45,6 +52,7 @@
45#endif 52#endif
46 53
47#endif /* OPENSSL_DOING_MAKEDEPEND */ 54#endif /* OPENSSL_DOING_MAKEDEPEND */
55
48#ifndef OPENSSL_THREADS 56#ifndef OPENSSL_THREADS
49# define OPENSSL_THREADS 57# define OPENSSL_THREADS
50#endif 58#endif
@@ -60,6 +68,9 @@
60# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) 68# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
61# define NO_CAMELLIA 69# define NO_CAMELLIA
62# endif 70# endif
71# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
72# define NO_EC_NISTP_64_GCC_128
73# endif
63# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) 74# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
64# define NO_CMS 75# define NO_CMS
65# endif 76# endif
@@ -78,18 +89,21 @@
78# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) 89# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
79# define NO_MD2 90# define NO_MD2
80# endif 91# endif
81# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
82# define NO_MDC2
83# endif
84# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) 92# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
85# define NO_RC5 93# define NO_RC5
86# endif 94# endif
87# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) 95# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
88# define NO_RFC3779 96# define NO_RFC3779
89# endif 97# endif
98# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
99# define NO_SCTP
100# endif
90# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 101# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
91# define NO_SEED 102# define NO_SEED
92# endif 103# endif
104# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP)
105# define NO_SRP
106# endif
93# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) 107# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
94# define NO_SSL2 108# define NO_SSL2
95# endif 109# endif
diff --git a/src/lib/libssl/crypto/arch/powerpc/opensslconf.h b/src/lib/libssl/crypto/arch/powerpc/opensslconf.h
index 7c7015c9b7..fc5ea38470 100644
--- a/src/lib/libssl/crypto/arch/powerpc/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/powerpc/opensslconf.h
@@ -4,9 +4,13 @@
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#ifndef OPENSSL_NO_CAMELLIA 8#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA 9# define OPENSSL_NO_CAMELLIA
9#endif 10#endif
11#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
12# define OPENSSL_NO_EC_NISTP_64_GCC_128
13#endif
10#ifndef OPENSSL_NO_CMS 14#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS 15# define OPENSSL_NO_CMS
12#endif 16#endif
@@ -25,18 +29,21 @@
25#ifndef OPENSSL_NO_MD2 29#ifndef OPENSSL_NO_MD2
26# define OPENSSL_NO_MD2 30# define OPENSSL_NO_MD2
27#endif 31#endif
28#ifndef OPENSSL_NO_MDC2
29# define OPENSSL_NO_MDC2
30#endif
31#ifndef OPENSSL_NO_RC5 32#ifndef OPENSSL_NO_RC5
32# define OPENSSL_NO_RC5 33# define OPENSSL_NO_RC5
33#endif 34#endif
34#ifndef OPENSSL_NO_RFC3779 35#ifndef OPENSSL_NO_RFC3779
35# define OPENSSL_NO_RFC3779 36# define OPENSSL_NO_RFC3779
36#endif 37#endif
38#ifndef OPENSSL_NO_SCTP
39# define OPENSSL_NO_SCTP
40#endif
37#ifndef OPENSSL_NO_SEED 41#ifndef OPENSSL_NO_SEED
38# define OPENSSL_NO_SEED 42# define OPENSSL_NO_SEED
39#endif 43#endif
44#ifndef OPENSSL_NO_SRP
45# define OPENSSL_NO_SRP
46#endif
40#ifndef OPENSSL_NO_SSL2 47#ifndef OPENSSL_NO_SSL2
41# define OPENSSL_NO_SSL2 48# define OPENSSL_NO_SSL2
42#endif 49#endif
@@ -45,6 +52,7 @@
45#endif 52#endif
46 53
47#endif /* OPENSSL_DOING_MAKEDEPEND */ 54#endif /* OPENSSL_DOING_MAKEDEPEND */
55
48#ifndef OPENSSL_THREADS 56#ifndef OPENSSL_THREADS
49# define OPENSSL_THREADS 57# define OPENSSL_THREADS
50#endif 58#endif
@@ -60,6 +68,9 @@
60# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) 68# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
61# define NO_CAMELLIA 69# define NO_CAMELLIA
62# endif 70# endif
71# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
72# define NO_EC_NISTP_64_GCC_128
73# endif
63# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) 74# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
64# define NO_CMS 75# define NO_CMS
65# endif 76# endif
@@ -78,18 +89,21 @@
78# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) 89# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
79# define NO_MD2 90# define NO_MD2
80# endif 91# endif
81# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
82# define NO_MDC2
83# endif
84# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) 92# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
85# define NO_RC5 93# define NO_RC5
86# endif 94# endif
87# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) 95# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
88# define NO_RFC3779 96# define NO_RFC3779
89# endif 97# endif
98# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
99# define NO_SCTP
100# endif
90# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 101# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
91# define NO_SEED 102# define NO_SEED
92# endif 103# endif
104# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP)
105# define NO_SRP
106# endif
93# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) 107# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
94# define NO_SSL2 108# define NO_SSL2
95# endif 109# endif
diff --git a/src/lib/libssl/crypto/arch/sh/opensslconf.h b/src/lib/libssl/crypto/arch/sh/opensslconf.h
index 7c7015c9b7..fc5ea38470 100644
--- a/src/lib/libssl/crypto/arch/sh/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/sh/opensslconf.h
@@ -4,9 +4,13 @@
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#ifndef OPENSSL_NO_CAMELLIA 8#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA 9# define OPENSSL_NO_CAMELLIA
9#endif 10#endif
11#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
12# define OPENSSL_NO_EC_NISTP_64_GCC_128
13#endif
10#ifndef OPENSSL_NO_CMS 14#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS 15# define OPENSSL_NO_CMS
12#endif 16#endif
@@ -25,18 +29,21 @@
25#ifndef OPENSSL_NO_MD2 29#ifndef OPENSSL_NO_MD2
26# define OPENSSL_NO_MD2 30# define OPENSSL_NO_MD2
27#endif 31#endif
28#ifndef OPENSSL_NO_MDC2
29# define OPENSSL_NO_MDC2
30#endif
31#ifndef OPENSSL_NO_RC5 32#ifndef OPENSSL_NO_RC5
32# define OPENSSL_NO_RC5 33# define OPENSSL_NO_RC5
33#endif 34#endif
34#ifndef OPENSSL_NO_RFC3779 35#ifndef OPENSSL_NO_RFC3779
35# define OPENSSL_NO_RFC3779 36# define OPENSSL_NO_RFC3779
36#endif 37#endif
38#ifndef OPENSSL_NO_SCTP
39# define OPENSSL_NO_SCTP
40#endif
37#ifndef OPENSSL_NO_SEED 41#ifndef OPENSSL_NO_SEED
38# define OPENSSL_NO_SEED 42# define OPENSSL_NO_SEED
39#endif 43#endif
44#ifndef OPENSSL_NO_SRP
45# define OPENSSL_NO_SRP
46#endif
40#ifndef OPENSSL_NO_SSL2 47#ifndef OPENSSL_NO_SSL2
41# define OPENSSL_NO_SSL2 48# define OPENSSL_NO_SSL2
42#endif 49#endif
@@ -45,6 +52,7 @@
45#endif 52#endif
46 53
47#endif /* OPENSSL_DOING_MAKEDEPEND */ 54#endif /* OPENSSL_DOING_MAKEDEPEND */
55
48#ifndef OPENSSL_THREADS 56#ifndef OPENSSL_THREADS
49# define OPENSSL_THREADS 57# define OPENSSL_THREADS
50#endif 58#endif
@@ -60,6 +68,9 @@
60# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) 68# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
61# define NO_CAMELLIA 69# define NO_CAMELLIA
62# endif 70# endif
71# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
72# define NO_EC_NISTP_64_GCC_128
73# endif
63# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) 74# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
64# define NO_CMS 75# define NO_CMS
65# endif 76# endif
@@ -78,18 +89,21 @@
78# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) 89# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
79# define NO_MD2 90# define NO_MD2
80# endif 91# endif
81# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
82# define NO_MDC2
83# endif
84# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) 92# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
85# define NO_RC5 93# define NO_RC5
86# endif 94# endif
87# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) 95# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
88# define NO_RFC3779 96# define NO_RFC3779
89# endif 97# endif
98# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
99# define NO_SCTP
100# endif
90# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 101# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
91# define NO_SEED 102# define NO_SEED
92# endif 103# endif
104# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP)
105# define NO_SRP
106# endif
93# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) 107# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
94# define NO_SSL2 108# define NO_SSL2
95# endif 109# endif
diff --git a/src/lib/libssl/crypto/arch/sparc/opensslconf.h b/src/lib/libssl/crypto/arch/sparc/opensslconf.h
index 7c7015c9b7..fc5ea38470 100644
--- a/src/lib/libssl/crypto/arch/sparc/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/sparc/opensslconf.h
@@ -4,9 +4,13 @@
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#ifndef OPENSSL_NO_CAMELLIA 8#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA 9# define OPENSSL_NO_CAMELLIA
9#endif 10#endif
11#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
12# define OPENSSL_NO_EC_NISTP_64_GCC_128
13#endif
10#ifndef OPENSSL_NO_CMS 14#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS 15# define OPENSSL_NO_CMS
12#endif 16#endif
@@ -25,18 +29,21 @@
25#ifndef OPENSSL_NO_MD2 29#ifndef OPENSSL_NO_MD2
26# define OPENSSL_NO_MD2 30# define OPENSSL_NO_MD2
27#endif 31#endif
28#ifndef OPENSSL_NO_MDC2
29# define OPENSSL_NO_MDC2
30#endif
31#ifndef OPENSSL_NO_RC5 32#ifndef OPENSSL_NO_RC5
32# define OPENSSL_NO_RC5 33# define OPENSSL_NO_RC5
33#endif 34#endif
34#ifndef OPENSSL_NO_RFC3779 35#ifndef OPENSSL_NO_RFC3779
35# define OPENSSL_NO_RFC3779 36# define OPENSSL_NO_RFC3779
36#endif 37#endif
38#ifndef OPENSSL_NO_SCTP
39# define OPENSSL_NO_SCTP
40#endif
37#ifndef OPENSSL_NO_SEED 41#ifndef OPENSSL_NO_SEED
38# define OPENSSL_NO_SEED 42# define OPENSSL_NO_SEED
39#endif 43#endif
44#ifndef OPENSSL_NO_SRP
45# define OPENSSL_NO_SRP
46#endif
40#ifndef OPENSSL_NO_SSL2 47#ifndef OPENSSL_NO_SSL2
41# define OPENSSL_NO_SSL2 48# define OPENSSL_NO_SSL2
42#endif 49#endif
@@ -45,6 +52,7 @@
45#endif 52#endif
46 53
47#endif /* OPENSSL_DOING_MAKEDEPEND */ 54#endif /* OPENSSL_DOING_MAKEDEPEND */
55
48#ifndef OPENSSL_THREADS 56#ifndef OPENSSL_THREADS
49# define OPENSSL_THREADS 57# define OPENSSL_THREADS
50#endif 58#endif
@@ -60,6 +68,9 @@
60# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) 68# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
61# define NO_CAMELLIA 69# define NO_CAMELLIA
62# endif 70# endif
71# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
72# define NO_EC_NISTP_64_GCC_128
73# endif
63# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) 74# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
64# define NO_CMS 75# define NO_CMS
65# endif 76# endif
@@ -78,18 +89,21 @@
78# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) 89# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
79# define NO_MD2 90# define NO_MD2
80# endif 91# endif
81# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
82# define NO_MDC2
83# endif
84# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) 92# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
85# define NO_RC5 93# define NO_RC5
86# endif 94# endif
87# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) 95# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
88# define NO_RFC3779 96# define NO_RFC3779
89# endif 97# endif
98# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
99# define NO_SCTP
100# endif
90# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 101# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
91# define NO_SEED 102# define NO_SEED
92# endif 103# endif
104# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP)
105# define NO_SRP
106# endif
93# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) 107# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
94# define NO_SSL2 108# define NO_SSL2
95# endif 109# endif
diff --git a/src/lib/libssl/crypto/arch/sparc64/opensslconf.h b/src/lib/libssl/crypto/arch/sparc64/opensslconf.h
index e481da68bf..e55282fd63 100644
--- a/src/lib/libssl/crypto/arch/sparc64/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/sparc64/opensslconf.h
@@ -4,9 +4,13 @@
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#ifndef OPENSSL_NO_CAMELLIA 8#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA 9# define OPENSSL_NO_CAMELLIA
9#endif 10#endif
11#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
12# define OPENSSL_NO_EC_NISTP_64_GCC_128
13#endif
10#ifndef OPENSSL_NO_CMS 14#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS 15# define OPENSSL_NO_CMS
12#endif 16#endif
@@ -25,18 +29,21 @@
25#ifndef OPENSSL_NO_MD2 29#ifndef OPENSSL_NO_MD2
26# define OPENSSL_NO_MD2 30# define OPENSSL_NO_MD2
27#endif 31#endif
28#ifndef OPENSSL_NO_MDC2
29# define OPENSSL_NO_MDC2
30#endif
31#ifndef OPENSSL_NO_RC5 32#ifndef OPENSSL_NO_RC5
32# define OPENSSL_NO_RC5 33# define OPENSSL_NO_RC5
33#endif 34#endif
34#ifndef OPENSSL_NO_RFC3779 35#ifndef OPENSSL_NO_RFC3779
35# define OPENSSL_NO_RFC3779 36# define OPENSSL_NO_RFC3779
36#endif 37#endif
38#ifndef OPENSSL_NO_SCTP
39# define OPENSSL_NO_SCTP
40#endif
37#ifndef OPENSSL_NO_SEED 41#ifndef OPENSSL_NO_SEED
38# define OPENSSL_NO_SEED 42# define OPENSSL_NO_SEED
39#endif 43#endif
44#ifndef OPENSSL_NO_SRP
45# define OPENSSL_NO_SRP
46#endif
40#ifndef OPENSSL_NO_SSL2 47#ifndef OPENSSL_NO_SSL2
41# define OPENSSL_NO_SSL2 48# define OPENSSL_NO_SSL2
42#endif 49#endif
@@ -45,6 +52,7 @@
45#endif 52#endif
46 53
47#endif /* OPENSSL_DOING_MAKEDEPEND */ 54#endif /* OPENSSL_DOING_MAKEDEPEND */
55
48#ifndef OPENSSL_THREADS 56#ifndef OPENSSL_THREADS
49# define OPENSSL_THREADS 57# define OPENSSL_THREADS
50#endif 58#endif
@@ -60,6 +68,9 @@
60# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) 68# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
61# define NO_CAMELLIA 69# define NO_CAMELLIA
62# endif 70# endif
71# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
72# define NO_EC_NISTP_64_GCC_128
73# endif
63# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) 74# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
64# define NO_CMS 75# define NO_CMS
65# endif 76# endif
@@ -78,18 +89,21 @@
78# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) 89# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
79# define NO_MD2 90# define NO_MD2
80# endif 91# endif
81# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
82# define NO_MDC2
83# endif
84# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) 92# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
85# define NO_RC5 93# define NO_RC5
86# endif 94# endif
87# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) 95# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
88# define NO_RFC3779 96# define NO_RFC3779
89# endif 97# endif
98# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
99# define NO_SCTP
100# endif
90# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 101# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
91# define NO_SEED 102# define NO_SEED
92# endif 103# endif
104# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP)
105# define NO_SRP
106# endif
93# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) 107# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
94# define NO_SSL2 108# define NO_SSL2
95# endif 109# endif
diff --git a/src/lib/libssl/crypto/arch/vax/bn_asm_vax.S b/src/lib/libssl/crypto/arch/vax/bn_asm_vax.S
index bd067a55d3..f1e46b2010 100644
--- a/src/lib/libssl/crypto/arch/vax/bn_asm_vax.S
+++ b/src/lib/libssl/crypto/arch/vax/bn_asm_vax.S
@@ -1,4 +1,4 @@
1# $OpenBSD: bn_asm_vax.S,v 1.1 2003/11/18 12:39:05 markus Exp $ 1# $OpenBSD: bn_asm_vax.S,v 1.2 2012/10/13 21:31:56 djm Exp $
2# $NetBSD: bn_asm_vax.S,v 1.1 2003/11/03 10:22:28 ragge Exp $ 2# $NetBSD: bn_asm_vax.S,v 1.1 2003/11/03 10:22:28 ragge Exp $
3 3
4#include <machine/asm.h> 4#include <machine/asm.h>
diff --git a/src/lib/libssl/crypto/arch/vax/opensslconf.h b/src/lib/libssl/crypto/arch/vax/opensslconf.h
index 7c7015c9b7..fc5ea38470 100644
--- a/src/lib/libssl/crypto/arch/vax/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/vax/opensslconf.h
@@ -4,9 +4,13 @@
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#ifndef OPENSSL_NO_CAMELLIA 8#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA 9# define OPENSSL_NO_CAMELLIA
9#endif 10#endif
11#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
12# define OPENSSL_NO_EC_NISTP_64_GCC_128
13#endif
10#ifndef OPENSSL_NO_CMS 14#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS 15# define OPENSSL_NO_CMS
12#endif 16#endif
@@ -25,18 +29,21 @@
25#ifndef OPENSSL_NO_MD2 29#ifndef OPENSSL_NO_MD2
26# define OPENSSL_NO_MD2 30# define OPENSSL_NO_MD2
27#endif 31#endif
28#ifndef OPENSSL_NO_MDC2
29# define OPENSSL_NO_MDC2
30#endif
31#ifndef OPENSSL_NO_RC5 32#ifndef OPENSSL_NO_RC5
32# define OPENSSL_NO_RC5 33# define OPENSSL_NO_RC5
33#endif 34#endif
34#ifndef OPENSSL_NO_RFC3779 35#ifndef OPENSSL_NO_RFC3779
35# define OPENSSL_NO_RFC3779 36# define OPENSSL_NO_RFC3779
36#endif 37#endif
38#ifndef OPENSSL_NO_SCTP
39# define OPENSSL_NO_SCTP
40#endif
37#ifndef OPENSSL_NO_SEED 41#ifndef OPENSSL_NO_SEED
38# define OPENSSL_NO_SEED 42# define OPENSSL_NO_SEED
39#endif 43#endif
44#ifndef OPENSSL_NO_SRP
45# define OPENSSL_NO_SRP
46#endif
40#ifndef OPENSSL_NO_SSL2 47#ifndef OPENSSL_NO_SSL2
41# define OPENSSL_NO_SSL2 48# define OPENSSL_NO_SSL2
42#endif 49#endif
@@ -45,6 +52,7 @@
45#endif 52#endif
46 53
47#endif /* OPENSSL_DOING_MAKEDEPEND */ 54#endif /* OPENSSL_DOING_MAKEDEPEND */
55
48#ifndef OPENSSL_THREADS 56#ifndef OPENSSL_THREADS
49# define OPENSSL_THREADS 57# define OPENSSL_THREADS
50#endif 58#endif
@@ -60,6 +68,9 @@
60# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) 68# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
61# define NO_CAMELLIA 69# define NO_CAMELLIA
62# endif 70# endif
71# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
72# define NO_EC_NISTP_64_GCC_128
73# endif
63# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) 74# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
64# define NO_CMS 75# define NO_CMS
65# endif 76# endif
@@ -78,18 +89,21 @@
78# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) 89# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
79# define NO_MD2 90# define NO_MD2
80# endif 91# endif
81# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
82# define NO_MDC2
83# endif
84# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) 92# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
85# define NO_RC5 93# define NO_RC5
86# endif 94# endif
87# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) 95# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
88# define NO_RFC3779 96# define NO_RFC3779
89# endif 97# endif
98# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
99# define NO_SCTP
100# endif
90# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 101# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
91# define NO_SEED 102# define NO_SEED
92# endif 103# endif
104# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP)
105# define NO_SRP
106# endif
93# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) 107# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
94# define NO_SSL2 108# define NO_SSL2
95# endif 109# endif
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-12-08 00:42:45 +0000