diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/opensslconf.h | 54 | ||||
| -rw-r--r-- | src/lib/libcrypto/opensslconf.h.in | 20 |
2 files changed, 8 insertions, 66 deletions
diff --git a/src/lib/libcrypto/opensslconf.h b/src/lib/libcrypto/opensslconf.h index 60505327d3..c21b3913f0 100644 --- a/src/lib/libcrypto/opensslconf.h +++ b/src/lib/libcrypto/opensslconf.h | |||
| @@ -5,15 +5,6 @@ | |||
| 5 | #ifndef OPENSSL_DOING_MAKEDEPEND | 5 | #ifndef OPENSSL_DOING_MAKEDEPEND |
| 6 | 6 | ||
| 7 | 7 | ||
| 8 | #ifndef OPENSSL_NO_CAMELLIA | ||
| 9 | # define OPENSSL_NO_CAMELLIA | ||
| 10 | #endif | ||
| 11 | #ifndef OPENSSL_NO_CAPIENG | ||
| 12 | # define OPENSSL_NO_CAPIENG | ||
| 13 | #endif | ||
| 14 | #ifndef OPENSSL_NO_CMS | ||
| 15 | # define OPENSSL_NO_CMS | ||
| 16 | #endif | ||
| 17 | #ifndef OPENSSL_NO_GMP | 8 | #ifndef OPENSSL_NO_GMP |
| 18 | # define OPENSSL_NO_GMP | 9 | # define OPENSSL_NO_GMP |
| 19 | #endif | 10 | #endif |
| @@ -23,8 +14,8 @@ | |||
| 23 | #ifndef OPENSSL_NO_KRB5 | 14 | #ifndef OPENSSL_NO_KRB5 |
| 24 | # define OPENSSL_NO_KRB5 | 15 | # define OPENSSL_NO_KRB5 |
| 25 | #endif | 16 | #endif |
| 26 | #ifndef OPENSSL_NO_MDC2 | 17 | #ifndef OPENSSL_NO_MD2 |
| 27 | # define OPENSSL_NO_MDC2 | 18 | # define OPENSSL_NO_MD2 |
| 28 | #endif | 19 | #endif |
| 29 | #ifndef OPENSSL_NO_RC5 | 20 | #ifndef OPENSSL_NO_RC5 |
| 30 | # define OPENSSL_NO_RC5 | 21 | # define OPENSSL_NO_RC5 |
| @@ -32,8 +23,8 @@ | |||
| 32 | #ifndef OPENSSL_NO_RFC3779 | 23 | #ifndef OPENSSL_NO_RFC3779 |
| 33 | # define OPENSSL_NO_RFC3779 | 24 | # define OPENSSL_NO_RFC3779 |
| 34 | #endif | 25 | #endif |
| 35 | #ifndef OPENSSL_NO_SEED | 26 | #ifndef OPENSSL_NO_STORE |
| 36 | # define OPENSSL_NO_SEED | 27 | # define OPENSSL_NO_STORE |
| 37 | #endif | 28 | #endif |
| 38 | 29 | ||
| 39 | #endif /* OPENSSL_DOING_MAKEDEPEND */ | 30 | #endif /* OPENSSL_DOING_MAKEDEPEND */ |
| @@ -47,15 +38,6 @@ | |||
| 47 | who haven't had the time to do the appropriate changes in their | 38 | who haven't had the time to do the appropriate changes in their |
| 48 | applications. */ | 39 | applications. */ |
| 49 | #ifdef OPENSSL_ALGORITHM_DEFINES | 40 | #ifdef OPENSSL_ALGORITHM_DEFINES |
| 50 | # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) | ||
| 51 | # define NO_CAMELLIA | ||
| 52 | # endif | ||
| 53 | # if defined(OPENSSL_NO_CAPIENG) && !defined(NO_CAPIENG) | ||
| 54 | # define NO_CAPIENG | ||
| 55 | # endif | ||
| 56 | # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) | ||
| 57 | # define NO_CMS | ||
| 58 | # endif | ||
| 59 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | 41 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) |
| 60 | # define NO_GMP | 42 | # define NO_GMP |
| 61 | # endif | 43 | # endif |
| @@ -65,8 +47,8 @@ | |||
| 65 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | 47 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) |
| 66 | # define NO_KRB5 | 48 | # define NO_KRB5 |
| 67 | # endif | 49 | # endif |
| 68 | # if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) | 50 | # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) |
| 69 | # define NO_MDC2 | 51 | # define NO_MD2 |
| 70 | # endif | 52 | # endif |
| 71 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | 53 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) |
| 72 | # define NO_RC5 | 54 | # define NO_RC5 |
| @@ -74,28 +56,13 @@ | |||
| 74 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | 56 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) |
| 75 | # define NO_RFC3779 | 57 | # define NO_RFC3779 |
| 76 | # endif | 58 | # endif |
| 77 | # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) | 59 | # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) |
| 78 | # define NO_SEED | 60 | # define NO_STORE |
| 79 | # endif | 61 | # endif |
| 80 | #endif | 62 | #endif |
| 81 | 63 | ||
| 82 | /* crypto/opensslconf.h.in */ | 64 | /* crypto/opensslconf.h.in */ |
| 83 | 65 | ||
| 84 | #ifdef OPENSSL_DOING_MAKEDEPEND | ||
| 85 | |||
| 86 | /* Include any symbols here that have to be explicitly set to enable a feature | ||
| 87 | * that should be visible to makedepend. | ||
| 88 | * | ||
| 89 | * [Our "make depend" doesn't actually look at this, we use actual build settings | ||
| 90 | * instead; we want to make it easy to remove subdirectories with disabled algorithms.] | ||
| 91 | */ | ||
| 92 | |||
| 93 | #ifndef OPENSSL_FIPS | ||
| 94 | #define OPENSSL_FIPS | ||
| 95 | #endif | ||
| 96 | |||
| 97 | #endif | ||
| 98 | |||
| 99 | /* Generate 80386 code? */ | 66 | /* Generate 80386 code? */ |
| 100 | #undef I386_ONLY | 67 | #undef I386_ONLY |
| 101 | 68 | ||
| @@ -159,14 +126,9 @@ | |||
| 159 | /* Should we define BN_DIV2W here? */ | 126 | /* Should we define BN_DIV2W here? */ |
| 160 | 127 | ||
| 161 | /* Only one for the following should be defined */ | 128 | /* Only one for the following should be defined */ |
| 162 | /* The prime number generation stuff may not work when | ||
| 163 | * EIGHT_BIT but I don't care since I've only used this mode | ||
| 164 | * for debuging the bignum libraries */ | ||
| 165 | #undef SIXTY_FOUR_BIT_LONG | 129 | #undef SIXTY_FOUR_BIT_LONG |
| 166 | #undef SIXTY_FOUR_BIT | 130 | #undef SIXTY_FOUR_BIT |
| 167 | #define THIRTY_TWO_BIT | 131 | #define THIRTY_TWO_BIT |
| 168 | #undef SIXTEEN_BIT | ||
| 169 | #undef EIGHT_BIT | ||
| 170 | #endif | 132 | #endif |
| 171 | 133 | ||
| 172 | #if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H) | 134 | #if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H) |
diff --git a/src/lib/libcrypto/opensslconf.h.in b/src/lib/libcrypto/opensslconf.h.in index 1c77f03c3d..97e3745563 100644 --- a/src/lib/libcrypto/opensslconf.h.in +++ b/src/lib/libcrypto/opensslconf.h.in | |||
| @@ -1,20 +1,5 @@ | |||
| 1 | /* crypto/opensslconf.h.in */ | 1 | /* crypto/opensslconf.h.in */ |
| 2 | 2 | ||
| 3 | #ifdef OPENSSL_DOING_MAKEDEPEND | ||
| 4 | |||
| 5 | /* Include any symbols here that have to be explicitly set to enable a feature | ||
| 6 | * that should be visible to makedepend. | ||
| 7 | * | ||
| 8 | * [Our "make depend" doesn't actually look at this, we use actual build settings | ||
| 9 | * instead; we want to make it easy to remove subdirectories with disabled algorithms.] | ||
| 10 | */ | ||
| 11 | |||
| 12 | #ifndef OPENSSL_FIPS | ||
| 13 | #define OPENSSL_FIPS | ||
| 14 | #endif | ||
| 15 | |||
| 16 | #endif | ||
| 17 | |||
| 18 | /* Generate 80386 code? */ | 3 | /* Generate 80386 code? */ |
| 19 | #undef I386_ONLY | 4 | #undef I386_ONLY |
| 20 | 5 | ||
| @@ -78,14 +63,9 @@ | |||
| 78 | /* Should we define BN_DIV2W here? */ | 63 | /* Should we define BN_DIV2W here? */ |
| 79 | 64 | ||
| 80 | /* Only one for the following should be defined */ | 65 | /* Only one for the following should be defined */ |
| 81 | /* The prime number generation stuff may not work when | ||
| 82 | * EIGHT_BIT but I don't care since I've only used this mode | ||
| 83 | * for debuging the bignum libraries */ | ||
| 84 | #undef SIXTY_FOUR_BIT_LONG | 66 | #undef SIXTY_FOUR_BIT_LONG |
| 85 | #undef SIXTY_FOUR_BIT | 67 | #undef SIXTY_FOUR_BIT |
| 86 | #define THIRTY_TWO_BIT | 68 | #define THIRTY_TWO_BIT |
| 87 | #undef SIXTEEN_BIT | ||
| 88 | #undef EIGHT_BIT | ||
| 89 | #endif | 69 | #endif |
| 90 | 70 | ||
| 91 | #if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H) | 71 | #if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H) |
