From: Selva Nair Date: Tue, 2 Nov 2021 04:23:14 +0000 (-0400) Subject: Fix tls-version-min default once again X-Git-Tag: v2.6_beta1~393 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3037d2bd348eb184ed924a590012a23f68a1b47f;p=thirdparty%2Fopenvpn.git Fix tls-version-min default once again commit 51be733ba236610dff6a1c361cf59172db97473a claimed to correct this but did not do it properly. (my fault). The check whether tls-version-min is set by the user or not was still wrong. Hope this fixes it for good. Signed-off-by: Selva Nair Acked-by: Gert Doering Message-Id: <20211102042314.19113-1-selva.nair@gmail.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg23091.html Signed-off-by: Gert Doering --- diff --git a/src/openvpn/options.c b/src/openvpn/options.c index f8b910420..c912c8dd8 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -3165,7 +3165,9 @@ static void options_set_backwards_compatible_options(struct options *o) { /* TLS min version is not set */ - if ((o->ssl_flags & SSLF_TLS_VERSION_MIN_MASK) == 0) + int tls_ver_min = (o->ssl_flags >> SSLF_TLS_VERSION_MIN_SHIFT) + & SSLF_TLS_VERSION_MIN_MASK; + if (tls_ver_min == 0) { int tls_ver_max = (o->ssl_flags >> SSLF_TLS_VERSION_MAX_SHIFT) & SSLF_TLS_VERSION_MAX_MASK;