From: Steffan Karger <steffan@karger.me>
Date: Fri, 5 Oct 2018 13:58:49 +0000 (+0200)
Subject: Fix --disable-crypto build
X-Git-Tag: v2.4.7~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee80ce3d6f2ebc59068338757311e0488ae620fc;p=thirdparty%2Fopenvpn.git

Fix --disable-crypto build

Commit d2ff5164 was fine for the master branch, but broke the 2.4 build if
the --disable-crypto configure options was used (which is removed in the
master branch).

Signed-off-by: Steffan Karger <steffan@karger.me>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20181005135849.28718-1-steffan@karger.me>
URL: https://www.mail-archive.com/search?l=mid&q=20181005135849.28718-1-steffan@karger.me
Signed-off-by: Gert Doering <gert@greenie.muc.de>
---

diff --git a/src/openvpn/init.c b/src/openvpn/init.c
index 0950f07e9..2d201c44a 100644
--- a/src/openvpn/init.c
+++ b/src/openvpn/init.c
@@ -621,9 +621,11 @@ uninit_proxy(struct context *c)
 static void
 do_set_ncp_options(struct context *c)
 {
+#ifdef ENABLE_CRYPTO
     c->c1.ciphername = c->options.ciphername;
     c->c1.authname = c->options.authname;
     c->c1.keysize = c->options.keysize;
+#endif ENABLE_CRYPTO
 }
 
 /*
@@ -635,9 +637,11 @@ do_set_ncp_options(struct context *c)
 static void
 do_unset_ncp_options(struct context *c)
 {
+#ifdef ENABLE_CRYPTO
     c->options.ciphername = c->c1.ciphername;
     c->options.authname = c->c1.authname;
     c->options.keysize = c->c1.keysize;
+#endif ENABLE_CRYPTO
 }
 
 void