diff options
author | Steffan Karger <steffan@karger.me> | 2014-11-30 17:44:09 +0100 |
---|---|---|
committer | Gert Doering <gert@greenie.muc.de> | 2014-12-31 17:36:54 +0100 |
commit | ec828db63f12eeb17f0f8c4de57f766e70161a13 (patch) | |
tree | 02c42123b4cc8f4d9bf4fe5e8bde526101b42590 /src/openvpn/openvpn.h | |
parent | c3e1809f540db16c23fc74f06d6e8c29a4a6941a (diff) | |
download | openvpn-ec828db63f12eeb17f0f8c4de57f766e70161a13.tar.gz openvpn-ec828db63f12eeb17f0f8c4de57f766e70161a13.tar.xz openvpn-ec828db63f12eeb17f0f8c4de57f766e70161a13.zip |
Remove ENABLE_SSL define (and --disable-ssl configure option)
Remove the --disable-ssl configure option and accompanying ENABLE_SSL
defines in the master/2.4 branch, to reduce the code and testing
complexity a bit.
This does not remove to runtime option to run without SSL, just the compile
time option to not include any SSL-related code.
During the community meeting in November 2014 there were no objections
amongst he developers present. Also, this has been announced on the -users
and -devel mailing lists two weeks ago, without any response whatsoever.
Signed-off-by: Steffan Karger <steffan@karger.me>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <54A4248A.1090501@karger.me>
URL: http://article.gmane.org/gmane.network.openvpn.devel/9371
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'src/openvpn/openvpn.h')
-rw-r--r-- | src/openvpn/openvpn.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/openvpn/openvpn.h b/src/openvpn/openvpn.h index 24df3bb..fb532a2 100644 --- a/src/openvpn/openvpn.h +++ b/src/openvpn/openvpn.h @@ -62,14 +62,11 @@ struct key_schedule /* pre-shared static key, read from a file */ struct key_ctx_bi static_key; -#ifdef ENABLE_SSL /* our global SSL context */ struct tls_root_ctx ssl_ctx; /* optional authentication HMAC key for TLS control channel */ struct key_ctx_bi tls_auth_key; - -#endif /* ENABLE_SSL */ #else /* ENABLE_CRYPTO */ int dummy; #endif /* ENABLE_CRYPTO */ @@ -335,8 +332,6 @@ struct context_2 /* * TLS-mode crypto objects. */ -#ifdef ENABLE_SSL - struct tls_multi *tls_multi; /**< TLS state structure for this VPN * tunnel. */ @@ -357,8 +352,6 @@ struct context_2 /* throw this signal on TLS errors */ int tls_exit_signal; -#endif /* ENABLE_SSL */ - struct crypto_options crypto_options; /**< Security parameters and crypto state * used by the \link data_crypto Data @@ -566,7 +559,7 @@ struct context * have been compiled in. */ -#if defined(ENABLE_CRYPTO) && defined(ENABLE_SSL) +#ifdef ENABLE_CRYPTO #define TLS_MODE(c) ((c)->c2.tls_multi != NULL) #define PROTO_DUMP_FLAGS (check_debug_level (D_LINK_RW_VERBOSE) ? (PD_SHOW_DATA|PD_VERBOSE) : 0) #define PROTO_DUMP(buf, gc) protocol_dump((buf), \ |