From patchwork Thu Dec 2 02:51:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 2105 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director11.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id GDUQG5/PqGGMWQAAIUCqbw (envelope-from ) for ; Thu, 02 Dec 2021 08:52:31 -0500 Received: from proxy17.mail.ord1d.rsapps.net ([172.30.191.6]) by director11.mail.ord1d.rsapps.net with LMTP id CIfnGp/PqGGhDwAAvGGmqA (envelope-from ) for ; Thu, 02 Dec 2021 08:52:31 -0500 Received: from smtp17.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy17.mail.ord1d.rsapps.net with LMTPS id aICnGp/PqGFmWwAAWC7mWg (envelope-from ) for ; Thu, 02 Dec 2021 08:52:31 -0500 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp17.gate.ord1d.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dmarc=none (p=nil; dis=none) header.from=rfc2549.org X-Suspicious-Flag: YES X-Classification-ID: 1777c5ac-5377-11ec-935c-5254008de1cb-1-1 Received: from [216.105.38.7] ([216.105.38.7:59440] helo=lists.sourceforge.net) by smtp17.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id A9/2F-05173-E9FC8A16; Thu, 02 Dec 2021 08:52:30 -0500 Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.94.2) (envelope-from ) id 1msmUt-0008Gl-5U; Thu, 02 Dec 2021 13:51:39 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1msmUr-0008Ge-4H for openvpn-devel@lists.sourceforge.net; Thu, 02 Dec 2021 13:51:37 +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: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:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=jTHWQAytwIErja6Q0S+JOBFCKZtwh57sG2ECz9MJQC8=; b=XCn828tuwK8fslLrB5mThTnoBJ ih/2mPyBJw3Ktbabs194VeqRdR2q/bLXYQri8gIPbqW91XLQOf7zsd1DiEy7LpFTsoGcapJlKFd3d 22ckH9SJ1+FhemkVLH/8yEjq1JwEZK6fYv30o+MCnqmp20qNlTUi2tFNxXibccJ0KTdg=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version: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:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=jTHWQAytwIErja6Q0S+JOBFCKZtwh57sG2ECz9MJQC8=; b=V quiPhAoDe3++OcmuWtH5Hjqa/F4k/ypcdcSDQsD6Wu1h1H4UjJ/NLKoHUpVo5OO0wLVmt9EYhnNCG 0NJFS0zUXsB9VHahYgS+hX4fow4yH+HoF1ysLsRq/RgbH+OaeVn/Nul94x6p1GKCAxo/OeNVfy4O5 x1Rgea6nZXJIcPC4=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) id 1msmUl-001Wv0-PP for openvpn-devel@lists.sourceforge.net; Thu, 02 Dec 2021 13:51:37 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.94.2 (FreeBSD)) (envelope-from ) id 1msmUe-0006RR-0i for openvpn-devel@lists.sourceforge.net; Thu, 02 Dec 2021 14:51:24 +0100 Received: (nullmailer pid 2598691 invoked by uid 10006); Thu, 02 Dec 2021 13:51:24 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Thu, 2 Dec 2021 14:51:24 +0100 Message-Id: <20211202135124.2598645-1-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.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: This explains that 2.6 will ignore --cipher without --compat-mode and restructures the whole paragraph to better readable. Signed-off-by: Arne Schwabe --- doc/man-sections/cipher-negotiation.rst | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) Content analysis details: (0.3 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different X-Headers-End: 1msmUl-001Wv0-PP Subject: [Openvpn-devel] [PATCH] Adjust cipher-negotiation.rst with compat-mode changes 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 This explains that 2.6 will ignore --cipher without --compat-mode and restructures the whole paragraph to better readable. Signed-off-by: Arne Schwabe --- doc/man-sections/cipher-negotiation.rst | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/doc/man-sections/cipher-negotiation.rst b/doc/man-sections/cipher-negotiation.rst index 423b5ab6a..6e872962a 100644 --- a/doc/man-sections/cipher-negotiation.rst +++ b/doc/man-sections/cipher-negotiation.rst @@ -15,12 +15,15 @@ with a AUTH_FAILED message (as seen in client log): AUTH: Received control message: AUTH_FAILED,Data channel cipher negotiation failed (no shared cipher) -OpenVPN 2.5 will only allow the ciphers specified in ``--data-ciphers``. To ensure -backwards compatibility also if a cipher is specified using the ``--cipher`` option -it is automatically added to this list. If both options are unset the default is -:code:`AES-256-GCM:AES-128-GCM`. In 2.6 and later the default is changed to +OpenVPN 2.5 and higher will only allow the ciphers specified in ``--data-ciphers``. + If ``--data-ciphers`` is not set the default is :code:`AES-256-GCM:AES-128-GCM`. +In 2.6 and later the default is changed to :code:`AES-256-GCM:AES-128-GCM:CHACHA20-POLY1305` when Chacha20-Poly1305 is available. +For backwards compatibility OpenVPN 2.6.0 and later with ``--compat-mode 2.4.x`` +(or lower) or OpenVPN 2.5.x will automatically add a cipher specified using the +``--cipher`` option to this list. + OpenVPN 2.4 clients ------------------- The negotiation support in OpenVPN 2.4 was the first iteration of the implementation