From patchwork Mon Mar 4 15:46:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "plaisthos (Code Review)" X-Patchwork-Id: 3633 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:1888:b0:559:d8ef:cc57 with SMTP id r8csp2738893max; Mon, 4 Mar 2024 07:52:50 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCV0uhIoiCUhPTQtmHXcVOwytGeQMtUc37DsZAGElCXHPIyz65PctmDzY2U/hsdBYyiKKEDYyoME4Of+9TfPZOconNJwL1c= X-Google-Smtp-Source: AGHT+IH77O8ldBEuFHVvb8/XFLiCtMW3Kkd6VopipjWeReCax5XBi6/n8k2WQO0xtRIsaT8iQa3y X-Received: by 2002:a05:6a21:788b:b0:1a1:49b4:75fe with SMTP id bf11-20020a056a21788b00b001a149b475femr8120414pzc.4.1709567570556; Mon, 04 Mar 2024 07:52:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709567570; cv=none; d=google.com; s=arc-20160816; b=MuDx3Hfg5Z2Bh419tcVInjy6eEe7dUOZTmXKpDlETzIbAxORBZpfTw3pg6l5u+HbEd mQ5Sv86lyytnBJEdkpAnsmBEMlMfYdWx81YJgcjVyTlSCiQ0sxbqjhLKwuCTasHeNwxX bLZ4urOZGx/LCggnGna12ysFk14qWgtlXs7+EBwJGDwLsisfZc+N4uGzzofw7jgdHtde /dJgPYmf7Ij2/rESq5IrAYrl2a1FT1/YxAJyxkz/Jq197mY+iZR9+DYdycOLcAc1jxYW zs3ZrH0ZS3yq1GxM3/t1EQjyb/15hp/mQeuRsKuaL5pLtQ2gLWg2ZOCh4PH7WRjn9joH WfDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:cc:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:user-agent :mime-version:message-id:references:auto-submitted:to:date:from :dkim-signature:dkim-signature:dkim-signature; bh=4UpTT2y0hmcS0go/sqELZYromCFJ26xbIAxywIOqGsg=; fh=GFP4qDxgyJ2WEPo/oeLZg3Mj4NqvY1j2nTvTt7psNwg=; b=FokwkdrdvDv3TSNoG9mhHyUrQBhMNqBdTkli1KWkARJ7tqQCDWDMZAoEyl3AKvxNc7 1Ee/KZwiHJ104V87kXJ6dOr2X+DIFnRhoCTy495goURshlb61z7R9CQGXfCuWvNYxlkP hkIYr9+2mVtCWCt7HQBhPHCiQUsDORfLUpAlafwp+zYigxIQXprF3DH138SCPb93vC9q newCP/L5Vf5g2mm8zmh0YjUE4SJ1xcRzt3us8MpZvvlxnhb2Y64Ez1cUXNECpPDRxL21 G5rNvRBnHkSEQpLu5tFdxaChXrokHm+NcEy5R6l1uiVv1Gtra1gL2a2U6JLFHSZFrLzx D9fA==; 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=DjEVu8Ao; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=fD9QlZXL; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=d0oTc2gl; 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=openvpn.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id d5-20020a170902654500b001dc744f5313si8296435pln.193.2024.03.04.07.52.50 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2024 07:52:50 -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=DjEVu8Ao; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=fD9QlZXL; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=d0oTc2gl; 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=openvpn.net 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 1rhAc7-0000y6-Qh; Mon, 04 Mar 2024 15:52:28 +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 1rhAc5-0000y0-R1 for openvpn-devel@lists.sourceforge.net; Mon, 04 Mar 2024 15:52:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:Content-Transfer-Encoding:MIME-Version :Message-ID:Reply-To:References:Subject:List-Unsubscribe:List-Id:Cc:To:Date: From:Sender:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help: List-Subscribe:List-Post:List-Owner:List-Archive; bh=fN3wgJjxTRuiV4S4/o5m4D3DlZ0JcP/00QpEI58vnkk=; b=DjEVu8AoCt4fPl1AYgzwakfHo4 YYQ0ZKI3Du49rSMfcceiqlBinUDUmsjUjLF3iTA6iT+NLupeqPOdu2C0r9azNplmpeU8wN3Q0DUac uxOx7Ax3X6lvg52Jk8bOkn+62WA0Xlm6Wp+4pIBMGodN5iMg2qDeQRMdaxkqpB0P6nHQ=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:Content-Transfer-Encoding:MIME-Version:Message-ID:Reply-To: References:Subject:List-Unsubscribe:List-Id:Cc:To:Date:From:Sender:Content-ID :Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To: Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help:List-Subscribe:List-Post: List-Owner:List-Archive; bh=fN3wgJjxTRuiV4S4/o5m4D3DlZ0JcP/00QpEI58vnkk=; b=f D9QlZXLClzGb5Bj0h2AAiupP5cIhoB5qkTruKrLtMtH+QAalz8fiPZS6974NFPeP2+NPczh8gj3Wt x90a1x94LtW78eWN/oV9/s3p2/fLhQ75Cwzph80RMJ/4RWvwV8g3Qdf9MweJud53sMfrswS6VHwaj fFuKdxg3B6tlDx8Y=; Received: from mail-lj1-f182.google.com ([209.85.208.182]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1rhAby-00030w-Vb for openvpn-devel@lists.sourceforge.net; Mon, 04 Mar 2024 15:52:26 +0000 Received: by mail-lj1-f182.google.com with SMTP id 38308e7fff4ca-2d208be133bso62177651fa.2 for ; Mon, 04 Mar 2024 07:52:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1709567538; x=1710172338; darn=lists.sourceforge.net; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from:from:to:cc :subject:date:message-id:reply-to; bh=fN3wgJjxTRuiV4S4/o5m4D3DlZ0JcP/00QpEI58vnkk=; b=d0oTc2gl0dYA6vF+DAA/ZjIlyTstuf8vKua+Ub+N+NgVh1N1glIrxMedD/txV6QhoO 0RmUVAxY4ZYY9/gn+f92FS2K1DKJlyO58A0dQ79HUx4QYrI9oVPp/r7Ah5XuhWuuMnJ3 mXiqEz7MgO+yMS7Qvm8Eesuvq5Rx3KVmGqi559quj2WzU4jFsdGvV2Q/R59mvAaGWmYS Y0X9/fe/v8mXF8RrZW+snzMa7rZhmvxRSMr31Ym1n8pKqfWqJ8SuXwcCE5lRwWPWkqwC E5+Kr1C9xakQDl4Jon6a/elhsfF2HJlORw6ViKIQx6u0kf5mMd8kgk7bAm03ez2TsZb/ oR8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709567538; x=1710172338; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=fN3wgJjxTRuiV4S4/o5m4D3DlZ0JcP/00QpEI58vnkk=; b=myMiaNTIKyM/40NZ2j3CxjYxJ1Dt2+WBmqQ+urFYLAoU4ZsOo2G1o4q52Yat1dgb9V 0e5BXiLKk1dW9icz3oaS0MlbgHtbrUWX1KQnc15z7bhzi2j9d2plG11fT+Mwcs7w7jlc r7iabKY8jEG51rzDzqdXzJIM8RvTLUTZSqsMbY2NIS/PPdFt93QNJvJT/A4RtfelRvcj 66CVjCJJfQW06nK/+prLRf/AOMOLk1UwJCtpiuMBFMj8epqLXTvrQKprGgny6qD+oVQz NOLYkzTnv5t+3YFH2mMZJCTumViZOn0a7f6B6s3FPkIEn/LpImcwHICIpTCl08HNzey6 beGg== X-Gm-Message-State: AOJu0YzPkFOOWrWHNfLMMZmOXWtZyra0GH7Rx2twu6Hh7i5YgLjD6RZ3 kcLYTBTG2ED+1j92xVH5eIyjz+1EiYubcCb0iZBWg/NsUZ2/hQe1eEU6aRSQkPG+gYqVHN5fvzz z X-Received: by 2002:a17:906:180a:b0:a44:d6bb:ede0 with SMTP id v10-20020a170906180a00b00a44d6bbede0mr4259316eje.55.1709567205553; Mon, 04 Mar 2024 07:46:45 -0800 (PST) Received: from gerrit.openvpn.in (ec2-18-159-0-78.eu-central-1.compute.amazonaws.com. [18.159.0.78]) by smtp.gmail.com with ESMTPSA id bx18-20020a170906a1d200b00a44f07e55d2sm2528714ejb.41.2024.03.04.07.46.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 07:46:45 -0800 (PST) From: "flichtenheld (Code Review)" X-Google-Original-From: "flichtenheld (Code Review)" X-Gerrit-PatchSet: 1 Date: Mon, 4 Mar 2024 15:46:44 +0000 To: plaisthos Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange X-Gerrit-Change-Id: I38e70cb74c10848ab2981efc4c4c8863c5c8785d X-Gerrit-Change-Number: 534 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: 262cb5561737e9f7d08144e13a64ff4736969ae5 References: Message-ID: <27cafbe421852da182064d17c6b530898685fc02-HTML@gerrit.openvpn.net> MIME-Version: 1.0 User-Agent: Gerrit/3.8.2 X-Spam-Score: -0.2 (/) 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: Attention is currently required from: plaisthos. Hello plaisthos, I'd like you to do a code review. Please visit Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.182 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.182 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 WEIRD_PORT URI: Uses non-standard port number for HTTP 0.0 HTML_MESSAGE BODY: HTML included in message 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Headers-End: 1rhAby-00030w-Vb Subject: [Openvpn-devel] [XS] Change in openvpn[master]: 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: , Reply-To: frank@lichtenheld.com, arne-openvpn@rfc2549.org, openvpn-devel@lists.sourceforge.net Cc: openvpn-devel Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1792611524991810412?= X-GMAIL-MSGID: =?utf-8?q?1792611524991810412?= X-getmail-filter-classifier: gerrit message type newchange Attention is currently required from: plaisthos. Hello plaisthos, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/534?usp=email to review the following change. Change subject: Fix typo --data-cipher-fallback ...................................................................... Fix typo --data-cipher-fallback Change-Id: I38e70cb74c10848ab2981efc4c4c8863c5c8785d Signed-off-by: Frank Lichtenheld --- M doc/man-sections/generic-options.rst M src/openvpn/dco.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/34/534/1 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; }