aboutsummaryrefslogtreecommitdiff
path: root/src/openvpn/options.h
diff options
context:
space:
mode:
authorSteffan Karger2014-11-30 17:44:09 +0100
committerGert Doering2014-12-31 17:36:54 +0100
commitec828db63f12eeb17f0f8c4de57f766e70161a13 (patch)
tree02c42123b4cc8f4d9bf4fe5e8bde526101b42590 /src/openvpn/options.h
parentc3e1809f540db16c23fc74f06d6e8c29a4a6941a (diff)
downloadopenvpn-ec828db63f12eeb17f0f8c4de57f766e70161a13.zip
openvpn-ec828db63f12eeb17f0f8c4de57f766e70161a13.tar.gz
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/options.h')
-rw-r--r--src/openvpn/options.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/openvpn/options.h b/src/openvpn/options.h
index 9d188f8..7a8b21e 100644
--- a/src/openvpn/options.h
+++ b/src/openvpn/options.h
@@ -195,10 +195,8 @@ struct options
bool show_ciphers;
bool show_digests;
bool show_engines;
-#ifdef ENABLE_SSL
bool show_tls_ciphers;
bool show_curves;
-#endif
bool genkey;
#endif
@@ -500,7 +498,6 @@ struct options
bool use_prediction_resistance;
#endif
-#ifdef ENABLE_SSL
/* TLS (control channel) parms */
bool tls_server;
bool tls_client;
@@ -582,7 +579,6 @@ struct options
bool tls_exit;
-#endif /* ENABLE_SSL */
#endif /* ENABLE_CRYPTO */
#ifdef ENABLE_X509_TRACK