diff options
| author | Antonio Quartulli | 2017-12-04 09:01:10 +0800 |
|---|---|---|
| committer | Gert Doering | 2017-12-04 19:12:27 +0100 |
| commit | c7ca91332d330b3cbbc2a8faef4f3a3ae70048c5 (patch) | |
| tree | 8ae24311de7729f15e749f0c885bffdf7a33f270 /src/openvpn/syshead.h | |
| parent | f3fec49b1c916a701058ef2445b4c07005c30673 (diff) | |
| download | openvpn-c7ca91332d330b3cbbc2a8faef4f3a3ae70048c5.zip openvpn-c7ca91332d330b3cbbc2a8faef4f3a3ae70048c5.tar.gz | |
Remove ENABLE_CRYPTO
The crypto engine cannot be disabled anymore, therefore get
rid of all the related ifdefs in the code.
This change makes the code simpler and reduces our the
number of config combinations we have to test after a new
change is applied.
Signed-off-by: Antonio Quartulli <a@unstable.cc>
Acked-by: Steffan Karger <steffan.karger@fox-it.com>
Message-Id: <20171204010110.22091-1-a@unstable.cc>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg16004.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'src/openvpn/syshead.h')
| -rw-r--r-- | src/openvpn/syshead.h | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h index d9f5a34..0c17ded 100644 --- a/src/openvpn/syshead.h +++ b/src/openvpn/syshead.h @@ -513,7 +513,7 @@ socket_defined(const socket_descriptor_t sd) * Do we have point-to-multipoint capability? */ -#if defined(ENABLE_CRYPTO) && defined(HAVE_GETTIMEOFDAY_NANOSECONDS) +#if defined(HAVE_GETTIMEOFDAY_NANOSECONDS) #define P2MP 1 #else #define P2MP 0 @@ -550,7 +550,7 @@ socket_defined(const socket_descriptor_t sd) /* * Enable external private key */ -#if defined(ENABLE_MANAGEMENT) && defined(ENABLE_CRYPTO) +#if defined(ENABLE_MANAGEMENT) #define MANAGMENT_EXTERNAL_KEY #endif @@ -597,25 +597,17 @@ socket_defined(const socket_descriptor_t sd) /* * Should we include NTLM proxy functionality */ -#if defined(ENABLE_CRYPTO) #define NTLM 1 -#else -#define NTLM 0 -#endif /* * Should we include proxy digest auth functionality */ -#if defined(ENABLE_CRYPTO) #define PROXY_DIGEST_AUTH 1 -#else -#define PROXY_DIGEST_AUTH 0 -#endif /* * Do we have CryptoAPI capability? */ -#if defined(_WIN32) && defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_OPENSSL) +#if defined(_WIN32) && defined(ENABLE_CRYPTO_OPENSSL) #define ENABLE_CRYPTOAPI #endif @@ -684,9 +676,7 @@ socket_defined(const socket_descriptor_t sd) /* * Do we support pushing peer info? */ -#if defined(ENABLE_CRYPTO) #define ENABLE_PUSH_PEER_INFO -#endif /* * Compression support |