Re: [Openvpn-devel] [PATCH (2.4)] Fix --disable-crypto build
Hi, On Sat, Oct 06, 2018 at 09:54:22AM +0200, Steffan Karger wrote: > On 05-10-18 21:59, Gert Doering wrote: > > On Fri, Oct 05, 2018 at 08:23:28PM +0500, ?? wrote: > >> 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 -- "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 g...@greenie.muc.de signature.asc Description: PGP signature ___ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Re: [Openvpn-devel] [PATCH (2.4)] Fix --disable-crypto build
Hi, On 05-10-18 21:59, Gert Doering wrote: > On Fri, Oct 05, 2018 at 08:23:28PM +0500, ?? wrote: >> 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 signature.asc Description: OpenPGP digital signature ___ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Re: [Openvpn-devel] [PATCH (2.4)] Fix --disable-crypto build
Hi, On Fri, Oct 05, 2018 at 08:23:28PM +0500, ?? wrote: > 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 -- "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 g...@greenie.muc.de signature.asc Description: PGP signature ___ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Re: [Openvpn-devel] [PATCH (2.4)] Fix --disable-crypto build
shall we add "--disable-crypto" to travis-ci matrix in 2.4 branch ?
пт, 5 окт. 2018 г. в 19:00, Steffan Karger :
> 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
> ---
> src/openvpn/init.c | 4
> 1 file changed, 4 insertions(+)
>
> diff --git a/src/openvpn/init.c b/src/openvpn/init.c
> index 0950f07e..2d201c44 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
> --
> 2.17.1
>
>
>
> ___
> Openvpn-devel mailing list
> Openvpn-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/openvpn-devel
>
___
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
[Openvpn-devel] [PATCH (2.4)] 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
---
src/openvpn/init.c | 4
1 file changed, 4 insertions(+)
diff --git a/src/openvpn/init.c b/src/openvpn/init.c
index 0950f07e..2d201c44 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
--
2.17.1
___
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
