| Message ID | 20201211125957.7764-1-arne@rfc2549.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [Openvpn-devel] Fix tls-auth mismatch OCC message when tls-cryptv2 is used. | expand |
Hi, On 11-12-2020 13:59, Arne Schwabe wrote: > A server with tls-cryptv2 and tls-auth produces the warning: > > WARNING: 'tls-auth' is present in local config but missing in remote config, local='tls-auth'" > > The tls-auth option has no argument so the strpefix with the space > included does not match it. > > Signed-off-by: Arne Schwabe <arne@rfc2549.org> > --- > src/openvpn/options.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/openvpn/options.c b/src/openvpn/options.c > index d824cbad..d9d492b2 100644 > --- a/src/openvpn/options.c > +++ b/src/openvpn/options.c > @@ -4138,7 +4138,7 @@ options_warning_safe_scan2(const int msglevel, > if (strprefix(p1, "key-method ") > || strprefix(p1, "keydir ") > || strprefix(p1, "proto ") > - || strprefix(p1, "tls-auth ") > + || streq(p1, "tls-auth") > || strprefix(p1, "tun-ipv6") > || strprefix(p1, "cipher ")) > { > Thanks for fixing this. Acked-by: Steffan Karger <steffan@karger.me> -Steffan
Your patch has been applied to the master and release/2.5 branch.
Thanks :-)
commit 15daa9886b64a8378a6c5d68f79076dc44095696 (master)
commit e1bcf8a4bf3986a25f3906abe213fc9cd171ea04 (release/2.5)
Author: Arne Schwabe
Date: Fri Dec 11 13:59:57 2020 +0100
Fix tls-auth mismatch OCC message when tls-cryptv2 is used.
Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Acked-by: Steffan Karger <steffan@karger.me>
Message-Id: <20201211125957.7764-1-arne@rfc2549.org>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg21358.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
--
kind regards,
Gert Doering
diff --git a/src/openvpn/options.c b/src/openvpn/options.c index d824cbad..d9d492b2 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -4138,7 +4138,7 @@ options_warning_safe_scan2(const int msglevel, if (strprefix(p1, "key-method ") || strprefix(p1, "keydir ") || strprefix(p1, "proto ") - || strprefix(p1, "tls-auth ") + || streq(p1, "tls-auth") || strprefix(p1, "tun-ipv6") || strprefix(p1, "cipher ")) {
A server with tls-cryptv2 and tls-auth produces the warning: WARNING: 'tls-auth' is present in local config but missing in remote config, local='tls-auth'" The tls-auth option has no argument so the strpefix with the space included does not match it. Signed-off-by: Arne Schwabe <arne@rfc2549.org> --- src/openvpn/options.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)