Disable DCO when TLS mode is not used
PATCH 1/1 Disable DCO when TLS mode is not used
This disables DCO in both --secret mode and when no encryption/TLS is used. Also aligns the message with the deprecation warning we have in place.
--- src/openvpn/dco.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
src/openvpn/dco.c +3 -2
@@ -275,9 +275,10 @@ dco_check_startup_option(int msglevel, const struct options *o)return false; } -if (o->shared_secret_file) +if (!o->tls_client && !o->tls_server) { -msg (msglevel,"--secret is set. Disabling data channel offload" ); +msg (msglevel,"No tls-client or tls-server option in configuration " +"detected. Disabling data channel offload." );return false; }
Signature · 1 line
2.37.1 (Apple Git-137.1)
Yeah, thanks :-) (tested on the "p2p --secret" server, still does the right thing. Have no "no secrets at all" setup, but from stare-at-code I see no reason why this wouldn't work as well)
Dec 12 09:29:15 ubuntu2004 tun-udp-p2p[1272956]: No tls-client or tls-server option in configuration detected. Disabling data channel offload. Dec 12 09:29:15 ubuntu2004 tun-udp-p2p[1272956]: DEPRECATION: No tls-client or tls-server option in configuration detected. OpenVPN 2.7 will remove the functionality to run a VPN without TLS. See the examples section in the manual page for examples of a similar quick setup with peer-fingerprint. .. Dec 12 09:29:15 ubuntu2004 tun-udp-p2p[1272957]: TUN/TAP device tun5 opened
Your patch has been applied to the master and release/2.6 branch.
commit a666668f064c7ff57cdebb3afceb72e1263a3ba9 (master) commit 9b277f426c7d295c8f354496e8e226fc26ff7b1c (release/2.6)
Author: Arne Schwabe Date: Sat Dec 10 14:44:27 2022 +0100
Disable DCO when TLS mode is not used
Signed-off-by: Arne Schwabe <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg25641.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
Antonio Quartulli
Acked-byHi,
Quoted 5 lines · Gert Doering
Acked-by Gert Doering <[email protected]...>Yeah, thanks :-) (tested on the "p2p --secret" server, still does the right thing. Have no "no secrets at all" setup, but from stare-at-code I see no reason why this wouldn't work as well)
I know I am late to the party - but still wanted to give my virtual ACK
Thanks for cleaning after my half baked fix!
Cheers,
Signature · 1 line
Antonio Quartulli