diff options
| author | Alon Bar-Lev <alon.barlev@gmail.com> | 2012-02-29 22:12:10 +0200 |
|---|---|---|
| committer | David Sommerseth <davids@redhat.com> | 2012-03-22 22:53:39 +0100 |
| commit | 9b33b5a4b1aa170080d18b0f32f6599b519589f0 (patch) | |
| tree | bf033b98d14a56d7adb18d3345be2a94df850c0d /src/openvpn/syshead.h | |
| parent | 74bbc71b75bac49f5c9df81827fa184b8a365d36 (diff) | |
| download | openvpn-9b33b5a4b1aa170080d18b0f32f6599b519589f0.tar.gz openvpn-9b33b5a4b1aa170080d18b0f32f6599b519589f0.tar.xz openvpn-9b33b5a4b1aa170080d18b0f32f6599b519589f0.zip | |
build: proper crypto detection and usage
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
Acked-by: Adriaan de Jong <dejong@fox-it.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
Diffstat (limited to 'src/openvpn/syshead.h')
| -rw-r--r-- | src/openvpn/syshead.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h index bfdf148..b82f9e4 100644 --- a/src/openvpn/syshead.h +++ b/src/openvpn/syshead.h @@ -481,7 +481,7 @@ socket_defined (const socket_descriptor_t sd) * Do we have point-to-multipoint capability? */ -#if defined(ENABLE_CLIENT_SERVER) && defined(USE_CRYPTO) && defined(USE_SSL) && defined(HAVE_GETTIMEOFDAY) +#if defined(ENABLE_CLIENT_SERVER) && defined(ENABLE_CRYPTO) && defined(ENABLE_SSL) && defined(HAVE_GETTIMEOFDAY) #define P2MP 1 #else #define P2MP 0 @@ -518,7 +518,7 @@ socket_defined (const socket_descriptor_t sd) /* * Enable external private key */ -#if defined(ENABLE_MANAGEMENT) && defined(USE_SSL) && !defined(USE_POLARSSL) +#if defined(ENABLE_MANAGEMENT) && defined(ENABLE_SSL) && !defined(ENABLE_CRYPTO_POLARSSL) #define MANAGMENT_EXTERNAL_KEY #endif @@ -567,7 +567,7 @@ socket_defined (const socket_descriptor_t sd) /* * Should we include NTLM proxy functionality */ -#if defined(USE_CRYPTO) && defined(ENABLE_HTTP_PROXY) +#if defined(ENABLE_CRYPTO) && defined(ENABLE_HTTP_PROXY) #define NTLM 1 #else #define NTLM 0 @@ -576,7 +576,7 @@ socket_defined (const socket_descriptor_t sd) /* * Should we include proxy digest auth functionality */ -#if defined(USE_CRYPTO) && defined(ENABLE_HTTP_PROXY) +#if defined(ENABLE_CRYPTO) && defined(ENABLE_HTTP_PROXY) #define PROXY_DIGEST_AUTH 1 #else #define PROXY_DIGEST_AUTH 0 @@ -592,14 +592,14 @@ socket_defined (const socket_descriptor_t sd) /* * Do we have CryptoAPI capability? */ -#if defined(WIN32) && defined(USE_CRYPTO) && defined(USE_SSL) && defined(USE_OPENSSL) +#if defined(WIN32) && defined(ENABLE_CRYPTO) && defined(ENABLE_SSL) && defined(ENABLE_CRYPTO_OPENSSL) #define ENABLE_CRYPTOAPI #endif /* * Enable x509-track feature? */ -#if defined(USE_CRYPTO) && defined(USE_SSL) && defined (USE_OPENSSL) +#if defined(ENABLE_CRYPTO) && defined(ENABLE_SSL) && defined (ENABLE_CRYPTO_OPENSSL) #define ENABLE_X509_TRACK #endif @@ -690,7 +690,7 @@ socket_defined (const socket_descriptor_t sd) /* * Do we support pushing peer info? */ -#if defined(USE_CRYPTO) && defined(USE_SSL) +#if defined(ENABLE_CRYPTO) && defined(ENABLE_SSL) #define ENABLE_PUSH_PEER_INFO #endif |