shall we add "--disable-crypto" to travis-ci matrix in 2.4 branch ?
пт, 5 окт. 2018 г. в 19:00, Steffan Karger <stef...@karger.me>:
> 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 <stef...@karger.me>
> ---
> 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
