Fix --disable-crypto build
PATCH 1/1 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).
--- src/openvpn/init.c | 4 ++++ 1 file changed, 4 insertions(+)
src/openvpn/init.c +4 -0
@@ -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
Signature · 1 line
2.17.1
Thanks. Makes sense, and passes the test (Linux with --disable-crypto)
Your patch has been applied to the release/2.4 branch.
commit ee80ce3d6f2ebc59068338757311e0488ae620fc
Author: Steffan Karger Date: Fri Oct 5 15:58:49 2018 +0200
Fix --disable-crypto build
Signed-off-by: Steffan Karger <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/search?l=mid&[email protected]...
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
shall we add "--disable-crypto" to travis-ci matrix in 2.4 branch ?
пт, 5 окт. 2018 г. в 19:00, Steffan Karger <[email protected]...>:
Quoted 47 lines
Commit
d2ff5164was 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 <[email protected]...>--- src/openvpn/init.c | 4 ++++ 1 file changed, 4 insertions(+)src/openvpn/init.c +4
-1@@ -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 --2.17.1
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Hi,
Quoted 1 line · ???????? ??????????????
shall we add "--disable-crypto" to travis-ci matrix in 2.4 branch ?
I'm afraid this will bite us a few more times, so "yes, please"
gert
Signature · 6 lines
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh Mistress
Gert Doering - Munich, Germany [email protected]...Hi,
Quoted 4 lines · Gert Doering
Quoted 1 line · ???????? ??????????????
shall we add "--disable-crypto" to travis-ci matrix in 2.4 branch ?
I'm afraid this will bite us a few more times, so "yes, please"
We already have this - that's how I noticed it was broken :)
-Steffan
Hi,
Quoted 7 lines · Steffan Karger
Quoted 4 lines · Gert Doering
Quoted 1 line · ???????? ??????????????
shall we add "--disable-crypto" to travis-ci matrix in 2.4 branch ?
I'm afraid this will bite us a few more times, so "yes, please"
We already have this - that's how I noticed it was broken :)
OK, I was confused about this. We *have* a --disable-crypto build for "Linux", and I assumed this was about "do we want for Windows", which Steffan and Arne tell me "no, we do not, because nobody wants to disable crypto on Windows builds".
So, "no" :-)
gert
Signature · 6 lines
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh Mistress
Gert Doering - Munich, Germany [email protected]...