diff options
| author | Nagendra Modadugu <ngm@google.com> | 2009-09-30 11:36:48 -0700 |
|---|---|---|
| committer | Nagendra Modadugu <ngm@google.com> | 2009-09-30 12:06:07 -0700 |
| commit | e45f106cb6b47af1f21efe76e933bdea2f5dd1ca (patch) | |
| tree | 9abf212990e6e7631ac6b0a07816dfe069912724 /crypto/opensslconf.h | |
| parent | 5fe11ead41a8b9709f910786101e818603de6690 (diff) | |
| download | replicant_openssl-e45f106cb6b47af1f21efe76e933bdea2f5dd1ca.zip replicant_openssl-e45f106cb6b47af1f21efe76e933bdea2f5dd1ca.tar.gz replicant_openssl-e45f106cb6b47af1f21efe76e933bdea2f5dd1ca.tar.bz2 | |
Upgrade to openssl-0.9.8k.
The source tree (and the size of the compiled library)
can be reduced further. This will be done in a future
commit.
Diffstat (limited to 'crypto/opensslconf.h')
| -rw-r--r-- | crypto/opensslconf.h | 41 |
1 files changed, 35 insertions, 6 deletions
diff --git a/crypto/opensslconf.h b/crypto/opensslconf.h index 14e04f9..4aa0330 100644 --- a/crypto/opensslconf.h +++ b/crypto/opensslconf.h @@ -4,12 +4,16 @@ /* OpenSSL was configured with the following options: */ #ifndef OPENSSL_DOING_MAKEDEPEND + #ifndef OPENSSL_NO_BF # define OPENSSL_NO_BF #endif #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +#ifndef OPENSSL_NO_CAPIENG +# define OPENSSL_NO_CAPIENG +#endif #ifndef OPENSSL_NO_CAST # define OPENSSL_NO_CAST #endif @@ -22,9 +26,15 @@ #ifndef OPENSSL_NO_IDEA # define OPENSSL_NO_IDEA #endif +#ifndef OPENSSL_NO_JPAKE +# define OPENSSL_NO_JPAKE +#endif #ifndef OPENSSL_NO_KRB5 # define OPENSSL_NO_KRB5 #endif +#ifndef OPENSSL_NO_MD2 +# define OPENSSL_NO_MD2 +#endif #ifndef OPENSSL_NO_MDC2 # define OPENSSL_NO_MDC2 #endif @@ -37,11 +47,9 @@ #ifndef OPENSSL_NO_SEED # define OPENSSL_NO_SEED #endif -#ifndef OPENSSL_NO_TLSEXT -# define OPENSSL_NO_TLSEXT -#endif #endif /* OPENSSL_DOING_MAKEDEPEND */ + #ifndef OPENSSL_THREADS # define OPENSSL_THREADS #endif @@ -60,6 +68,9 @@ # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) # define NO_CAMELLIA # endif +# if defined(OPENSSL_NO_CAPIENG) && !defined(NO_CAPIENG) +# define NO_CAPIENG +# endif # if defined(OPENSSL_NO_CAST) && !defined(NO_CAST) # define NO_CAST # endif @@ -72,9 +83,15 @@ # if defined(OPENSSL_NO_IDEA) && !defined(NO_IDEA) # define NO_IDEA # endif +# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) +# define NO_JPAKE +# endif # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) # define NO_KRB5 # endif +# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) +# define NO_MD2 +# endif # if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) # define NO_MDC2 # endif @@ -87,13 +104,25 @@ # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) # define NO_SEED # endif -# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT) -# define NO_TLSEXT -# endif #endif /* crypto/opensslconf.h.in */ +#ifdef OPENSSL_DOING_MAKEDEPEND + +/* Include any symbols here that have to be explicitly set to enable a feature + * that should be visible to makedepend. + * + * [Our "make depend" doesn't actually look at this, we use actual build settings + * instead; we want to make it easy to remove subdirectories with disabled algorithms.] + */ + +#ifndef OPENSSL_FIPS +#define OPENSSL_FIPS +#endif + +#endif + /* Generate 80386 code? */ #undef I386_ONLY |