summaryrefslogtreecommitdiffstats
path: root/src/openvpn/forward-inline.h
diff options
context:
space:
mode:
authorSteffan Karger <steffan@karger.me>2014-11-30 17:44:09 +0100
committerGert Doering <gert@greenie.muc.de>2014-12-31 17:36:54 +0100
commitec828db63f12eeb17f0f8c4de57f766e70161a13 (patch)
tree02c42123b4cc8f4d9bf4fe5e8bde526101b42590 /src/openvpn/forward-inline.h
parentc3e1809f540db16c23fc74f06d6e8c29a4a6941a (diff)
downloadopenvpn-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/forward-inline.h')
-rw-r--r--src/openvpn/forward-inline.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openvpn/forward-inline.h b/src/openvpn/forward-inline.h
index 5853ce2..0ca6692 100644
--- a/src/openvpn/forward-inline.h
+++ b/src/openvpn/forward-inline.h
@@ -35,7 +35,7 @@
static inline void
check_tls (struct context *c)
{
-#if defined(ENABLE_CRYPTO) && defined(ENABLE_SSL)
+#if defined(ENABLE_CRYPTO)
void check_tls_dowork (struct context *c);
if (c->c2.tls_multi)
check_tls_dowork (c);
@@ -49,7 +49,7 @@ check_tls (struct context *c)
static inline void
check_tls_errors (struct context *c)
{
-#if defined(ENABLE_CRYPTO) && defined(ENABLE_SSL)
+#if defined(ENABLE_CRYPTO)
void check_tls_errors_co (struct context *c);
void check_tls_errors_nco (struct context *c);
if (c->c2.tls_multi && c->c2.tls_exit_signal)