upstream/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2026-05-28 04:03:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Avoid sending --cipher to clients not supporting NCP

Browse source 
The NCP rework introduced a regression of sending a --cipher
command as part of the push message when the client does not
support NCP. This is is more a cosmetic issue since the client
will log that as warning in the log and ignore it.

Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20200717134739.21168-7-arne@rfc2549.org>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg20437.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Arne Schwabe 2020-07-17 15:47:37 +02:00 committed by Gert Doering
parent e6c86b24db
commit 4b59e2644a
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/openvpn/push.c
View file

@ -472,9 +472,15 @@ prepare_push_reply(struct context *c, struct gc_arena *gc,
/*
* Push the selected cipher, at this point the cipher has been
* already negotiated and been fixed
* already negotiated and been fixed.
*
* We avoid pushing the cipher to clients not supporting NCP
* to avoid error messages in their logs
*/
push_option_fmt(gc, push_list, M_USAGE, "cipher %s", o->ciphername);
if (tls_peer_supports_ncp(c->c2.tls_multi->peer_info))
{
push_option_fmt(gc, push_list, M_USAGE, "cipher %s", o->ciphername);
}
return true;
}