From patchwork Tue Mar 5 08:22:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 3636 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:5897:b0:559:d8ef:cc57 with SMTP id h23csp166116max; Tue, 5 Mar 2024 00:23:21 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCV4zaCsW5wmlkBVXjqeHz8WGhroasbyg0om3MSGfIZBmxeM3aVl8akQDdYGfnKe7f+1ZeymplbiOi4LEOTjhlylrOF2DBY= X-Google-Smtp-Source: AGHT+IGhlZ3+3g6wKdp3g6oddYj7uCtMx0+RSDS81mXSzdbt/7+wBsyaNtZZd8PqtIjoxAYmAPV9 X-Received: by 2002:a05:6870:7f0d:b0:220:cdfe:cdde with SMTP id xa13-20020a0568707f0d00b00220cdfecddemr11782292oab.1.1709627000984; Tue, 05 Mar 2024 00:23:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709627000; cv=none; d=google.com; s=arc-20160816; b=cbCNJQjuFo6N3rgzvn3gQiUL10XnT6nSbOO8a9xDtUGDOFHlhdoDtwZy+quF0Amyiu gR/rkMAZ5BjChmNhmxx5Ld1rJkh2kzRFctG/KZkio3shWoIpQq3ahYP6nJ2Yfg4XJ5sG FXWIZF3cnSQXStZ5+GaDNUUnrvtJ3DExnXhgH1BKvhDAegOX7I5DqTo3VOUnWSx+ETbj piDTOaa3lio6r98GsKUq7/yVDXUelNJJXug4Urt19dZ7unyCspk2nmdaHPEfBjxGeLdp CTI7KSP28OTvP/aYPE1lSgHX0rECT0ezCuRB0+zqMArEGJ6ssthR7NZhID9DVNi0hnV5 9/IQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature; bh=soS1++oLB5E3EuqJ0VR/Dbwo+80Y708N3C1uXTqurt4=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=vG0lEqMY7Q53yMAB40NeeezJoEyDAu94B7KTy+/wxusO/SXA7jssGkMKgK7BDNiX03 0QKtQAdy6lcNvCV8oAwqHpO4VABju/3sTaF4tRQ5iPeIKfG9jxEERfz2f7GgyHm+cxK8 e1EpAfnTf0upDArgji42aP8aUF6Q+x6SF2d3vowiMM8AAEp7ayYbGjUtsqFvYR6MX2Er /VRMQ7S+tux6tHhn0LuYSkNmcqW1bj1wxmR7lmnYCMycSEuDth2WPngpy21L7q9bJ/sZ 0e1+k0sf/J8of1eNlV2+vxMVfmWrkuWS+IRVa7VUZD2ndHq6kklNB3Fd0e+AFwRi87Ho qgPA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=PyOZJcpS; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=imx6sa7e; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id z9-20020a63e549000000b005dc4ec48cb5si9614373pgj.641.2024.03.05.00.23.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Mar 2024 00:23:20 -0800 (PST) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=PyOZJcpS; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=imx6sa7e; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1rhQ4Z-0003NC-Tz; Tue, 05 Mar 2024 08:22:52 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1rhQ4Y-0003N2-9f for openvpn-devel@lists.sourceforge.net; Tue, 05 Mar 2024 08:22:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=/kicTqd5dMXSX/KqmSxk0VCBU9BJZjbWaUe7mz8cvu4=; b=PyOZJcpSCl3MmzB9Hn+yalu7sZ udM3/yFvpkg8aRVVozE9MwGrtANXL4u8w8ubMteXl1Gsr4pr8mszzLULq4l6RxdwmenWd5N1ezrcF 6Ydn2XJT42IAp00b9ToWwF8epSJs7O5/s9KHQIevfD+p3bClJzT2e3R+aKOgS670KbIg=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=/kicTqd5dMXSX/KqmSxk0VCBU9BJZjbWaUe7mz8cvu4=; b=imx6sa7eGmwnFhP5UeTfIAw50b fmIIQaaiEbVJ29vIjVP6OHdmkvGW7Lu8Jjcv9cj9UmlUUH9LQy+u1vJUTjdL3nBNXO0mXHyQyXKR+ xZqK1X3kRLYqFX3ptiZBYnxIo5YTUW3a0YVeIepUOp/jKwBy9iZ4g8vFhVvDl/U4q7To=; Received: from dhcp-174.greenie.muc.de ([193.149.48.174] helo=blue.greenie.muc.de) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1rhQ4R-0008WR-J6 for openvpn-devel@lists.sourceforge.net; Tue, 05 Mar 2024 08:22:51 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.17.1.9/8.17.1.9) with ESMTP id 4258Mbgf017576 for ; Tue, 5 Mar 2024 09:22:37 +0100 Received: (from gert@localhost) by blue.greenie.muc.de (8.17.1.9/8.17.1.9/Submit) id 4258MbTv017575 for openvpn-devel@lists.sourceforge.net; Tue, 5 Mar 2024 09:22:37 +0100 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Tue, 5 Mar 2024 09:22:36 +0100 Message-ID: <20240305082236.17566-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-1.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Frank Lichtenheld Change-Id: I38e70cb74c10848ab2981efc4c4c8863c5c8785d Signed-off-by: Frank Lichtenheld Acked-by: Arne Schwabe --- Content analysis details: (-0.0 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Headers-End: 1rhQ4R-0008WR-J6 Subject: [Openvpn-devel] [PATCH v1] Fix typo --data-cipher-fallback X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1792673842338622810?= X-GMAIL-MSGID: =?utf-8?q?1792673842338622810?= From: Frank Lichtenheld Change-Id: I38e70cb74c10848ab2981efc4c4c8863c5c8785d Signed-off-by: Frank Lichtenheld Acked-by: Arne Schwabe --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/534 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Arne Schwabe diff --git a/doc/man-sections/generic-options.rst b/doc/man-sections/generic-options.rst index 95e4ca2..30c990d 100644 --- a/doc/man-sections/generic-options.rst +++ b/doc/man-sections/generic-options.rst @@ -75,7 +75,7 @@ to the configuration if no other compression options are present. - 2.4.x or lower: The cipher in ``--cipher`` is appended to ``--data-ciphers``. - - 2.3.x or lower: ``--data-cipher-fallback`` is automatically added with + - 2.3.x or lower: ``--data-ciphers-fallback`` is automatically added with the same cipher as ``--cipher``. - 2.3.6 or lower: ``--tls-version-min 1.0`` is added to the configuration when ``--tls-version-min`` is not explicitly set. diff --git a/src/openvpn/dco.c b/src/openvpn/dco.c index cd3e0ad..14430d3 100644 --- a/src/openvpn/dco.c +++ b/src/openvpn/dco.c @@ -400,7 +400,7 @@ if (o->enable_ncp_fallback && !tls_item_in_cipher_list(o->ciphername, dco_get_supported_ciphers())) { - msg(msglevel, "Note: --data-cipher-fallback with cipher '%s' " + msg(msglevel, "Note: --data-ciphers-fallback with cipher '%s' " "disables data channel offload.", o->ciphername); return false; }