summaryrefslogtreecommitdiffstats
path: root/src/openvpn/crypto.c
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/crypto.c
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/crypto.c')
-rw-r--r--src/openvpn/crypto.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/src/openvpn/crypto.c b/src/openvpn/crypto.c
index eaef964..5cf9b9c 100644
--- a/src/openvpn/crypto.c
+++ b/src/openvpn/crypto.c
@@ -726,8 +726,6 @@ test_crypto (const struct crypto_options *co, struct frame* frame)
gc_free (&gc);
}
-#ifdef ENABLE_SSL
-
void
get_tls_handshake_key (const struct key_type *key_type,
struct key_ctx_bi *ctx,
@@ -799,7 +797,6 @@ get_tls_handshake_key (const struct key_type *key_type,
CLEAR (*ctx);
}
}
-#endif
/* header and footer for static key file */
static const char static_key_head[] = "-----BEGIN OpenVPN Static key V1-----";
@@ -1322,23 +1319,6 @@ get_random()
return l;
}
-#ifndef ENABLE_SSL
-
-void
-init_ssl_lib (void)
-{
- crypto_init_lib ();
-}
-
-void
-free_ssl_lib (void)
-{
- crypto_uninit_lib ();
- prng_uninit();
-}
-
-#endif /* ENABLE_SSL */
-
/*
* md5 functions
*/