diff options
| author | tedu <> | 2014-07-11 14:01:38 +0000 |
|---|---|---|
| committer | tedu <> | 2014-07-11 14:01:38 +0000 |
| commit | b3bcf68aa09fbe686f5d5dc4b8c071f56c3946a0 (patch) | |
| tree | 1cfb0cb95b3e2c5d07c759a681b7fa30b6a3b153 /src | |
| parent | e0377f161e260f469c7bca512739a3c80f0a32b8 (diff) | |
| download | openbsd-b3bcf68aa09fbe686f5d5dc4b8c071f56c3946a0.tar.gz openbsd-b3bcf68aa09fbe686f5d5dc4b8c071f56c3946a0.tar.bz2 openbsd-b3bcf68aa09fbe686f5d5dc4b8c071f56c3946a0.zip | |
move all the feature settings to a common header.
probably ok beck jsing miod
Diffstat (limited to 'src')
31 files changed, 176 insertions, 1875 deletions
diff --git a/src/lib/libcrypto/arch/alpha/opensslconf.h b/src/lib/libcrypto/arch/alpha/opensslconf.h index b8c21226ff..1f08ea9281 100644 --- a/src/lib/libcrypto/arch/alpha/opensslconf.h +++ b/src/lib/libcrypto/arch/alpha/opensslconf.h | |||
| @@ -1,75 +1,4 @@ | |||
| 1 | # define OPENSSL_NO_CAMELLIA | 1 | #include <opensslfeatures.h> |
| 2 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 3 | # define OPENSSL_NO_CMS | ||
| 4 | # define OPENSSL_NO_GMP | ||
| 5 | # define OPENSSL_NO_GOST | ||
| 6 | # define OPENSSL_NO_JPAKE | ||
| 7 | # define OPENSSL_NO_KRB5 | ||
| 8 | # define OPENSSL_NO_MD2 | ||
| 9 | # define OPENSSL_NO_PSK | ||
| 10 | # define OPENSSL_NO_RC5 | ||
| 11 | # define OPENSSL_NO_RFC3779 | ||
| 12 | # define OPENSSL_NO_SCTP | ||
| 13 | # define OPENSSL_NO_SEED | ||
| 14 | # define OPENSSL_NO_SRP | ||
| 15 | # define OPENSSL_NO_SSL2 | ||
| 16 | # define OPENSSL_NO_STORE | ||
| 17 | |||
| 18 | # define OPENSSL_THREADS | ||
| 19 | # define OPENSSL_NO_DYNAMIC_ENGINE | ||
| 20 | |||
| 21 | /* The OPENSSL_NO_* macros are also defined as NO_* if the application | ||
| 22 | asks for it. This is a transient feature that is provided for those | ||
| 23 | who haven't had the time to do the appropriate changes in their | ||
| 24 | applications. */ | ||
| 25 | #ifdef OPENSSL_ALGORITHM_DEFINES | ||
| 26 | # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) | ||
| 27 | # define NO_CAMELLIA | ||
| 28 | # endif | ||
| 29 | # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) | ||
| 30 | # define NO_EC_NISTP_64_GCC_128 | ||
| 31 | # endif | ||
| 32 | # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) | ||
| 33 | # define NO_CMS | ||
| 34 | # endif | ||
| 35 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | ||
| 36 | # define NO_GMP | ||
| 37 | # endif | ||
| 38 | # if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) | ||
| 39 | # define NO_GOST | ||
| 40 | # endif | ||
| 41 | # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) | ||
| 42 | # define NO_JPAKE | ||
| 43 | # endif | ||
| 44 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | ||
| 45 | # define NO_KRB5 | ||
| 46 | # endif | ||
| 47 | # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) | ||
| 48 | # define NO_MD2 | ||
| 49 | # endif | ||
| 50 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | ||
| 51 | # define NO_RC5 | ||
| 52 | # endif | ||
| 53 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | ||
| 54 | # define NO_RFC3779 | ||
| 55 | # endif | ||
| 56 | # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) | ||
| 57 | # define NO_SCTP | ||
| 58 | # endif | ||
| 59 | # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) | ||
| 60 | # define NO_SEED | ||
| 61 | # endif | ||
| 62 | # if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) | ||
| 63 | # define NO_SRP | ||
| 64 | # endif | ||
| 65 | # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) | ||
| 66 | # define NO_SSL2 | ||
| 67 | # endif | ||
| 68 | # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) | ||
| 69 | # define NO_STORE | ||
| 70 | # endif | ||
| 71 | #endif | ||
| 72 | |||
| 73 | /* crypto/opensslconf.h.in */ | 2 | /* crypto/opensslconf.h.in */ |
| 74 | 3 | ||
| 75 | /* Generate 80386 code? */ | 4 | /* Generate 80386 code? */ |
diff --git a/src/lib/libcrypto/arch/amd64/opensslconf.h b/src/lib/libcrypto/arch/amd64/opensslconf.h index 74140f101f..71567226da 100644 --- a/src/lib/libcrypto/arch/amd64/opensslconf.h +++ b/src/lib/libcrypto/arch/amd64/opensslconf.h | |||
| @@ -1,75 +1,4 @@ | |||
| 1 | # define OPENSSL_NO_CAMELLIA | 1 | #include <opensslfeatures.h> |
| 2 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 3 | # define OPENSSL_NO_CMS | ||
| 4 | # define OPENSSL_NO_GMP | ||
| 5 | # define OPENSSL_NO_GOST | ||
| 6 | # define OPENSSL_NO_JPAKE | ||
| 7 | # define OPENSSL_NO_KRB5 | ||
| 8 | # define OPENSSL_NO_MD2 | ||
| 9 | # define OPENSSL_NO_PSK | ||
| 10 | # define OPENSSL_NO_RC5 | ||
| 11 | # define OPENSSL_NO_RFC3779 | ||
| 12 | # define OPENSSL_NO_SCTP | ||
| 13 | # define OPENSSL_NO_SEED | ||
| 14 | # define OPENSSL_NO_SRP | ||
| 15 | # define OPENSSL_NO_SSL2 | ||
| 16 | # define OPENSSL_NO_STORE | ||
| 17 | |||
| 18 | # define OPENSSL_THREADS | ||
| 19 | # define OPENSSL_NO_DYNAMIC_ENGINE | ||
| 20 | |||
| 21 | /* The OPENSSL_NO_* macros are also defined as NO_* if the application | ||
| 22 | asks for it. This is a transient feature that is provided for those | ||
| 23 | who haven't had the time to do the appropriate changes in their | ||
| 24 | applications. */ | ||
| 25 | #ifdef OPENSSL_ALGORITHM_DEFINES | ||
| 26 | # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) | ||
| 27 | # define NO_CAMELLIA | ||
| 28 | # endif | ||
| 29 | # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) | ||
| 30 | # define NO_EC_NISTP_64_GCC_128 | ||
| 31 | # endif | ||
| 32 | # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) | ||
| 33 | # define NO_CMS | ||
| 34 | # endif | ||
| 35 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | ||
| 36 | # define NO_GMP | ||
| 37 | # endif | ||
| 38 | # if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) | ||
| 39 | # define NO_GOST | ||
| 40 | # endif | ||
| 41 | # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) | ||
| 42 | # define NO_JPAKE | ||
| 43 | # endif | ||
| 44 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | ||
| 45 | # define NO_KRB5 | ||
| 46 | # endif | ||
| 47 | # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) | ||
| 48 | # define NO_MD2 | ||
| 49 | # endif | ||
| 50 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | ||
| 51 | # define NO_RC5 | ||
| 52 | # endif | ||
| 53 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | ||
| 54 | # define NO_RFC3779 | ||
| 55 | # endif | ||
| 56 | # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) | ||
| 57 | # define NO_SCTP | ||
| 58 | # endif | ||
| 59 | # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) | ||
| 60 | # define NO_SEED | ||
| 61 | # endif | ||
| 62 | # if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) | ||
| 63 | # define NO_SRP | ||
| 64 | # endif | ||
| 65 | # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) | ||
| 66 | # define NO_SSL2 | ||
| 67 | # endif | ||
| 68 | # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) | ||
| 69 | # define NO_STORE | ||
| 70 | # endif | ||
| 71 | #endif | ||
| 72 | |||
| 73 | /* crypto/opensslconf.h.in */ | 2 | /* crypto/opensslconf.h.in */ |
| 74 | 3 | ||
| 75 | /* Generate 80386 code? */ | 4 | /* Generate 80386 code? */ |
diff --git a/src/lib/libcrypto/arch/arm/opensslconf.h b/src/lib/libcrypto/arch/arm/opensslconf.h index 3850f221ea..fd1cd4acf4 100644 --- a/src/lib/libcrypto/arch/arm/opensslconf.h +++ b/src/lib/libcrypto/arch/arm/opensslconf.h | |||
| @@ -1,75 +1,4 @@ | |||
| 1 | # define OPENSSL_NO_CAMELLIA | 1 | #include <opensslfeatures.h> |
| 2 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 3 | # define OPENSSL_NO_CMS | ||
| 4 | # define OPENSSL_NO_GMP | ||
| 5 | # define OPENSSL_NO_GOST | ||
| 6 | # define OPENSSL_NO_JPAKE | ||
| 7 | # define OPENSSL_NO_KRB5 | ||
| 8 | # define OPENSSL_NO_MD2 | ||
| 9 | # define OPENSSL_NO_PSK | ||
| 10 | # define OPENSSL_NO_RC5 | ||
| 11 | # define OPENSSL_NO_RFC3779 | ||
| 12 | # define OPENSSL_NO_SCTP | ||
| 13 | # define OPENSSL_NO_SEED | ||
| 14 | # define OPENSSL_NO_SRP | ||
| 15 | # define OPENSSL_NO_SSL2 | ||
| 16 | # define OPENSSL_NO_STORE | ||
| 17 | |||
| 18 | # define OPENSSL_THREADS | ||
| 19 | # define OPENSSL_NO_DYNAMIC_ENGINE | ||
| 20 | |||
| 21 | /* The OPENSSL_NO_* macros are also defined as NO_* if the application | ||
| 22 | asks for it. This is a transient feature that is provided for those | ||
| 23 | who haven't had the time to do the appropriate changes in their | ||
| 24 | applications. */ | ||
| 25 | #ifdef OPENSSL_ALGORITHM_DEFINES | ||
| 26 | # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) | ||
| 27 | # define NO_CAMELLIA | ||
| 28 | # endif | ||
| 29 | # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) | ||
| 30 | # define NO_EC_NISTP_64_GCC_128 | ||
| 31 | # endif | ||
| 32 | # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) | ||
| 33 | # define NO_CMS | ||
| 34 | # endif | ||
| 35 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | ||
| 36 | # define NO_GMP | ||
| 37 | # endif | ||
| 38 | # if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) | ||
| 39 | # define NO_GOST | ||
| 40 | # endif | ||
| 41 | # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) | ||
| 42 | # define NO_JPAKE | ||
| 43 | # endif | ||
| 44 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | ||
| 45 | # define NO_KRB5 | ||
| 46 | # endif | ||
| 47 | # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) | ||
| 48 | # define NO_MD2 | ||
| 49 | # endif | ||
| 50 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | ||
| 51 | # define NO_RC5 | ||
| 52 | # endif | ||
| 53 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | ||
| 54 | # define NO_RFC3779 | ||
| 55 | # endif | ||
| 56 | # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) | ||
| 57 | # define NO_SCTP | ||
| 58 | # endif | ||
| 59 | # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) | ||
| 60 | # define NO_SEED | ||
| 61 | # endif | ||
| 62 | # if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) | ||
| 63 | # define NO_SRP | ||
| 64 | # endif | ||
| 65 | # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) | ||
| 66 | # define NO_SSL2 | ||
| 67 | # endif | ||
| 68 | # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) | ||
| 69 | # define NO_STORE | ||
| 70 | # endif | ||
| 71 | #endif | ||
| 72 | |||
| 73 | /* crypto/opensslconf.h.in */ | 2 | /* crypto/opensslconf.h.in */ |
| 74 | 3 | ||
| 75 | /* Generate 80386 code? */ | 4 | /* Generate 80386 code? */ |
diff --git a/src/lib/libcrypto/arch/hppa/opensslconf.h b/src/lib/libcrypto/arch/hppa/opensslconf.h index 3850f221ea..fd1cd4acf4 100644 --- a/src/lib/libcrypto/arch/hppa/opensslconf.h +++ b/src/lib/libcrypto/arch/hppa/opensslconf.h | |||
| @@ -1,75 +1,4 @@ | |||
| 1 | # define OPENSSL_NO_CAMELLIA | 1 | #include <opensslfeatures.h> |
| 2 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 3 | # define OPENSSL_NO_CMS | ||
| 4 | # define OPENSSL_NO_GMP | ||
| 5 | # define OPENSSL_NO_GOST | ||
| 6 | # define OPENSSL_NO_JPAKE | ||
| 7 | # define OPENSSL_NO_KRB5 | ||
| 8 | # define OPENSSL_NO_MD2 | ||
| 9 | # define OPENSSL_NO_PSK | ||
| 10 | # define OPENSSL_NO_RC5 | ||
| 11 | # define OPENSSL_NO_RFC3779 | ||
| 12 | # define OPENSSL_NO_SCTP | ||
| 13 | # define OPENSSL_NO_SEED | ||
| 14 | # define OPENSSL_NO_SRP | ||
| 15 | # define OPENSSL_NO_SSL2 | ||
| 16 | # define OPENSSL_NO_STORE | ||
| 17 | |||
| 18 | # define OPENSSL_THREADS | ||
| 19 | # define OPENSSL_NO_DYNAMIC_ENGINE | ||
| 20 | |||
| 21 | /* The OPENSSL_NO_* macros are also defined as NO_* if the application | ||
| 22 | asks for it. This is a transient feature that is provided for those | ||
| 23 | who haven't had the time to do the appropriate changes in their | ||
| 24 | applications. */ | ||
| 25 | #ifdef OPENSSL_ALGORITHM_DEFINES | ||
| 26 | # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) | ||
| 27 | # define NO_CAMELLIA | ||
| 28 | # endif | ||
| 29 | # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) | ||
| 30 | # define NO_EC_NISTP_64_GCC_128 | ||
| 31 | # endif | ||
| 32 | # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) | ||
| 33 | # define NO_CMS | ||
| 34 | # endif | ||
| 35 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | ||
| 36 | # define NO_GMP | ||
| 37 | # endif | ||
| 38 | # if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) | ||
| 39 | # define NO_GOST | ||
| 40 | # endif | ||
| 41 | # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) | ||
| 42 | # define NO_JPAKE | ||
| 43 | # endif | ||
| 44 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | ||
| 45 | # define NO_KRB5 | ||
| 46 | # endif | ||
| 47 | # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) | ||
| 48 | # define NO_MD2 | ||
| 49 | # endif | ||
| 50 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | ||
| 51 | # define NO_RC5 | ||
| 52 | # endif | ||
| 53 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | ||
| 54 | # define NO_RFC3779 | ||
| 55 | # endif | ||
| 56 | # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) | ||
| 57 | # define NO_SCTP | ||
| 58 | # endif | ||
| 59 | # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) | ||
| 60 | # define NO_SEED | ||
| 61 | # endif | ||
| 62 | # if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) | ||
| 63 | # define NO_SRP | ||
| 64 | # endif | ||
| 65 | # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) | ||
| 66 | # define NO_SSL2 | ||
| 67 | # endif | ||
| 68 | # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) | ||
| 69 | # define NO_STORE | ||
| 70 | # endif | ||
| 71 | #endif | ||
| 72 | |||
| 73 | /* crypto/opensslconf.h.in */ | 2 | /* crypto/opensslconf.h.in */ |
| 74 | 3 | ||
| 75 | /* Generate 80386 code? */ | 4 | /* Generate 80386 code? */ |
diff --git a/src/lib/libcrypto/arch/hppa64/opensslconf.h b/src/lib/libcrypto/arch/hppa64/opensslconf.h index b435027dd3..d744930e2c 100644 --- a/src/lib/libcrypto/arch/hppa64/opensslconf.h +++ b/src/lib/libcrypto/arch/hppa64/opensslconf.h | |||
| @@ -1,75 +1,4 @@ | |||
| 1 | # define OPENSSL_NO_CAMELLIA | 1 | #include <opensslfeatures.h> |
| 2 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 3 | # define OPENSSL_NO_CMS | ||
| 4 | # define OPENSSL_NO_GMP | ||
| 5 | # define OPENSSL_NO_GOST | ||
| 6 | # define OPENSSL_NO_JPAKE | ||
| 7 | # define OPENSSL_NO_KRB5 | ||
| 8 | # define OPENSSL_NO_MD2 | ||
| 9 | # define OPENSSL_NO_PSK | ||
| 10 | # define OPENSSL_NO_RC5 | ||
| 11 | # define OPENSSL_NO_RFC3779 | ||
| 12 | # define OPENSSL_NO_SCTP | ||
| 13 | # define OPENSSL_NO_SEED | ||
| 14 | # define OPENSSL_NO_SRP | ||
| 15 | # define OPENSSL_NO_SSL2 | ||
| 16 | # define OPENSSL_NO_STORE | ||
| 17 | |||
| 18 | # define OPENSSL_THREADS | ||
| 19 | # define OPENSSL_NO_DYNAMIC_ENGINE | ||
| 20 | |||
| 21 | /* The OPENSSL_NO_* macros are also defined as NO_* if the application | ||
| 22 | asks for it. This is a transient feature that is provided for those | ||
| 23 | who haven't had the time to do the appropriate changes in their | ||
| 24 | applications. */ | ||
| 25 | #ifdef OPENSSL_ALGORITHM_DEFINES | ||
| 26 | # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) | ||
| 27 | # define NO_CAMELLIA | ||
| 28 | # endif | ||
| 29 | # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) | ||
| 30 | # define NO_EC_NISTP_64_GCC_128 | ||
| 31 | # endif | ||
| 32 | # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) | ||
| 33 | # define NO_CMS | ||
| 34 | # endif | ||
| 35 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | ||
| 36 | # define NO_GMP | ||
| 37 | # endif | ||
| 38 | # if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) | ||
| 39 | # define NO_GOST | ||
| 40 | # endif | ||
| 41 | # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) | ||
| 42 | # define NO_JPAKE | ||
| 43 | # endif | ||
| 44 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | ||
| 45 | # define NO_KRB5 | ||
| 46 | # endif | ||
| 47 | # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) | ||
| 48 | # define NO_MD2 | ||
| 49 | # endif | ||
| 50 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | ||
| 51 | # define NO_RC5 | ||
| 52 | # endif | ||
| 53 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | ||
| 54 | # define NO_RFC3779 | ||
| 55 | # endif | ||
| 56 | # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) | ||
| 57 | # define NO_SCTP | ||
| 58 | # endif | ||
| 59 | # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) | ||
| 60 | # define NO_SEED | ||
| 61 | # endif | ||
| 62 | # if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) | ||
| 63 | # define NO_SRP | ||
| 64 | # endif | ||
| 65 | # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) | ||
| 66 | # define NO_SSL2 | ||
| 67 | # endif | ||
| 68 | # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) | ||
| 69 | # define NO_STORE | ||
| 70 | # endif | ||
| 71 | #endif | ||
| 72 | |||
| 73 | /* crypto/opensslconf.h.in */ | 2 | /* crypto/opensslconf.h.in */ |
| 74 | 3 | ||
| 75 | /* Generate 80386 code? */ | 4 | /* Generate 80386 code? */ |
diff --git a/src/lib/libcrypto/arch/i386/opensslconf.h b/src/lib/libcrypto/arch/i386/opensslconf.h index fa8368f906..cac7a66875 100644 --- a/src/lib/libcrypto/arch/i386/opensslconf.h +++ b/src/lib/libcrypto/arch/i386/opensslconf.h | |||
| @@ -1,75 +1,4 @@ | |||
| 1 | # define OPENSSL_NO_CAMELLIA | 1 | #include <opensslfeatures.h> |
| 2 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 3 | # define OPENSSL_NO_CMS | ||
| 4 | # define OPENSSL_NO_GMP | ||
| 5 | # define OPENSSL_NO_GOST | ||
| 6 | # define OPENSSL_NO_JPAKE | ||
| 7 | # define OPENSSL_NO_KRB5 | ||
| 8 | # define OPENSSL_NO_MD2 | ||
| 9 | # define OPENSSL_NO_PSK | ||
| 10 | # define OPENSSL_NO_RC5 | ||
| 11 | # define OPENSSL_NO_RFC3779 | ||
| 12 | # define OPENSSL_NO_SCTP | ||
| 13 | # define OPENSSL_NO_SEED | ||
| 14 | # define OPENSSL_NO_SRP | ||
| 15 | # define OPENSSL_NO_SSL2 | ||
| 16 | # define OPENSSL_NO_STORE | ||
| 17 | |||
| 18 | # define OPENSSL_THREADS | ||
| 19 | # define OPENSSL_NO_DYNAMIC_ENGINE | ||
| 20 | |||
| 21 | /* The OPENSSL_NO_* macros are also defined as NO_* if the application | ||
| 22 | asks for it. This is a transient feature that is provided for those | ||
| 23 | who haven't had the time to do the appropriate changes in their | ||
| 24 | applications. */ | ||
| 25 | #ifdef OPENSSL_ALGORITHM_DEFINES | ||
| 26 | # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) | ||
| 27 | # define NO_CAMELLIA | ||
| 28 | # endif | ||
| 29 | # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) | ||
| 30 | # define NO_EC_NISTP_64_GCC_128 | ||
| 31 | # endif | ||
| 32 | # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) | ||
| 33 | # define NO_CMS | ||
| 34 | # endif | ||
| 35 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | ||
| 36 | # define NO_GMP | ||
| 37 | # endif | ||
| 38 | # if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) | ||
| 39 | # define NO_GOST | ||
| 40 | # endif | ||
| 41 | # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) | ||
| 42 | # define NO_JPAKE | ||
| 43 | # endif | ||
| 44 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | ||
| 45 | # define NO_KRB5 | ||
| 46 | # endif | ||
| 47 | # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) | ||
| 48 | # define NO_MD2 | ||
| 49 | # endif | ||
| 50 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | ||
| 51 | # define NO_RC5 | ||
| 52 | # endif | ||
| 53 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | ||
| 54 | # define NO_RFC3779 | ||
| 55 | # endif | ||
| 56 | # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) | ||
| 57 | # define NO_SCTP | ||
| 58 | # endif | ||
| 59 | # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) | ||
| 60 | # define NO_SEED | ||
| 61 | # endif | ||
| 62 | # if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) | ||
| 63 | # define NO_SRP | ||
| 64 | # endif | ||
| 65 | # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) | ||
| 66 | # define NO_SSL2 | ||
| 67 | # endif | ||
| 68 | # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) | ||
| 69 | # define NO_STORE | ||
| 70 | # endif | ||
| 71 | #endif | ||
| 72 | |||
| 73 | /* crypto/opensslconf.h.in */ | 2 | /* crypto/opensslconf.h.in */ |
| 74 | 3 | ||
| 75 | /* Generate 80386 code? */ | 4 | /* Generate 80386 code? */ |
diff --git a/src/lib/libcrypto/arch/ia64/opensslconf.h b/src/lib/libcrypto/arch/ia64/opensslconf.h index 3b60e6346e..c44c5ab328 100644 --- a/src/lib/libcrypto/arch/ia64/opensslconf.h +++ b/src/lib/libcrypto/arch/ia64/opensslconf.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* $OpenBSD: opensslconf.h,v 1.1 2014/05/27 10:10:59 tobiasu Exp $ */ | 1 | #include <opensslfeatures.h> |
| 2 | /* $OpenBSD: opensslconf.h,v 1.2 2014/07/11 14:01:38 tedu Exp $ */ | ||
| 2 | 3 | ||
| 3 | #error "Dummy header, create a proper ia64 config" | 4 | #error "Dummy header, create a proper ia64 config" |
diff --git a/src/lib/libcrypto/arch/m88k/opensslconf.h b/src/lib/libcrypto/arch/m88k/opensslconf.h index 3850f221ea..fd1cd4acf4 100644 --- a/src/lib/libcrypto/arch/m88k/opensslconf.h +++ b/src/lib/libcrypto/arch/m88k/opensslconf.h | |||
| @@ -1,75 +1,4 @@ | |||
| 1 | # define OPENSSL_NO_CAMELLIA | 1 | #include <opensslfeatures.h> |
| 2 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 3 | # define OPENSSL_NO_CMS | ||
| 4 | # define OPENSSL_NO_GMP | ||
| 5 | # define OPENSSL_NO_GOST | ||
| 6 | # define OPENSSL_NO_JPAKE | ||
| 7 | # define OPENSSL_NO_KRB5 | ||
| 8 | # define OPENSSL_NO_MD2 | ||
| 9 | # define OPENSSL_NO_PSK | ||
| 10 | # define OPENSSL_NO_RC5 | ||
| 11 | # define OPENSSL_NO_RFC3779 | ||
| 12 | # define OPENSSL_NO_SCTP | ||
| 13 | # define OPENSSL_NO_SEED | ||
| 14 | # define OPENSSL_NO_SRP | ||
| 15 | # define OPENSSL_NO_SSL2 | ||
| 16 | # define OPENSSL_NO_STORE | ||
| 17 | |||
| 18 | # define OPENSSL_THREADS | ||
| 19 | # define OPENSSL_NO_DYNAMIC_ENGINE | ||
| 20 | |||
| 21 | /* The OPENSSL_NO_* macros are also defined as NO_* if the application | ||
| 22 | asks for it. This is a transient feature that is provided for those | ||
| 23 | who haven't had the time to do the appropriate changes in their | ||
| 24 | applications. */ | ||
| 25 | #ifdef OPENSSL_ALGORITHM_DEFINES | ||
| 26 | # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) | ||
| 27 | # define NO_CAMELLIA | ||
| 28 | # endif | ||
| 29 | # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) | ||
| 30 | # define NO_EC_NISTP_64_GCC_128 | ||
| 31 | # endif | ||
| 32 | # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) | ||
| 33 | # define NO_CMS | ||
| 34 | # endif | ||
| 35 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | ||
| 36 | # define NO_GMP | ||
| 37 | # endif | ||
| 38 | # if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) | ||
| 39 | # define NO_GOST | ||
| 40 | # endif | ||
| 41 | # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) | ||
| 42 | # define NO_JPAKE | ||
| 43 | # endif | ||
| 44 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | ||
| 45 | # define NO_KRB5 | ||
| 46 | # endif | ||
| 47 | # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) | ||
| 48 | # define NO_MD2 | ||
| 49 | # endif | ||
| 50 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | ||
| 51 | # define NO_RC5 | ||
| 52 | # endif | ||
| 53 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | ||
| 54 | # define NO_RFC3779 | ||
| 55 | # endif | ||
| 56 | # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) | ||
| 57 | # define NO_SCTP | ||
| 58 | # endif | ||
| 59 | # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) | ||
| 60 | # define NO_SEED | ||
| 61 | # endif | ||
| 62 | # if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) | ||
| 63 | # define NO_SRP | ||
| 64 | # endif | ||
| 65 | # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) | ||
| 66 | # define NO_SSL2 | ||
| 67 | # endif | ||
| 68 | # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) | ||
| 69 | # define NO_STORE | ||
| 70 | # endif | ||
| 71 | #endif | ||
| 72 | |||
| 73 | /* crypto/opensslconf.h.in */ | 2 | /* crypto/opensslconf.h.in */ |
| 74 | 3 | ||
| 75 | /* Generate 80386 code? */ | 4 | /* Generate 80386 code? */ |
diff --git a/src/lib/libcrypto/arch/mips64/opensslconf.h b/src/lib/libcrypto/arch/mips64/opensslconf.h index b1f1228418..4b8fbbc174 100644 --- a/src/lib/libcrypto/arch/mips64/opensslconf.h +++ b/src/lib/libcrypto/arch/mips64/opensslconf.h | |||
| @@ -1,75 +1,4 @@ | |||
| 1 | # define OPENSSL_NO_CAMELLIA | 1 | #include <opensslfeatures.h> |
| 2 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 3 | # define OPENSSL_NO_CMS | ||
| 4 | # define OPENSSL_NO_GMP | ||
| 5 | # define OPENSSL_NO_GOST | ||
| 6 | # define OPENSSL_NO_JPAKE | ||
| 7 | # define OPENSSL_NO_KRB5 | ||
| 8 | # define OPENSSL_NO_MD2 | ||
| 9 | # define OPENSSL_NO_PSK | ||
| 10 | # define OPENSSL_NO_RC5 | ||
| 11 | # define OPENSSL_NO_RFC3779 | ||
| 12 | # define OPENSSL_NO_SCTP | ||
| 13 | # define OPENSSL_NO_SEED | ||
| 14 | # define OPENSSL_NO_SRP | ||
| 15 | # define OPENSSL_NO_SSL2 | ||
| 16 | # define OPENSSL_NO_STORE | ||
| 17 | |||
| 18 | # define OPENSSL_THREADS | ||
| 19 | # define OPENSSL_NO_DYNAMIC_ENGINE | ||
| 20 | |||
| 21 | /* The OPENSSL_NO_* macros are also defined as NO_* if the application | ||
| 22 | asks for it. This is a transient feature that is provided for those | ||
| 23 | who haven't had the time to do the appropriate changes in their | ||
| 24 | applications. */ | ||
| 25 | #ifdef OPENSSL_ALGORITHM_DEFINES | ||
| 26 | # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) | ||
| 27 | # define NO_CAMELLIA | ||
| 28 | # endif | ||
| 29 | # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) | ||
| 30 | # define NO_EC_NISTP_64_GCC_128 | ||
| 31 | # endif | ||
| 32 | # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) | ||
| 33 | # define NO_CMS | ||
| 34 | # endif | ||
| 35 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | ||
| 36 | # define NO_GMP | ||
| 37 | # endif | ||
| 38 | # if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) | ||
| 39 | # define NO_GOST | ||
| 40 | # endif | ||
| 41 | # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) | ||
| 42 | # define NO_JPAKE | ||
| 43 | # endif | ||
| 44 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | ||
| 45 | # define NO_KRB5 | ||
| 46 | # endif | ||
| 47 | # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) | ||
| 48 | # define NO_MD2 | ||
| 49 | # endif | ||
| 50 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | ||
| 51 | # define NO_RC5 | ||
| 52 | # endif | ||
| 53 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | ||
| 54 | # define NO_RFC3779 | ||
| 55 | # endif | ||
| 56 | # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) | ||
| 57 | # define NO_SCTP | ||
| 58 | # endif | ||
| 59 | # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) | ||
| 60 | # define NO_SEED | ||
| 61 | # endif | ||
| 62 | # if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) | ||
| 63 | # define NO_SRP | ||
| 64 | # endif | ||
| 65 | # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) | ||
| 66 | # define NO_SSL2 | ||
| 67 | # endif | ||
| 68 | # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) | ||
| 69 | # define NO_STORE | ||
| 70 | # endif | ||
| 71 | #endif | ||
| 72 | |||
| 73 | /* crypto/opensslconf.h.in */ | 2 | /* crypto/opensslconf.h.in */ |
| 74 | 3 | ||
| 75 | /* Generate 80386 code? */ | 4 | /* Generate 80386 code? */ |
diff --git a/src/lib/libcrypto/arch/powerpc/opensslconf.h b/src/lib/libcrypto/arch/powerpc/opensslconf.h index 3850f221ea..fd1cd4acf4 100644 --- a/src/lib/libcrypto/arch/powerpc/opensslconf.h +++ b/src/lib/libcrypto/arch/powerpc/opensslconf.h | |||
| @@ -1,75 +1,4 @@ | |||
| 1 | # define OPENSSL_NO_CAMELLIA | 1 | #include <opensslfeatures.h> |
| 2 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 3 | # define OPENSSL_NO_CMS | ||
| 4 | # define OPENSSL_NO_GMP | ||
| 5 | # define OPENSSL_NO_GOST | ||
| 6 | # define OPENSSL_NO_JPAKE | ||
| 7 | # define OPENSSL_NO_KRB5 | ||
| 8 | # define OPENSSL_NO_MD2 | ||
| 9 | # define OPENSSL_NO_PSK | ||
| 10 | # define OPENSSL_NO_RC5 | ||
| 11 | # define OPENSSL_NO_RFC3779 | ||
| 12 | # define OPENSSL_NO_SCTP | ||
| 13 | # define OPENSSL_NO_SEED | ||
| 14 | # define OPENSSL_NO_SRP | ||
| 15 | # define OPENSSL_NO_SSL2 | ||
| 16 | # define OPENSSL_NO_STORE | ||
| 17 | |||
| 18 | # define OPENSSL_THREADS | ||
| 19 | # define OPENSSL_NO_DYNAMIC_ENGINE | ||
| 20 | |||
| 21 | /* The OPENSSL_NO_* macros are also defined as NO_* if the application | ||
| 22 | asks for it. This is a transient feature that is provided for those | ||
| 23 | who haven't had the time to do the appropriate changes in their | ||
| 24 | applications. */ | ||
| 25 | #ifdef OPENSSL_ALGORITHM_DEFINES | ||
| 26 | # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) | ||
| 27 | # define NO_CAMELLIA | ||
| 28 | # endif | ||
| 29 | # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) | ||
| 30 | # define NO_EC_NISTP_64_GCC_128 | ||
| 31 | # endif | ||
| 32 | # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) | ||
| 33 | # define NO_CMS | ||
| 34 | # endif | ||
| 35 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | ||
| 36 | # define NO_GMP | ||
| 37 | # endif | ||
| 38 | # if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) | ||
| 39 | # define NO_GOST | ||
| 40 | # endif | ||
| 41 | # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) | ||
| 42 | # define NO_JPAKE | ||
| 43 | # endif | ||
| 44 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | ||
| 45 | # define NO_KRB5 | ||
| 46 | # endif | ||
| 47 | # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) | ||
| 48 | # define NO_MD2 | ||
| 49 | # endif | ||
| 50 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | ||
| 51 | # define NO_RC5 | ||
| 52 | # endif | ||
| 53 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | ||
| 54 | # define NO_RFC3779 | ||
| 55 | # endif | ||
| 56 | # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) | ||
| 57 | # define NO_SCTP | ||
| 58 | # endif | ||
| 59 | # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) | ||
| 60 | # define NO_SEED | ||
| 61 | # endif | ||
| 62 | # if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) | ||
| 63 | # define NO_SRP | ||
| 64 | # endif | ||
| 65 | # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) | ||
| 66 | # define NO_SSL2 | ||
| 67 | # endif | ||
| 68 | # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) | ||
| 69 | # define NO_STORE | ||
| 70 | # endif | ||
| 71 | #endif | ||
| 72 | |||
| 73 | /* crypto/opensslconf.h.in */ | 2 | /* crypto/opensslconf.h.in */ |
| 74 | 3 | ||
| 75 | /* Generate 80386 code? */ | 4 | /* Generate 80386 code? */ |
diff --git a/src/lib/libcrypto/arch/sh/opensslconf.h b/src/lib/libcrypto/arch/sh/opensslconf.h index 3850f221ea..fd1cd4acf4 100644 --- a/src/lib/libcrypto/arch/sh/opensslconf.h +++ b/src/lib/libcrypto/arch/sh/opensslconf.h | |||
| @@ -1,75 +1,4 @@ | |||
| 1 | # define OPENSSL_NO_CAMELLIA | 1 | #include <opensslfeatures.h> |
| 2 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 3 | # define OPENSSL_NO_CMS | ||
| 4 | # define OPENSSL_NO_GMP | ||
| 5 | # define OPENSSL_NO_GOST | ||
| 6 | # define OPENSSL_NO_JPAKE | ||
| 7 | # define OPENSSL_NO_KRB5 | ||
| 8 | # define OPENSSL_NO_MD2 | ||
| 9 | # define OPENSSL_NO_PSK | ||
| 10 | # define OPENSSL_NO_RC5 | ||
| 11 | # define OPENSSL_NO_RFC3779 | ||
| 12 | # define OPENSSL_NO_SCTP | ||
| 13 | # define OPENSSL_NO_SEED | ||
| 14 | # define OPENSSL_NO_SRP | ||
| 15 | # define OPENSSL_NO_SSL2 | ||
| 16 | # define OPENSSL_NO_STORE | ||
| 17 | |||
| 18 | # define OPENSSL_THREADS | ||
| 19 | # define OPENSSL_NO_DYNAMIC_ENGINE | ||
| 20 | |||
| 21 | /* The OPENSSL_NO_* macros are also defined as NO_* if the application | ||
| 22 | asks for it. This is a transient feature that is provided for those | ||
| 23 | who haven't had the time to do the appropriate changes in their | ||
| 24 | applications. */ | ||
| 25 | #ifdef OPENSSL_ALGORITHM_DEFINES | ||
| 26 | # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) | ||
| 27 | # define NO_CAMELLIA | ||
| 28 | # endif | ||
| 29 | # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) | ||
| 30 | # define NO_EC_NISTP_64_GCC_128 | ||
| 31 | # endif | ||
| 32 | # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) | ||
| 33 | # define NO_CMS | ||
| 34 | # endif | ||
| 35 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | ||
| 36 | # define NO_GMP | ||
| 37 | # endif | ||
| 38 | # if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) | ||
| 39 | # define NO_GOST | ||
| 40 | # endif | ||
| 41 | # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) | ||
| 42 | # define NO_JPAKE | ||
| 43 | # endif | ||
| 44 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | ||
| 45 | # define NO_KRB5 | ||
| 46 | # endif | ||
| 47 | # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) | ||
| 48 | # define NO_MD2 | ||
| 49 | # endif | ||
| 50 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | ||
| 51 | # define NO_RC5 | ||
| 52 | # endif | ||
| 53 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | ||
| 54 | # define NO_RFC3779 | ||
| 55 | # endif | ||
| 56 | # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) | ||
| 57 | # define NO_SCTP | ||
| 58 | # endif | ||
| 59 | # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) | ||
| 60 | # define NO_SEED | ||
| 61 | # endif | ||
| 62 | # if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) | ||
| 63 | # define NO_SRP | ||
| 64 | # endif | ||
| 65 | # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) | ||
| 66 | # define NO_SSL2 | ||
| 67 | # endif | ||
| 68 | # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) | ||
| 69 | # define NO_STORE | ||
| 70 | # endif | ||
| 71 | #endif | ||
| 72 | |||
| 73 | /* crypto/opensslconf.h.in */ | 2 | /* crypto/opensslconf.h.in */ |
| 74 | 3 | ||
| 75 | /* Generate 80386 code? */ | 4 | /* Generate 80386 code? */ |
diff --git a/src/lib/libcrypto/arch/sparc/opensslconf.h b/src/lib/libcrypto/arch/sparc/opensslconf.h index 3850f221ea..fd1cd4acf4 100644 --- a/src/lib/libcrypto/arch/sparc/opensslconf.h +++ b/src/lib/libcrypto/arch/sparc/opensslconf.h | |||
| @@ -1,75 +1,4 @@ | |||
| 1 | # define OPENSSL_NO_CAMELLIA | 1 | #include <opensslfeatures.h> |
| 2 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 3 | # define OPENSSL_NO_CMS | ||
| 4 | # define OPENSSL_NO_GMP | ||
| 5 | # define OPENSSL_NO_GOST | ||
| 6 | # define OPENSSL_NO_JPAKE | ||
| 7 | # define OPENSSL_NO_KRB5 | ||
| 8 | # define OPENSSL_NO_MD2 | ||
| 9 | # define OPENSSL_NO_PSK | ||
| 10 | # define OPENSSL_NO_RC5 | ||
| 11 | # define OPENSSL_NO_RFC3779 | ||
| 12 | # define OPENSSL_NO_SCTP | ||
| 13 | # define OPENSSL_NO_SEED | ||
| 14 | # define OPENSSL_NO_SRP | ||
| 15 | # define OPENSSL_NO_SSL2 | ||
| 16 | # define OPENSSL_NO_STORE | ||
| 17 | |||
| 18 | # define OPENSSL_THREADS | ||
| 19 | # define OPENSSL_NO_DYNAMIC_ENGINE | ||
| 20 | |||
| 21 | /* The OPENSSL_NO_* macros are also defined as NO_* if the application | ||
| 22 | asks for it. This is a transient feature that is provided for those | ||
| 23 | who haven't had the time to do the appropriate changes in their | ||
| 24 | applications. */ | ||
| 25 | #ifdef OPENSSL_ALGORITHM_DEFINES | ||
| 26 | # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) | ||
| 27 | # define NO_CAMELLIA | ||
| 28 | # endif | ||
| 29 | # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) | ||
| 30 | # define NO_EC_NISTP_64_GCC_128 | ||
| 31 | # endif | ||
| 32 | # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) | ||
| 33 | # define NO_CMS | ||
| 34 | # endif | ||
| 35 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | ||
| 36 | # define NO_GMP | ||
| 37 | # endif | ||
| 38 | # if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) | ||
| 39 | # define NO_GOST | ||
| 40 | # endif | ||
| 41 | # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) | ||
| 42 | # define NO_JPAKE | ||
| 43 | # endif | ||
| 44 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | ||
| 45 | # define NO_KRB5 | ||
| 46 | # endif | ||
| 47 | # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) | ||
| 48 | # define NO_MD2 | ||
| 49 | # endif | ||
| 50 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | ||
| 51 | # define NO_RC5 | ||
| 52 | # endif | ||
| 53 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | ||
| 54 | # define NO_RFC3779 | ||
| 55 | # endif | ||
| 56 | # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) | ||
| 57 | # define NO_SCTP | ||
| 58 | # endif | ||
| 59 | # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) | ||
| 60 | # define NO_SEED | ||
| 61 | # endif | ||
| 62 | # if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) | ||
| 63 | # define NO_SRP | ||
| 64 | # endif | ||
| 65 | # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) | ||
| 66 | # define NO_SSL2 | ||
| 67 | # endif | ||
| 68 | # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) | ||
| 69 | # define NO_STORE | ||
| 70 | # endif | ||
| 71 | #endif | ||
| 72 | |||
| 73 | /* crypto/opensslconf.h.in */ | 2 | /* crypto/opensslconf.h.in */ |
| 74 | 3 | ||
| 75 | /* Generate 80386 code? */ | 4 | /* Generate 80386 code? */ |
diff --git a/src/lib/libcrypto/arch/sparc64/opensslconf.h b/src/lib/libcrypto/arch/sparc64/opensslconf.h index b1f1228418..4b8fbbc174 100644 --- a/src/lib/libcrypto/arch/sparc64/opensslconf.h +++ b/src/lib/libcrypto/arch/sparc64/opensslconf.h | |||
| @@ -1,75 +1,4 @@ | |||
| 1 | # define OPENSSL_NO_CAMELLIA | 1 | #include <opensslfeatures.h> |
| 2 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 3 | # define OPENSSL_NO_CMS | ||
| 4 | # define OPENSSL_NO_GMP | ||
| 5 | # define OPENSSL_NO_GOST | ||
| 6 | # define OPENSSL_NO_JPAKE | ||
| 7 | # define OPENSSL_NO_KRB5 | ||
| 8 | # define OPENSSL_NO_MD2 | ||
| 9 | # define OPENSSL_NO_PSK | ||
| 10 | # define OPENSSL_NO_RC5 | ||
| 11 | # define OPENSSL_NO_RFC3779 | ||
| 12 | # define OPENSSL_NO_SCTP | ||
| 13 | # define OPENSSL_NO_SEED | ||
| 14 | # define OPENSSL_NO_SRP | ||
| 15 | # define OPENSSL_NO_SSL2 | ||
| 16 | # define OPENSSL_NO_STORE | ||
| 17 | |||
| 18 | # define OPENSSL_THREADS | ||
| 19 | # define OPENSSL_NO_DYNAMIC_ENGINE | ||
| 20 | |||
| 21 | /* The OPENSSL_NO_* macros are also defined as NO_* if the application | ||
| 22 | asks for it. This is a transient feature that is provided for those | ||
| 23 | who haven't had the time to do the appropriate changes in their | ||
| 24 | applications. */ | ||
| 25 | #ifdef OPENSSL_ALGORITHM_DEFINES | ||
| 26 | # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) | ||
| 27 | # define NO_CAMELLIA | ||
| 28 | # endif | ||
| 29 | # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) | ||
| 30 | # define NO_EC_NISTP_64_GCC_128 | ||
| 31 | # endif | ||
| 32 | # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) | ||
| 33 | # define NO_CMS | ||
| 34 | # endif | ||
| 35 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | ||
| 36 | # define NO_GMP | ||
| 37 | # endif | ||
| 38 | # if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) | ||
| 39 | # define NO_GOST | ||
| 40 | # endif | ||
| 41 | # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) | ||
| 42 | # define NO_JPAKE | ||
| 43 | # endif | ||
| 44 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | ||
| 45 | # define NO_KRB5 | ||
| 46 | # endif | ||
| 47 | # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) | ||
| 48 | # define NO_MD2 | ||
| 49 | # endif | ||
| 50 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | ||
| 51 | # define NO_RC5 | ||
| 52 | # endif | ||
| 53 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | ||
| 54 | # define NO_RFC3779 | ||
| 55 | # endif | ||
| 56 | # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) | ||
| 57 | # define NO_SCTP | ||
| 58 | # endif | ||
| 59 | # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) | ||
| 60 | # define NO_SEED | ||
| 61 | # endif | ||
| 62 | # if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) | ||
| 63 | # define NO_SRP | ||
| 64 | # endif | ||
| 65 | # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) | ||
| 66 | # define NO_SSL2 | ||
| 67 | # endif | ||
| 68 | # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) | ||
| 69 | # define NO_STORE | ||
| 70 | # endif | ||
| 71 | #endif | ||
| 72 | |||
| 73 | /* crypto/opensslconf.h.in */ | 2 | /* crypto/opensslconf.h.in */ |
| 74 | 3 | ||
| 75 | /* Generate 80386 code? */ | 4 | /* Generate 80386 code? */ |
diff --git a/src/lib/libcrypto/arch/vax/opensslconf.h b/src/lib/libcrypto/arch/vax/opensslconf.h index 3850f221ea..fd1cd4acf4 100644 --- a/src/lib/libcrypto/arch/vax/opensslconf.h +++ b/src/lib/libcrypto/arch/vax/opensslconf.h | |||
| @@ -1,75 +1,4 @@ | |||
| 1 | # define OPENSSL_NO_CAMELLIA | 1 | #include <opensslfeatures.h> |
| 2 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 3 | # define OPENSSL_NO_CMS | ||
| 4 | # define OPENSSL_NO_GMP | ||
| 5 | # define OPENSSL_NO_GOST | ||
| 6 | # define OPENSSL_NO_JPAKE | ||
| 7 | # define OPENSSL_NO_KRB5 | ||
| 8 | # define OPENSSL_NO_MD2 | ||
| 9 | # define OPENSSL_NO_PSK | ||
| 10 | # define OPENSSL_NO_RC5 | ||
| 11 | # define OPENSSL_NO_RFC3779 | ||
| 12 | # define OPENSSL_NO_SCTP | ||
| 13 | # define OPENSSL_NO_SEED | ||
| 14 | # define OPENSSL_NO_SRP | ||
| 15 | # define OPENSSL_NO_SSL2 | ||
| 16 | # define OPENSSL_NO_STORE | ||
| 17 | |||
| 18 | # define OPENSSL_THREADS | ||
| 19 | # define OPENSSL_NO_DYNAMIC_ENGINE | ||
| 20 | |||
| 21 | /* The OPENSSL_NO_* macros are also defined as NO_* if the application | ||
| 22 | asks for it. This is a transient feature that is provided for those | ||
| 23 | who haven't had the time to do the appropriate changes in their | ||
| 24 | applications. */ | ||
| 25 | #ifdef OPENSSL_ALGORITHM_DEFINES | ||
| 26 | # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) | ||
| 27 | # define NO_CAMELLIA | ||
| 28 | # endif | ||
| 29 | # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) | ||
| 30 | # define NO_EC_NISTP_64_GCC_128 | ||
| 31 | # endif | ||
| 32 | # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) | ||
| 33 | # define NO_CMS | ||
| 34 | # endif | ||
| 35 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | ||
| 36 | # define NO_GMP | ||
| 37 | # endif | ||
| 38 | # if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) | ||
| 39 | # define NO_GOST | ||
| 40 | # endif | ||
| 41 | # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) | ||
| 42 | # define NO_JPAKE | ||
| 43 | # endif | ||
| 44 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | ||
| 45 | # define NO_KRB5 | ||
| 46 | # endif | ||
| 47 | # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) | ||
| 48 | # define NO_MD2 | ||
| 49 | # endif | ||
| 50 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | ||
| 51 | # define NO_RC5 | ||
| 52 | # endif | ||
| 53 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | ||
| 54 | # define NO_RFC3779 | ||
| 55 | # endif | ||
| 56 | # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) | ||
| 57 | # define NO_SCTP | ||
| 58 | # endif | ||
| 59 | # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) | ||
| 60 | # define NO_SEED | ||
| 61 | # endif | ||
| 62 | # if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) | ||
| 63 | # define NO_SRP | ||
| 64 | # endif | ||
| 65 | # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) | ||
| 66 | # define NO_SSL2 | ||
| 67 | # endif | ||
| 68 | # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) | ||
| 69 | # define NO_STORE | ||
| 70 | # endif | ||
| 71 | #endif | ||
| 72 | |||
| 73 | /* crypto/opensslconf.h.in */ | 2 | /* crypto/opensslconf.h.in */ |
| 74 | 3 | ||
| 75 | /* Generate 80386 code? */ | 4 | /* Generate 80386 code? */ |
diff --git a/src/lib/libcrypto/crypto/Makefile b/src/lib/libcrypto/crypto/Makefile index 43d6366651..79fbd478b3 100644 --- a/src/lib/libcrypto/crypto/Makefile +++ b/src/lib/libcrypto/crypto/Makefile | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: Makefile,v 1.43 2014/07/09 08:44:53 miod Exp $ | 1 | # $OpenBSD: Makefile,v 1.44 2014/07/11 14:01:38 tedu Exp $ |
| 2 | 2 | ||
| 3 | LIB= crypto | 3 | LIB= crypto |
| 4 | 4 | ||
| @@ -362,6 +362,7 @@ HDRS=\ | |||
| 362 | crypto/modes/modes.h \ | 362 | crypto/modes/modes.h \ |
| 363 | crypto/objects/objects.h \ | 363 | crypto/objects/objects.h \ |
| 364 | crypto/ocsp/ocsp.h \ | 364 | crypto/ocsp/ocsp.h \ |
| 365 | crypto/opensslfeatures.h \ | ||
| 365 | crypto/opensslv.h \ | 366 | crypto/opensslv.h \ |
| 366 | crypto/ossl_typ.h \ | 367 | crypto/ossl_typ.h \ |
| 367 | crypto/pem/pem.h \ | 368 | crypto/pem/pem.h \ |
diff --git a/src/lib/libcrypto/crypto/arch/alpha/opensslconf.h b/src/lib/libcrypto/crypto/arch/alpha/opensslconf.h index b8c21226ff..1f08ea9281 100644 --- a/src/lib/libcrypto/crypto/arch/alpha/opensslconf.h +++ b/src/lib/libcrypto/crypto/arch/alpha/opensslconf.h | |||
| @@ -1,75 +1,4 @@ | |||
| 1 | # define OPENSSL_NO_CAMELLIA | 1 | #include <opensslfeatures.h> |
| 2 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 3 | # define OPENSSL_NO_CMS | ||
| 4 | # define OPENSSL_NO_GMP | ||
| 5 | # define OPENSSL_NO_GOST | ||
| 6 | # define OPENSSL_NO_JPAKE | ||
| 7 | # define OPENSSL_NO_KRB5 | ||
| 8 | # define OPENSSL_NO_MD2 | ||
| 9 | # define OPENSSL_NO_PSK | ||
| 10 | # define OPENSSL_NO_RC5 | ||
| 11 | # define OPENSSL_NO_RFC3779 | ||
| 12 | # define OPENSSL_NO_SCTP | ||
| 13 | # define OPENSSL_NO_SEED | ||
| 14 | # define OPENSSL_NO_SRP | ||
| 15 | # define OPENSSL_NO_SSL2 | ||
| 16 | # define OPENSSL_NO_STORE | ||
| 17 | |||
| 18 | # define OPENSSL_THREADS | ||
| 19 | # define OPENSSL_NO_DYNAMIC_ENGINE | ||
| 20 | |||
| 21 | /* The OPENSSL_NO_* macros are also defined as NO_* if the application | ||
| 22 | asks for it. This is a transient feature that is provided for those | ||
| 23 | who haven't had the time to do the appropriate changes in their | ||
| 24 | applications. */ | ||
| 25 | #ifdef OPENSSL_ALGORITHM_DEFINES | ||
| 26 | # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) | ||
| 27 | # define NO_CAMELLIA | ||
| 28 | # endif | ||
| 29 | # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) | ||
| 30 | # define NO_EC_NISTP_64_GCC_128 | ||
| 31 | # endif | ||
| 32 | # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) | ||
| 33 | # define NO_CMS | ||
| 34 | # endif | ||
| 35 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | ||
| 36 | # define NO_GMP | ||
| 37 | # endif | ||
| 38 | # if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) | ||
| 39 | # define NO_GOST | ||
| 40 | # endif | ||
| 41 | # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) | ||
| 42 | # define NO_JPAKE | ||
| 43 | # endif | ||
| 44 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | ||
| 45 | # define NO_KRB5 | ||
| 46 | # endif | ||
| 47 | # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) | ||
| 48 | # define NO_MD2 | ||
| 49 | # endif | ||
| 50 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | ||
| 51 | # define NO_RC5 | ||
| 52 | # endif | ||
| 53 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | ||
| 54 | # define NO_RFC3779 | ||
| 55 | # endif | ||
| 56 | # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) | ||
| 57 | # define NO_SCTP | ||
| 58 | # endif | ||
| 59 | # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) | ||
| 60 | # define NO_SEED | ||
| 61 | # endif | ||
| 62 | # if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) | ||
| 63 | # define NO_SRP | ||
| 64 | # endif | ||
| 65 | # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) | ||
| 66 | # define NO_SSL2 | ||
| 67 | # endif | ||
| 68 | # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) | ||
| 69 | # define NO_STORE | ||
| 70 | # endif | ||
| 71 | #endif | ||
| 72 | |||
| 73 | /* crypto/opensslconf.h.in */ | 2 | /* crypto/opensslconf.h.in */ |
| 74 | 3 | ||
| 75 | /* Generate 80386 code? */ | 4 | /* Generate 80386 code? */ |
diff --git a/src/lib/libcrypto/crypto/arch/amd64/opensslconf.h b/src/lib/libcrypto/crypto/arch/amd64/opensslconf.h index 74140f101f..71567226da 100644 --- a/src/lib/libcrypto/crypto/arch/amd64/opensslconf.h +++ b/src/lib/libcrypto/crypto/arch/amd64/opensslconf.h | |||
| @@ -1,75 +1,4 @@ | |||
| 1 | # define OPENSSL_NO_CAMELLIA | 1 | #include <opensslfeatures.h> |
| 2 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 3 | # define OPENSSL_NO_CMS | ||
| 4 | # define OPENSSL_NO_GMP | ||
| 5 | # define OPENSSL_NO_GOST | ||
| 6 | # define OPENSSL_NO_JPAKE | ||
| 7 | # define OPENSSL_NO_KRB5 | ||
| 8 | # define OPENSSL_NO_MD2 | ||
| 9 | # define OPENSSL_NO_PSK | ||
| 10 | # define OPENSSL_NO_RC5 | ||
| 11 | # define OPENSSL_NO_RFC3779 | ||
| 12 | # define OPENSSL_NO_SCTP | ||
| 13 | # define OPENSSL_NO_SEED | ||
| 14 | # define OPENSSL_NO_SRP | ||
| 15 | # define OPENSSL_NO_SSL2 | ||
| 16 | # define OPENSSL_NO_STORE | ||
| 17 | |||
| 18 | # define OPENSSL_THREADS | ||
| 19 | # define OPENSSL_NO_DYNAMIC_ENGINE | ||
| 20 | |||
| 21 | /* The OPENSSL_NO_* macros are also defined as NO_* if the application | ||
| 22 | asks for it. This is a transient feature that is provided for those | ||
| 23 | who haven't had the time to do the appropriate changes in their | ||
| 24 | applications. */ | ||
| 25 | #ifdef OPENSSL_ALGORITHM_DEFINES | ||
| 26 | # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) | ||
| 27 | # define NO_CAMELLIA | ||
| 28 | # endif | ||
| 29 | # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) | ||
| 30 | # define NO_EC_NISTP_64_GCC_128 | ||
| 31 | # endif | ||
| 32 | # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) | ||
| 33 | # define NO_CMS | ||
| 34 | # endif | ||
| 35 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | ||
| 36 | # define NO_GMP | ||
| 37 | # endif | ||
| 38 | # if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) | ||
| 39 | # define NO_GOST | ||
| 40 | # endif | ||
| 41 | # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) | ||
| 42 | # define NO_JPAKE | ||
| 43 | # endif | ||
| 44 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | ||
| 45 | # define NO_KRB5 | ||
| 46 | # endif | ||
| 47 | # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) | ||
| 48 | # define NO_MD2 | ||
| 49 | # endif | ||
| 50 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | ||
| 51 | # define NO_RC5 | ||
| 52 | # endif | ||
| 53 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | ||
| 54 | # define NO_RFC3779 | ||
| 55 | # endif | ||
| 56 | # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) | ||
| 57 | # define NO_SCTP | ||
| 58 | # endif | ||
| 59 | # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) | ||
| 60 | # define NO_SEED | ||
| 61 | # endif | ||
| 62 | # if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) | ||
| 63 | # define NO_SRP | ||
| 64 | # endif | ||
| 65 | # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) | ||
| 66 | # define NO_SSL2 | ||
| 67 | # endif | ||
| 68 | # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) | ||
| 69 | # define NO_STORE | ||
| 70 | # endif | ||
| 71 | #endif | ||
| 72 | |||
| 73 | /* crypto/opensslconf.h.in */ | 2 | /* crypto/opensslconf.h.in */ |
| 74 | 3 | ||
| 75 | /* Generate 80386 code? */ | 4 | /* Generate 80386 code? */ |
diff --git a/src/lib/libcrypto/crypto/arch/arm/opensslconf.h b/src/lib/libcrypto/crypto/arch/arm/opensslconf.h index 3850f221ea..fd1cd4acf4 100644 --- a/src/lib/libcrypto/crypto/arch/arm/opensslconf.h +++ b/src/lib/libcrypto/crypto/arch/arm/opensslconf.h | |||
| @@ -1,75 +1,4 @@ | |||
| 1 | # define OPENSSL_NO_CAMELLIA | 1 | #include <opensslfeatures.h> |
| 2 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 3 | # define OPENSSL_NO_CMS | ||
| 4 | # define OPENSSL_NO_GMP | ||
| 5 | # define OPENSSL_NO_GOST | ||
| 6 | # define OPENSSL_NO_JPAKE | ||
| 7 | # define OPENSSL_NO_KRB5 | ||
| 8 | # define OPENSSL_NO_MD2 | ||
| 9 | # define OPENSSL_NO_PSK | ||
| 10 | # define OPENSSL_NO_RC5 | ||
| 11 | # define OPENSSL_NO_RFC3779 | ||
| 12 | # define OPENSSL_NO_SCTP | ||
| 13 | # define OPENSSL_NO_SEED | ||
| 14 | # define OPENSSL_NO_SRP | ||
| 15 | # define OPENSSL_NO_SSL2 | ||
| 16 | # define OPENSSL_NO_STORE | ||
| 17 | |||
| 18 | # define OPENSSL_THREADS | ||
| 19 | # define OPENSSL_NO_DYNAMIC_ENGINE | ||
| 20 | |||
| 21 | /* The OPENSSL_NO_* macros are also defined as NO_* if the application | ||
| 22 | asks for it. This is a transient feature that is provided for those | ||
| 23 | who haven't had the time to do the appropriate changes in their | ||
| 24 | applications. */ | ||
| 25 | #ifdef OPENSSL_ALGORITHM_DEFINES | ||
| 26 | # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) | ||
| 27 | # define NO_CAMELLIA | ||
| 28 | # endif | ||
| 29 | # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) | ||
| 30 | # define NO_EC_NISTP_64_GCC_128 | ||
| 31 | # endif | ||
| 32 | # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) | ||
| 33 | # define NO_CMS | ||
| 34 | # endif | ||
| 35 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | ||
| 36 | # define NO_GMP | ||
| 37 | # endif | ||
| 38 | # if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) | ||
| 39 | # define NO_GOST | ||
| 40 | # endif | ||
| 41 | # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) | ||
| 42 | # define NO_JPAKE | ||
| 43 | # endif | ||
| 44 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | ||
| 45 | # define NO_KRB5 | ||
| 46 | # endif | ||
| 47 | # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) | ||
| 48 | # define NO_MD2 | ||
| 49 | # endif | ||
| 50 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | ||
| 51 | # define NO_RC5 | ||
| 52 | # endif | ||
| 53 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | ||
| 54 | # define NO_RFC3779 | ||
| 55 | # endif | ||
| 56 | # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) | ||
| 57 | # define NO_SCTP | ||
| 58 | # endif | ||
| 59 | # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) | ||
| 60 | # define NO_SEED | ||
| 61 | # endif | ||
| 62 | # if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) | ||
| 63 | # define NO_SRP | ||
| 64 | # endif | ||
| 65 | # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) | ||
| 66 | # define NO_SSL2 | ||
| 67 | # endif | ||
| 68 | # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) | ||
| 69 | # define NO_STORE | ||
| 70 | # endif | ||
| 71 | #endif | ||
| 72 | |||
| 73 | /* crypto/opensslconf.h.in */ | 2 | /* crypto/opensslconf.h.in */ |
| 74 | 3 | ||
| 75 | /* Generate 80386 code? */ | 4 | /* Generate 80386 code? */ |
diff --git a/src/lib/libcrypto/crypto/arch/hppa/opensslconf.h b/src/lib/libcrypto/crypto/arch/hppa/opensslconf.h index 3850f221ea..fd1cd4acf4 100644 --- a/src/lib/libcrypto/crypto/arch/hppa/opensslconf.h +++ b/src/lib/libcrypto/crypto/arch/hppa/opensslconf.h | |||
| @@ -1,75 +1,4 @@ | |||
| 1 | # define OPENSSL_NO_CAMELLIA | 1 | #include <opensslfeatures.h> |
| 2 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 3 | # define OPENSSL_NO_CMS | ||
| 4 | # define OPENSSL_NO_GMP | ||
| 5 | # define OPENSSL_NO_GOST | ||
| 6 | # define OPENSSL_NO_JPAKE | ||
| 7 | # define OPENSSL_NO_KRB5 | ||
| 8 | # define OPENSSL_NO_MD2 | ||
| 9 | # define OPENSSL_NO_PSK | ||
| 10 | # define OPENSSL_NO_RC5 | ||
| 11 | # define OPENSSL_NO_RFC3779 | ||
| 12 | # define OPENSSL_NO_SCTP | ||
| 13 | # define OPENSSL_NO_SEED | ||
| 14 | # define OPENSSL_NO_SRP | ||
| 15 | # define OPENSSL_NO_SSL2 | ||
| 16 | # define OPENSSL_NO_STORE | ||
| 17 | |||
| 18 | # define OPENSSL_THREADS | ||
| 19 | # define OPENSSL_NO_DYNAMIC_ENGINE | ||
| 20 | |||
| 21 | /* The OPENSSL_NO_* macros are also defined as NO_* if the application | ||
| 22 | asks for it. This is a transient feature that is provided for those | ||
| 23 | who haven't had the time to do the appropriate changes in their | ||
| 24 | applications. */ | ||
| 25 | #ifdef OPENSSL_ALGORITHM_DEFINES | ||
| 26 | # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) | ||
| 27 | # define NO_CAMELLIA | ||
| 28 | # endif | ||
| 29 | # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) | ||
| 30 | # define NO_EC_NISTP_64_GCC_128 | ||
| 31 | # endif | ||
| 32 | # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) | ||
| 33 | # define NO_CMS | ||
| 34 | # endif | ||
| 35 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | ||
| 36 | # define NO_GMP | ||
| 37 | # endif | ||
| 38 | # if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) | ||
| 39 | # define NO_GOST | ||
| 40 | # endif | ||
| 41 | # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) | ||
| 42 | # define NO_JPAKE | ||
| 43 | # endif | ||
| 44 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | ||
| 45 | # define NO_KRB5 | ||
| 46 | # endif | ||
| 47 | # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) | ||
| 48 | # define NO_MD2 | ||
| 49 | # endif | ||
| 50 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | ||
| 51 | # define NO_RC5 | ||
| 52 | # endif | ||
| 53 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | ||
| 54 | # define NO_RFC3779 | ||
| 55 | # endif | ||
| 56 | # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) | ||
| 57 | # define NO_SCTP | ||
| 58 | # endif | ||
| 59 | # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) | ||
| 60 | # define NO_SEED | ||
| 61 | # endif | ||
| 62 | # if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) | ||
| 63 | # define NO_SRP | ||
| 64 | # endif | ||
| 65 | # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) | ||
| 66 | # define NO_SSL2 | ||
| 67 | # endif | ||
| 68 | # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) | ||
| 69 | # define NO_STORE | ||
| 70 | # endif | ||
| 71 | #endif | ||
| 72 | |||
| 73 | /* crypto/opensslconf.h.in */ | 2 | /* crypto/opensslconf.h.in */ |
| 74 | 3 | ||
| 75 | /* Generate 80386 code? */ | 4 | /* Generate 80386 code? */ |
diff --git a/src/lib/libcrypto/crypto/arch/hppa64/opensslconf.h b/src/lib/libcrypto/crypto/arch/hppa64/opensslconf.h index b435027dd3..d744930e2c 100644 --- a/src/lib/libcrypto/crypto/arch/hppa64/opensslconf.h +++ b/src/lib/libcrypto/crypto/arch/hppa64/opensslconf.h | |||
| @@ -1,75 +1,4 @@ | |||
| 1 | # define OPENSSL_NO_CAMELLIA | 1 | #include <opensslfeatures.h> |
| 2 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 3 | # define OPENSSL_NO_CMS | ||
| 4 | # define OPENSSL_NO_GMP | ||
| 5 | # define OPENSSL_NO_GOST | ||
| 6 | # define OPENSSL_NO_JPAKE | ||
| 7 | # define OPENSSL_NO_KRB5 | ||
| 8 | # define OPENSSL_NO_MD2 | ||
| 9 | # define OPENSSL_NO_PSK | ||
| 10 | # define OPENSSL_NO_RC5 | ||
| 11 | # define OPENSSL_NO_RFC3779 | ||
| 12 | # define OPENSSL_NO_SCTP | ||
| 13 | # define OPENSSL_NO_SEED | ||
| 14 | # define OPENSSL_NO_SRP | ||
| 15 | # define OPENSSL_NO_SSL2 | ||
| 16 | # define OPENSSL_NO_STORE | ||
| 17 | |||
| 18 | # define OPENSSL_THREADS | ||
| 19 | # define OPENSSL_NO_DYNAMIC_ENGINE | ||
| 20 | |||
| 21 | /* The OPENSSL_NO_* macros are also defined as NO_* if the application | ||
| 22 | asks for it. This is a transient feature that is provided for those | ||
| 23 | who haven't had the time to do the appropriate changes in their | ||
| 24 | applications. */ | ||
| 25 | #ifdef OPENSSL_ALGORITHM_DEFINES | ||
| 26 | # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) | ||
| 27 | # define NO_CAMELLIA | ||
| 28 | # endif | ||
| 29 | # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) | ||
| 30 | # define NO_EC_NISTP_64_GCC_128 | ||
| 31 | # endif | ||
| 32 | # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) | ||
| 33 | # define NO_CMS | ||
| 34 | # endif | ||
| 35 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | ||
| 36 | # define NO_GMP | ||
| 37 | # endif | ||
| 38 | # if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) | ||
| 39 | # define NO_GOST | ||
| 40 | # endif | ||
| 41 | # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) | ||
| 42 | # define NO_JPAKE | ||
| 43 | # endif | ||
| 44 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | ||
| 45 | # define NO_KRB5 | ||
| 46 | # endif | ||
| 47 | # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) | ||
| 48 | # define NO_MD2 | ||
| 49 | # endif | ||
| 50 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | ||
| 51 | # define NO_RC5 | ||
| 52 | # endif | ||
| 53 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | ||
| 54 | # define NO_RFC3779 | ||
| 55 | # endif | ||
| 56 | # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) | ||
| 57 | # define NO_SCTP | ||
| 58 | # endif | ||
| 59 | # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) | ||
| 60 | # define NO_SEED | ||
| 61 | # endif | ||
| 62 | # if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) | ||
| 63 | # define NO_SRP | ||
| 64 | # endif | ||
| 65 | # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) | ||
| 66 | # define NO_SSL2 | ||
| 67 | # endif | ||
| 68 | # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) | ||
| 69 | # define NO_STORE | ||
| 70 | # endif | ||
| 71 | #endif | ||
| 72 | |||
| 73 | /* crypto/opensslconf.h.in */ | 2 | /* crypto/opensslconf.h.in */ |
| 74 | 3 | ||
| 75 | /* Generate 80386 code? */ | 4 | /* Generate 80386 code? */ |
diff --git a/src/lib/libcrypto/crypto/arch/i386/opensslconf.h b/src/lib/libcrypto/crypto/arch/i386/opensslconf.h index fa8368f906..cac7a66875 100644 --- a/src/lib/libcrypto/crypto/arch/i386/opensslconf.h +++ b/src/lib/libcrypto/crypto/arch/i386/opensslconf.h | |||
| @@ -1,75 +1,4 @@ | |||
| 1 | # define OPENSSL_NO_CAMELLIA | 1 | #include <opensslfeatures.h> |
| 2 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 3 | # define OPENSSL_NO_CMS | ||
| 4 | # define OPENSSL_NO_GMP | ||
| 5 | # define OPENSSL_NO_GOST | ||
| 6 | # define OPENSSL_NO_JPAKE | ||
| 7 | # define OPENSSL_NO_KRB5 | ||
| 8 | # define OPENSSL_NO_MD2 | ||
| 9 | # define OPENSSL_NO_PSK | ||
| 10 | # define OPENSSL_NO_RC5 | ||
| 11 | # define OPENSSL_NO_RFC3779 | ||
| 12 | # define OPENSSL_NO_SCTP | ||
| 13 | # define OPENSSL_NO_SEED | ||
| 14 | # define OPENSSL_NO_SRP | ||
| 15 | # define OPENSSL_NO_SSL2 | ||
| 16 | # define OPENSSL_NO_STORE | ||
| 17 | |||
| 18 | # define OPENSSL_THREADS | ||
| 19 | # define OPENSSL_NO_DYNAMIC_ENGINE | ||
| 20 | |||
| 21 | /* The OPENSSL_NO_* macros are also defined as NO_* if the application | ||
| 22 | asks for it. This is a transient feature that is provided for those | ||
| 23 | who haven't had the time to do the appropriate changes in their | ||
| 24 | applications. */ | ||
| 25 | #ifdef OPENSSL_ALGORITHM_DEFINES | ||
| 26 | # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) | ||
| 27 | # define NO_CAMELLIA | ||
| 28 | # endif | ||
| 29 | # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) | ||
| 30 | # define NO_EC_NISTP_64_GCC_128 | ||
| 31 | # endif | ||
| 32 | # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) | ||
| 33 | # define NO_CMS | ||
| 34 | # endif | ||
| 35 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | ||
| 36 | # define NO_GMP | ||
| 37 | # endif | ||
| 38 | # if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) | ||
| 39 | # define NO_GOST | ||
| 40 | # endif | ||
| 41 | # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) | ||
| 42 | # define NO_JPAKE | ||
| 43 | # endif | ||
| 44 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | ||
| 45 | # define NO_KRB5 | ||
| 46 | # endif | ||
| 47 | # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) | ||
| 48 | # define NO_MD2 | ||
| 49 | # endif | ||
| 50 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | ||
| 51 | # define NO_RC5 | ||
| 52 | # endif | ||
| 53 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | ||
| 54 | # define NO_RFC3779 | ||
| 55 | # endif | ||
| 56 | # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) | ||
| 57 | # define NO_SCTP | ||
| 58 | # endif | ||
| 59 | # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) | ||
| 60 | # define NO_SEED | ||
| 61 | # endif | ||
| 62 | # if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) | ||
| 63 | # define NO_SRP | ||
| 64 | # endif | ||
| 65 | # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) | ||
| 66 | # define NO_SSL2 | ||
| 67 | # endif | ||
| 68 | # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) | ||
| 69 | # define NO_STORE | ||
| 70 | # endif | ||
| 71 | #endif | ||
| 72 | |||
| 73 | /* crypto/opensslconf.h.in */ | 2 | /* crypto/opensslconf.h.in */ |
| 74 | 3 | ||
| 75 | /* Generate 80386 code? */ | 4 | /* Generate 80386 code? */ |
diff --git a/src/lib/libcrypto/crypto/arch/ia64/opensslconf.h b/src/lib/libcrypto/crypto/arch/ia64/opensslconf.h index 3b60e6346e..c44c5ab328 100644 --- a/src/lib/libcrypto/crypto/arch/ia64/opensslconf.h +++ b/src/lib/libcrypto/crypto/arch/ia64/opensslconf.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* $OpenBSD: opensslconf.h,v 1.1 2014/05/27 10:10:59 tobiasu Exp $ */ | 1 | #include <opensslfeatures.h> |
| 2 | /* $OpenBSD: opensslconf.h,v 1.2 2014/07/11 14:01:38 tedu Exp $ */ | ||
| 2 | 3 | ||
| 3 | #error "Dummy header, create a proper ia64 config" | 4 | #error "Dummy header, create a proper ia64 config" |
diff --git a/src/lib/libcrypto/crypto/arch/m88k/opensslconf.h b/src/lib/libcrypto/crypto/arch/m88k/opensslconf.h index 3850f221ea..fd1cd4acf4 100644 --- a/src/lib/libcrypto/crypto/arch/m88k/opensslconf.h +++ b/src/lib/libcrypto/crypto/arch/m88k/opensslconf.h | |||
| @@ -1,75 +1,4 @@ | |||
| 1 | # define OPENSSL_NO_CAMELLIA | 1 | #include <opensslfeatures.h> |
| 2 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 3 | # define OPENSSL_NO_CMS | ||
| 4 | # define OPENSSL_NO_GMP | ||
| 5 | # define OPENSSL_NO_GOST | ||
| 6 | # define OPENSSL_NO_JPAKE | ||
| 7 | # define OPENSSL_NO_KRB5 | ||
| 8 | # define OPENSSL_NO_MD2 | ||
| 9 | # define OPENSSL_NO_PSK | ||
| 10 | # define OPENSSL_NO_RC5 | ||
| 11 | # define OPENSSL_NO_RFC3779 | ||
| 12 | # define OPENSSL_NO_SCTP | ||
| 13 | # define OPENSSL_NO_SEED | ||
| 14 | # define OPENSSL_NO_SRP | ||
| 15 | # define OPENSSL_NO_SSL2 | ||
| 16 | # define OPENSSL_NO_STORE | ||
| 17 | |||
| 18 | # define OPENSSL_THREADS | ||
| 19 | # define OPENSSL_NO_DYNAMIC_ENGINE | ||
| 20 | |||
| 21 | /* The OPENSSL_NO_* macros are also defined as NO_* if the application | ||
| 22 | asks for it. This is a transient feature that is provided for those | ||
| 23 | who haven't had the time to do the appropriate changes in their | ||
| 24 | applications. */ | ||
| 25 | #ifdef OPENSSL_ALGORITHM_DEFINES | ||
| 26 | # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) | ||
| 27 | # define NO_CAMELLIA | ||
| 28 | # endif | ||
| 29 | # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) | ||
| 30 | # define NO_EC_NISTP_64_GCC_128 | ||
| 31 | # endif | ||
| 32 | # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) | ||
| 33 | # define NO_CMS | ||
| 34 | # endif | ||
| 35 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | ||
| 36 | # define NO_GMP | ||
| 37 | # endif | ||
| 38 | # if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) | ||
| 39 | # define NO_GOST | ||
| 40 | # endif | ||
| 41 | # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) | ||
| 42 | # define NO_JPAKE | ||
| 43 | # endif | ||
| 44 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | ||
| 45 | # define NO_KRB5 | ||
| 46 | # endif | ||
| 47 | # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) | ||
| 48 | # define NO_MD2 | ||
| 49 | # endif | ||
| 50 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | ||
| 51 | # define NO_RC5 | ||
| 52 | # endif | ||
| 53 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | ||
| 54 | # define NO_RFC3779 | ||
| 55 | # endif | ||
| 56 | # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) | ||
| 57 | # define NO_SCTP | ||
| 58 | # endif | ||
| 59 | # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) | ||
| 60 | # define NO_SEED | ||
| 61 | # endif | ||
| 62 | # if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) | ||
| 63 | # define NO_SRP | ||
| 64 | # endif | ||
| 65 | # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) | ||
| 66 | # define NO_SSL2 | ||
| 67 | # endif | ||
| 68 | # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) | ||
| 69 | # define NO_STORE | ||
| 70 | # endif | ||
| 71 | #endif | ||
| 72 | |||
| 73 | /* crypto/opensslconf.h.in */ | 2 | /* crypto/opensslconf.h.in */ |
| 74 | 3 | ||
| 75 | /* Generate 80386 code? */ | 4 | /* Generate 80386 code? */ |
diff --git a/src/lib/libcrypto/crypto/arch/mips64/opensslconf.h b/src/lib/libcrypto/crypto/arch/mips64/opensslconf.h index b1f1228418..4b8fbbc174 100644 --- a/src/lib/libcrypto/crypto/arch/mips64/opensslconf.h +++ b/src/lib/libcrypto/crypto/arch/mips64/opensslconf.h | |||
| @@ -1,75 +1,4 @@ | |||
| 1 | # define OPENSSL_NO_CAMELLIA | 1 | #include <opensslfeatures.h> |
| 2 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 3 | # define OPENSSL_NO_CMS | ||
| 4 | # define OPENSSL_NO_GMP | ||
| 5 | # define OPENSSL_NO_GOST | ||
| 6 | # define OPENSSL_NO_JPAKE | ||
| 7 | # define OPENSSL_NO_KRB5 | ||
| 8 | # define OPENSSL_NO_MD2 | ||
| 9 | # define OPENSSL_NO_PSK | ||
| 10 | # define OPENSSL_NO_RC5 | ||
| 11 | # define OPENSSL_NO_RFC3779 | ||
| 12 | # define OPENSSL_NO_SCTP | ||
| 13 | # define OPENSSL_NO_SEED | ||
| 14 | # define OPENSSL_NO_SRP | ||
| 15 | # define OPENSSL_NO_SSL2 | ||
| 16 | # define OPENSSL_NO_STORE | ||
| 17 | |||
| 18 | # define OPENSSL_THREADS | ||
| 19 | # define OPENSSL_NO_DYNAMIC_ENGINE | ||
| 20 | |||
| 21 | /* The OPENSSL_NO_* macros are also defined as NO_* if the application | ||
| 22 | asks for it. This is a transient feature that is provided for those | ||
| 23 | who haven't had the time to do the appropriate changes in their | ||
| 24 | applications. */ | ||
| 25 | #ifdef OPENSSL_ALGORITHM_DEFINES | ||
| 26 | # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) | ||
| 27 | # define NO_CAMELLIA | ||
| 28 | # endif | ||
| 29 | # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) | ||
| 30 | # define NO_EC_NISTP_64_GCC_128 | ||
| 31 | # endif | ||
| 32 | # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) | ||
| 33 | # define NO_CMS | ||
| 34 | # endif | ||
| 35 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | ||
| 36 | # define NO_GMP | ||
| 37 | # endif | ||
| 38 | # if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) | ||
| 39 | # define NO_GOST | ||
| 40 | # endif | ||
| 41 | # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) | ||
| 42 | # define NO_JPAKE | ||
| 43 | # endif | ||
| 44 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | ||
| 45 | # define NO_KRB5 | ||
| 46 | # endif | ||
| 47 | # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) | ||
| 48 | # define NO_MD2 | ||
| 49 | # endif | ||
| 50 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | ||
| 51 | # define NO_RC5 | ||
| 52 | # endif | ||
| 53 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | ||
| 54 | # define NO_RFC3779 | ||
| 55 | # endif | ||
| 56 | # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) | ||
| 57 | # define NO_SCTP | ||
| 58 | # endif | ||
| 59 | # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) | ||
| 60 | # define NO_SEED | ||
| 61 | # endif | ||
| 62 | # if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) | ||
| 63 | # define NO_SRP | ||
| 64 | # endif | ||
| 65 | # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) | ||
| 66 | # define NO_SSL2 | ||
| 67 | # endif | ||
| 68 | # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) | ||
| 69 | # define NO_STORE | ||
| 70 | # endif | ||
| 71 | #endif | ||
| 72 | |||
| 73 | /* crypto/opensslconf.h.in */ | 2 | /* crypto/opensslconf.h.in */ |
| 74 | 3 | ||
| 75 | /* Generate 80386 code? */ | 4 | /* Generate 80386 code? */ |
diff --git a/src/lib/libcrypto/crypto/arch/powerpc/opensslconf.h b/src/lib/libcrypto/crypto/arch/powerpc/opensslconf.h index 3850f221ea..fd1cd4acf4 100644 --- a/src/lib/libcrypto/crypto/arch/powerpc/opensslconf.h +++ b/src/lib/libcrypto/crypto/arch/powerpc/opensslconf.h | |||
| @@ -1,75 +1,4 @@ | |||
| 1 | # define OPENSSL_NO_CAMELLIA | 1 | #include <opensslfeatures.h> |
| 2 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 3 | # define OPENSSL_NO_CMS | ||
| 4 | # define OPENSSL_NO_GMP | ||
| 5 | # define OPENSSL_NO_GOST | ||
| 6 | # define OPENSSL_NO_JPAKE | ||
| 7 | # define OPENSSL_NO_KRB5 | ||
| 8 | # define OPENSSL_NO_MD2 | ||
| 9 | # define OPENSSL_NO_PSK | ||
| 10 | # define OPENSSL_NO_RC5 | ||
| 11 | # define OPENSSL_NO_RFC3779 | ||
| 12 | # define OPENSSL_NO_SCTP | ||
| 13 | # define OPENSSL_NO_SEED | ||
| 14 | # define OPENSSL_NO_SRP | ||
| 15 | # define OPENSSL_NO_SSL2 | ||
| 16 | # define OPENSSL_NO_STORE | ||
| 17 | |||
| 18 | # define OPENSSL_THREADS | ||
| 19 | # define OPENSSL_NO_DYNAMIC_ENGINE | ||
| 20 | |||
| 21 | /* The OPENSSL_NO_* macros are also defined as NO_* if the application | ||
| 22 | asks for it. This is a transient feature that is provided for those | ||
| 23 | who haven't had the time to do the appropriate changes in their | ||
| 24 | applications. */ | ||
| 25 | #ifdef OPENSSL_ALGORITHM_DEFINES | ||
| 26 | # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) | ||
| 27 | # define NO_CAMELLIA | ||
| 28 | # endif | ||
| 29 | # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) | ||
| 30 | # define NO_EC_NISTP_64_GCC_128 | ||
| 31 | # endif | ||
| 32 | # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) | ||
| 33 | # define NO_CMS | ||
| 34 | # endif | ||
| 35 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | ||
| 36 | # define NO_GMP | ||
| 37 | # endif | ||
| 38 | # if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) | ||
| 39 | # define NO_GOST | ||
| 40 | # endif | ||
| 41 | # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) | ||
| 42 | # define NO_JPAKE | ||
| 43 | # endif | ||
| 44 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | ||
| 45 | # define NO_KRB5 | ||
| 46 | # endif | ||
| 47 | # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) | ||
| 48 | # define NO_MD2 | ||
| 49 | # endif | ||
| 50 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | ||
| 51 | # define NO_RC5 | ||
| 52 | # endif | ||
| 53 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | ||
| 54 | # define NO_RFC3779 | ||
| 55 | # endif | ||
| 56 | # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) | ||
| 57 | # define NO_SCTP | ||
| 58 | # endif | ||
| 59 | # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) | ||
| 60 | # define NO_SEED | ||
| 61 | # endif | ||
| 62 | # if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) | ||
| 63 | # define NO_SRP | ||
| 64 | # endif | ||
| 65 | # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) | ||
| 66 | # define NO_SSL2 | ||
| 67 | # endif | ||
| 68 | # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) | ||
| 69 | # define NO_STORE | ||
| 70 | # endif | ||
| 71 | #endif | ||
| 72 | |||
| 73 | /* crypto/opensslconf.h.in */ | 2 | /* crypto/opensslconf.h.in */ |
| 74 | 3 | ||
| 75 | /* Generate 80386 code? */ | 4 | /* Generate 80386 code? */ |
diff --git a/src/lib/libcrypto/crypto/arch/sh/opensslconf.h b/src/lib/libcrypto/crypto/arch/sh/opensslconf.h index 3850f221ea..fd1cd4acf4 100644 --- a/src/lib/libcrypto/crypto/arch/sh/opensslconf.h +++ b/src/lib/libcrypto/crypto/arch/sh/opensslconf.h | |||
| @@ -1,75 +1,4 @@ | |||
| 1 | # define OPENSSL_NO_CAMELLIA | 1 | #include <opensslfeatures.h> |
| 2 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 3 | # define OPENSSL_NO_CMS | ||
| 4 | # define OPENSSL_NO_GMP | ||
| 5 | # define OPENSSL_NO_GOST | ||
| 6 | # define OPENSSL_NO_JPAKE | ||
| 7 | # define OPENSSL_NO_KRB5 | ||
| 8 | # define OPENSSL_NO_MD2 | ||
| 9 | # define OPENSSL_NO_PSK | ||
| 10 | # define OPENSSL_NO_RC5 | ||
| 11 | # define OPENSSL_NO_RFC3779 | ||
| 12 | # define OPENSSL_NO_SCTP | ||
| 13 | # define OPENSSL_NO_SEED | ||
| 14 | # define OPENSSL_NO_SRP | ||
| 15 | # define OPENSSL_NO_SSL2 | ||
| 16 | # define OPENSSL_NO_STORE | ||
| 17 | |||
| 18 | # define OPENSSL_THREADS | ||
| 19 | # define OPENSSL_NO_DYNAMIC_ENGINE | ||
| 20 | |||
| 21 | /* The OPENSSL_NO_* macros are also defined as NO_* if the application | ||
| 22 | asks for it. This is a transient feature that is provided for those | ||
| 23 | who haven't had the time to do the appropriate changes in their | ||
| 24 | applications. */ | ||
| 25 | #ifdef OPENSSL_ALGORITHM_DEFINES | ||
| 26 | # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) | ||
| 27 | # define NO_CAMELLIA | ||
| 28 | # endif | ||
| 29 | # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) | ||
| 30 | # define NO_EC_NISTP_64_GCC_128 | ||
| 31 | # endif | ||
| 32 | # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) | ||
| 33 | # define NO_CMS | ||
| 34 | # endif | ||
| 35 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | ||
| 36 | # define NO_GMP | ||
| 37 | # endif | ||
| 38 | # if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) | ||
| 39 | # define NO_GOST | ||
| 40 | # endif | ||
| 41 | # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) | ||
| 42 | # define NO_JPAKE | ||
| 43 | # endif | ||
| 44 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | ||
| 45 | # define NO_KRB5 | ||
| 46 | # endif | ||
| 47 | # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) | ||
| 48 | # define NO_MD2 | ||
| 49 | # endif | ||
| 50 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | ||
| 51 | # define NO_RC5 | ||
| 52 | # endif | ||
| 53 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | ||
| 54 | # define NO_RFC3779 | ||
| 55 | # endif | ||
| 56 | # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) | ||
| 57 | # define NO_SCTP | ||
| 58 | # endif | ||
| 59 | # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) | ||
| 60 | # define NO_SEED | ||
| 61 | # endif | ||
| 62 | # if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) | ||
| 63 | # define NO_SRP | ||
| 64 | # endif | ||
| 65 | # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) | ||
| 66 | # define NO_SSL2 | ||
| 67 | # endif | ||
| 68 | # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) | ||
| 69 | # define NO_STORE | ||
| 70 | # endif | ||
| 71 | #endif | ||
| 72 | |||
| 73 | /* crypto/opensslconf.h.in */ | 2 | /* crypto/opensslconf.h.in */ |
| 74 | 3 | ||
| 75 | /* Generate 80386 code? */ | 4 | /* Generate 80386 code? */ |
diff --git a/src/lib/libcrypto/crypto/arch/sparc/opensslconf.h b/src/lib/libcrypto/crypto/arch/sparc/opensslconf.h index 3850f221ea..fd1cd4acf4 100644 --- a/src/lib/libcrypto/crypto/arch/sparc/opensslconf.h +++ b/src/lib/libcrypto/crypto/arch/sparc/opensslconf.h | |||
| @@ -1,75 +1,4 @@ | |||
| 1 | # define OPENSSL_NO_CAMELLIA | 1 | #include <opensslfeatures.h> |
| 2 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 3 | # define OPENSSL_NO_CMS | ||
| 4 | # define OPENSSL_NO_GMP | ||
| 5 | # define OPENSSL_NO_GOST | ||
| 6 | # define OPENSSL_NO_JPAKE | ||
| 7 | # define OPENSSL_NO_KRB5 | ||
| 8 | # define OPENSSL_NO_MD2 | ||
| 9 | # define OPENSSL_NO_PSK | ||
| 10 | # define OPENSSL_NO_RC5 | ||
| 11 | # define OPENSSL_NO_RFC3779 | ||
| 12 | # define OPENSSL_NO_SCTP | ||
| 13 | # define OPENSSL_NO_SEED | ||
| 14 | # define OPENSSL_NO_SRP | ||
| 15 | # define OPENSSL_NO_SSL2 | ||
| 16 | # define OPENSSL_NO_STORE | ||
| 17 | |||
| 18 | # define OPENSSL_THREADS | ||
| 19 | # define OPENSSL_NO_DYNAMIC_ENGINE | ||
| 20 | |||
| 21 | /* The OPENSSL_NO_* macros are also defined as NO_* if the application | ||
| 22 | asks for it. This is a transient feature that is provided for those | ||
| 23 | who haven't had the time to do the appropriate changes in their | ||
| 24 | applications. */ | ||
| 25 | #ifdef OPENSSL_ALGORITHM_DEFINES | ||
| 26 | # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) | ||
| 27 | # define NO_CAMELLIA | ||
| 28 | # endif | ||
| 29 | # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) | ||
| 30 | # define NO_EC_NISTP_64_GCC_128 | ||
| 31 | # endif | ||
| 32 | # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) | ||
| 33 | # define NO_CMS | ||
| 34 | # endif | ||
| 35 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | ||
| 36 | # define NO_GMP | ||
| 37 | # endif | ||
| 38 | # if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) | ||
| 39 | # define NO_GOST | ||
| 40 | # endif | ||
| 41 | # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) | ||
| 42 | # define NO_JPAKE | ||
| 43 | # endif | ||
| 44 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | ||
| 45 | # define NO_KRB5 | ||
| 46 | # endif | ||
| 47 | # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) | ||
| 48 | # define NO_MD2 | ||
| 49 | # endif | ||
| 50 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | ||
| 51 | # define NO_RC5 | ||
| 52 | # endif | ||
| 53 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | ||
| 54 | # define NO_RFC3779 | ||
| 55 | # endif | ||
| 56 | # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) | ||
| 57 | # define NO_SCTP | ||
| 58 | # endif | ||
| 59 | # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) | ||
| 60 | # define NO_SEED | ||
| 61 | # endif | ||
| 62 | # if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) | ||
| 63 | # define NO_SRP | ||
| 64 | # endif | ||
| 65 | # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) | ||
| 66 | # define NO_SSL2 | ||
| 67 | # endif | ||
| 68 | # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) | ||
| 69 | # define NO_STORE | ||
| 70 | # endif | ||
| 71 | #endif | ||
| 72 | |||
| 73 | /* crypto/opensslconf.h.in */ | 2 | /* crypto/opensslconf.h.in */ |
| 74 | 3 | ||
| 75 | /* Generate 80386 code? */ | 4 | /* Generate 80386 code? */ |
diff --git a/src/lib/libcrypto/crypto/arch/sparc64/opensslconf.h b/src/lib/libcrypto/crypto/arch/sparc64/opensslconf.h index b1f1228418..4b8fbbc174 100644 --- a/src/lib/libcrypto/crypto/arch/sparc64/opensslconf.h +++ b/src/lib/libcrypto/crypto/arch/sparc64/opensslconf.h | |||
| @@ -1,75 +1,4 @@ | |||
| 1 | # define OPENSSL_NO_CAMELLIA | 1 | #include <opensslfeatures.h> |
| 2 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 3 | # define OPENSSL_NO_CMS | ||
| 4 | # define OPENSSL_NO_GMP | ||
| 5 | # define OPENSSL_NO_GOST | ||
| 6 | # define OPENSSL_NO_JPAKE | ||
| 7 | # define OPENSSL_NO_KRB5 | ||
| 8 | # define OPENSSL_NO_MD2 | ||
| 9 | # define OPENSSL_NO_PSK | ||
| 10 | # define OPENSSL_NO_RC5 | ||
| 11 | # define OPENSSL_NO_RFC3779 | ||
| 12 | # define OPENSSL_NO_SCTP | ||
| 13 | # define OPENSSL_NO_SEED | ||
| 14 | # define OPENSSL_NO_SRP | ||
| 15 | # define OPENSSL_NO_SSL2 | ||
| 16 | # define OPENSSL_NO_STORE | ||
| 17 | |||
| 18 | # define OPENSSL_THREADS | ||
| 19 | # define OPENSSL_NO_DYNAMIC_ENGINE | ||
| 20 | |||
| 21 | /* The OPENSSL_NO_* macros are also defined as NO_* if the application | ||
| 22 | asks for it. This is a transient feature that is provided for those | ||
| 23 | who haven't had the time to do the appropriate changes in their | ||
| 24 | applications. */ | ||
| 25 | #ifdef OPENSSL_ALGORITHM_DEFINES | ||
| 26 | # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) | ||
| 27 | # define NO_CAMELLIA | ||
| 28 | # endif | ||
| 29 | # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) | ||
| 30 | # define NO_EC_NISTP_64_GCC_128 | ||
| 31 | # endif | ||
| 32 | # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) | ||
| 33 | # define NO_CMS | ||
| 34 | # endif | ||
| 35 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | ||
| 36 | # define NO_GMP | ||
| 37 | # endif | ||
| 38 | # if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) | ||
| 39 | # define NO_GOST | ||
| 40 | # endif | ||
| 41 | # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) | ||
| 42 | # define NO_JPAKE | ||
| 43 | # endif | ||
| 44 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | ||
| 45 | # define NO_KRB5 | ||
| 46 | # endif | ||
| 47 | # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) | ||
| 48 | # define NO_MD2 | ||
| 49 | # endif | ||
| 50 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | ||
| 51 | # define NO_RC5 | ||
| 52 | # endif | ||
| 53 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | ||
| 54 | # define NO_RFC3779 | ||
| 55 | # endif | ||
| 56 | # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) | ||
| 57 | # define NO_SCTP | ||
| 58 | # endif | ||
| 59 | # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) | ||
| 60 | # define NO_SEED | ||
| 61 | # endif | ||
| 62 | # if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) | ||
| 63 | # define NO_SRP | ||
| 64 | # endif | ||
| 65 | # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) | ||
| 66 | # define NO_SSL2 | ||
| 67 | # endif | ||
| 68 | # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) | ||
| 69 | # define NO_STORE | ||
| 70 | # endif | ||
| 71 | #endif | ||
| 72 | |||
| 73 | /* crypto/opensslconf.h.in */ | 2 | /* crypto/opensslconf.h.in */ |
| 74 | 3 | ||
| 75 | /* Generate 80386 code? */ | 4 | /* Generate 80386 code? */ |
diff --git a/src/lib/libcrypto/crypto/arch/vax/opensslconf.h b/src/lib/libcrypto/crypto/arch/vax/opensslconf.h index 3850f221ea..fd1cd4acf4 100644 --- a/src/lib/libcrypto/crypto/arch/vax/opensslconf.h +++ b/src/lib/libcrypto/crypto/arch/vax/opensslconf.h | |||
| @@ -1,75 +1,4 @@ | |||
| 1 | # define OPENSSL_NO_CAMELLIA | 1 | #include <opensslfeatures.h> |
| 2 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 3 | # define OPENSSL_NO_CMS | ||
| 4 | # define OPENSSL_NO_GMP | ||
| 5 | # define OPENSSL_NO_GOST | ||
| 6 | # define OPENSSL_NO_JPAKE | ||
| 7 | # define OPENSSL_NO_KRB5 | ||
| 8 | # define OPENSSL_NO_MD2 | ||
| 9 | # define OPENSSL_NO_PSK | ||
| 10 | # define OPENSSL_NO_RC5 | ||
| 11 | # define OPENSSL_NO_RFC3779 | ||
| 12 | # define OPENSSL_NO_SCTP | ||
| 13 | # define OPENSSL_NO_SEED | ||
| 14 | # define OPENSSL_NO_SRP | ||
| 15 | # define OPENSSL_NO_SSL2 | ||
| 16 | # define OPENSSL_NO_STORE | ||
| 17 | |||
| 18 | # define OPENSSL_THREADS | ||
| 19 | # define OPENSSL_NO_DYNAMIC_ENGINE | ||
| 20 | |||
| 21 | /* The OPENSSL_NO_* macros are also defined as NO_* if the application | ||
| 22 | asks for it. This is a transient feature that is provided for those | ||
| 23 | who haven't had the time to do the appropriate changes in their | ||
| 24 | applications. */ | ||
| 25 | #ifdef OPENSSL_ALGORITHM_DEFINES | ||
| 26 | # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) | ||
| 27 | # define NO_CAMELLIA | ||
| 28 | # endif | ||
| 29 | # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) | ||
| 30 | # define NO_EC_NISTP_64_GCC_128 | ||
| 31 | # endif | ||
| 32 | # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) | ||
| 33 | # define NO_CMS | ||
| 34 | # endif | ||
| 35 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | ||
| 36 | # define NO_GMP | ||
| 37 | # endif | ||
| 38 | # if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) | ||
| 39 | # define NO_GOST | ||
| 40 | # endif | ||
| 41 | # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) | ||
| 42 | # define NO_JPAKE | ||
| 43 | # endif | ||
| 44 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | ||
| 45 | # define NO_KRB5 | ||
| 46 | # endif | ||
| 47 | # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) | ||
| 48 | # define NO_MD2 | ||
| 49 | # endif | ||
| 50 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | ||
| 51 | # define NO_RC5 | ||
| 52 | # endif | ||
| 53 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | ||
| 54 | # define NO_RFC3779 | ||
| 55 | # endif | ||
| 56 | # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) | ||
| 57 | # define NO_SCTP | ||
| 58 | # endif | ||
| 59 | # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) | ||
| 60 | # define NO_SEED | ||
| 61 | # endif | ||
| 62 | # if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) | ||
| 63 | # define NO_SRP | ||
| 64 | # endif | ||
| 65 | # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) | ||
| 66 | # define NO_SSL2 | ||
| 67 | # endif | ||
| 68 | # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) | ||
| 69 | # define NO_STORE | ||
| 70 | # endif | ||
| 71 | #endif | ||
| 72 | |||
| 73 | /* crypto/opensslconf.h.in */ | 2 | /* crypto/opensslconf.h.in */ |
| 74 | 3 | ||
| 75 | /* Generate 80386 code? */ | 4 | /* Generate 80386 code? */ |
diff --git a/src/lib/libcrypto/opensslfeatures.h b/src/lib/libcrypto/opensslfeatures.h new file mode 100644 index 0000000000..badf45ace2 --- /dev/null +++ b/src/lib/libcrypto/opensslfeatures.h | |||
| @@ -0,0 +1,72 @@ | |||
| 1 | # define OPENSSL_NO_CAMELLIA | ||
| 2 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 3 | # define OPENSSL_NO_CMS | ||
| 4 | # define OPENSSL_NO_GMP | ||
| 5 | # define OPENSSL_NO_GOST | ||
| 6 | # define OPENSSL_NO_JPAKE | ||
| 7 | # define OPENSSL_NO_KRB5 | ||
| 8 | # define OPENSSL_NO_MD2 | ||
| 9 | # define OPENSSL_NO_PSK | ||
| 10 | # define OPENSSL_NO_RC5 | ||
| 11 | # define OPENSSL_NO_RFC3779 | ||
| 12 | # define OPENSSL_NO_SCTP | ||
| 13 | # define OPENSSL_NO_SEED | ||
| 14 | # define OPENSSL_NO_SRP | ||
| 15 | # define OPENSSL_NO_SSL2 | ||
| 16 | # define OPENSSL_NO_STORE | ||
| 17 | |||
| 18 | # define OPENSSL_THREADS | ||
| 19 | # define OPENSSL_NO_DYNAMIC_ENGINE | ||
| 20 | |||
| 21 | /* The OPENSSL_NO_* macros are also defined as NO_* if the application | ||
| 22 | asks for it. This is a transient feature that is provided for those | ||
| 23 | who haven't had the time to do the appropriate changes in their | ||
| 24 | applications. */ | ||
| 25 | #ifdef OPENSSL_ALGORITHM_DEFINES | ||
| 26 | # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) | ||
| 27 | # define NO_CAMELLIA | ||
| 28 | # endif | ||
| 29 | # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) | ||
| 30 | # define NO_EC_NISTP_64_GCC_128 | ||
| 31 | # endif | ||
| 32 | # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) | ||
| 33 | # define NO_CMS | ||
| 34 | # endif | ||
| 35 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | ||
| 36 | # define NO_GMP | ||
| 37 | # endif | ||
| 38 | # if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) | ||
| 39 | # define NO_GOST | ||
| 40 | # endif | ||
| 41 | # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) | ||
| 42 | # define NO_JPAKE | ||
| 43 | # endif | ||
| 44 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | ||
| 45 | # define NO_KRB5 | ||
| 46 | # endif | ||
| 47 | # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) | ||
| 48 | # define NO_MD2 | ||
| 49 | # endif | ||
| 50 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | ||
| 51 | # define NO_RC5 | ||
| 52 | # endif | ||
| 53 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | ||
| 54 | # define NO_RFC3779 | ||
| 55 | # endif | ||
| 56 | # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) | ||
| 57 | # define NO_SCTP | ||
| 58 | # endif | ||
| 59 | # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) | ||
| 60 | # define NO_SEED | ||
| 61 | # endif | ||
| 62 | # if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) | ||
| 63 | # define NO_SRP | ||
| 64 | # endif | ||
| 65 | # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) | ||
| 66 | # define NO_SSL2 | ||
| 67 | # endif | ||
| 68 | # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) | ||
| 69 | # define NO_STORE | ||
| 70 | # endif | ||
| 71 | #endif | ||
| 72 | |||
diff --git a/src/lib/libssl/src/crypto/opensslfeatures.h b/src/lib/libssl/src/crypto/opensslfeatures.h new file mode 100644 index 0000000000..badf45ace2 --- /dev/null +++ b/src/lib/libssl/src/crypto/opensslfeatures.h | |||
| @@ -0,0 +1,72 @@ | |||
| 1 | # define OPENSSL_NO_CAMELLIA | ||
| 2 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 3 | # define OPENSSL_NO_CMS | ||
| 4 | # define OPENSSL_NO_GMP | ||
| 5 | # define OPENSSL_NO_GOST | ||
| 6 | # define OPENSSL_NO_JPAKE | ||
| 7 | # define OPENSSL_NO_KRB5 | ||
| 8 | # define OPENSSL_NO_MD2 | ||
| 9 | # define OPENSSL_NO_PSK | ||
| 10 | # define OPENSSL_NO_RC5 | ||
| 11 | # define OPENSSL_NO_RFC3779 | ||
| 12 | # define OPENSSL_NO_SCTP | ||
| 13 | # define OPENSSL_NO_SEED | ||
| 14 | # define OPENSSL_NO_SRP | ||
| 15 | # define OPENSSL_NO_SSL2 | ||
| 16 | # define OPENSSL_NO_STORE | ||
| 17 | |||
| 18 | # define OPENSSL_THREADS | ||
| 19 | # define OPENSSL_NO_DYNAMIC_ENGINE | ||
| 20 | |||
| 21 | /* The OPENSSL_NO_* macros are also defined as NO_* if the application | ||
| 22 | asks for it. This is a transient feature that is provided for those | ||
| 23 | who haven't had the time to do the appropriate changes in their | ||
| 24 | applications. */ | ||
| 25 | #ifdef OPENSSL_ALGORITHM_DEFINES | ||
| 26 | # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) | ||
| 27 | # define NO_CAMELLIA | ||
| 28 | # endif | ||
| 29 | # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) | ||
| 30 | # define NO_EC_NISTP_64_GCC_128 | ||
| 31 | # endif | ||
| 32 | # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) | ||
| 33 | # define NO_CMS | ||
| 34 | # endif | ||
| 35 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | ||
| 36 | # define NO_GMP | ||
| 37 | # endif | ||
| 38 | # if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) | ||
| 39 | # define NO_GOST | ||
| 40 | # endif | ||
| 41 | # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) | ||
| 42 | # define NO_JPAKE | ||
| 43 | # endif | ||
| 44 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | ||
| 45 | # define NO_KRB5 | ||
| 46 | # endif | ||
| 47 | # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) | ||
| 48 | # define NO_MD2 | ||
| 49 | # endif | ||
| 50 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | ||
| 51 | # define NO_RC5 | ||
| 52 | # endif | ||
| 53 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | ||
| 54 | # define NO_RFC3779 | ||
| 55 | # endif | ||
| 56 | # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) | ||
| 57 | # define NO_SCTP | ||
| 58 | # endif | ||
| 59 | # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) | ||
| 60 | # define NO_SEED | ||
| 61 | # endif | ||
| 62 | # if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) | ||
| 63 | # define NO_SRP | ||
| 64 | # endif | ||
| 65 | # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) | ||
| 66 | # define NO_SSL2 | ||
| 67 | # endif | ||
| 68 | # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) | ||
| 69 | # define NO_STORE | ||
| 70 | # endif | ||
| 71 | #endif | ||
| 72 | |||