From patchwork Mon Jul 22 11:35:48 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: 3772 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:6242:b0:5a1:d4fc:4ac6 with SMTP id v2csp1869112mad; Mon, 22 Jul 2024 04:36:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVyyt2OlrEP/Qx+arszVoViUGMIoIxWceFwPeckY2G9wbzQCDxcL3bIo2gxtAxjujqlbiSx9aOg9AGiKu65xCaQLqbarq8= X-Google-Smtp-Source: AGHT+IH6HaooU12d28o9WYFc5qs+61OYBvPHQtvhy4Is2nqSJVht26pT+oMWd4Q4KB3SsUR34jX2 X-Received: by 2002:a05:6870:224e:b0:254:a7df:721b with SMTP id 586e51a60fabf-261215a27d3mr3696486fac.5.1721648201953; Mon, 22 Jul 2024 04:36:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1721648201; cv=none; d=google.com; s=arc-20160816; b=ocJ6t6GKJ3YYKhXxqzdUQHI+O6DsKTbUPc10Siw0VAkiMbz5fAGm2iGp7fhfmDfn1F b15aMFSA750VUnRwrqAWOe4LZ3qIo4TdPPBuRK5W5pj8pbvpLeuG5hNerfbRfltlQEEZ Bkfs/MZMyl/t/6+YRWlIWLWd8jmHPQalMexXz3N2m5QT6KNB1XAL3KnnSleoArJ/NBic L6UIyyrMM7uZYogI4O9SJfi1Ewoij91I4BXfZ6/0uIq8jgeaTESwBxjjh0H+z999la+T fvdSqBf0EUXCXVu5CMOAKMf75fmwOQTBG4eZR5no3YDRszRXJU66tuQ3KnHCUK5iMruV PP9w== 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=3v/HUmQ4upF6o1nZbsl6KrSxY1kQgqDoe7Gq/HchmTc=; fh=GFP4qDxgyJ2WEPo/oeLZg3Mj4NqvY1j2nTvTt7psNwg=; b=OkDZSaflj1BtsDa/2gthr4nUCIJszbd1lbRYFra5yObY9kTjMFewWbRlcdsOs6/CWW nVHW8QWIZsYfQoeDrnmihIlqY/h7XLzOl7jt9Ymm7pGqW06lwE8xyeUIGdN1KDfHP99X +Jv1io3f0NHBWymPqW1tEHr8a8ZN/QzEDSr3w103y9b3yeHpeZNhcvBiByZzMGEYtp2e OhdtkSRwVybkkaHfZaF+CGv6Pw7os658eCUFTFa6unr1rm+lEIJOt0vyK9jcN4dnEYD1 gQrPL/FBF64ddrohA8oYxoHHNXqreaLk4KDBGsEPxlSPRAOUTbPSzJBEQDuBJeIpOKyn HHjA==; 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=Jc5XGB+M; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=Oos5x9JN; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=Kfi5KR5H; 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; dara=fail header.i=@openvpn.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 41be03b00d2f7-79f0ef7084dsi6187659a12.287.2024.07.22.04.36.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jul 2024 04:36:41 -0700 (PDT) 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=Jc5XGB+M; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=Oos5x9JN; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=Kfi5KR5H; 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; dara=fail header.i=@openvpn.net Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1sVrKm-0006FY-JK; Mon, 22 Jul 2024 11:36:04 +0000 Received: from [172.30.29.67] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1sVrKk-0006FS-MZ for openvpn-devel@lists.sourceforge.net; Mon, 22 Jul 2024 11:36:02 +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=8iz4Fzpv/2L6eD15asrLnLcRe6me9wsLOhz4LjA1Hdc=; b=Jc5XGB+M9Qq2I2MgOBxzzy2684 5wU9IL9ZuGVLdwhQ2Q1yAWy50uETtmzn3KK+olimoSeh7ksBbbAk02m4x4xM93VdTxSBgrqDd8n9X 7vwG+PcddXAybUcC9WomwPyOh6z4mUgFy+vHyOn6GOT35dpRrMCNBDPW7lD8WvrQUDTs=; 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=8iz4Fzpv/2L6eD15asrLnLcRe6me9wsLOhz4LjA1Hdc=; b=O os5x9JNOz8MfobnlhzQonrqsHVoyUPTTrdSeB9SMQlQUHM6TxuXbmGs5C7Q9ISlxWAXIM4HkWKba+ wF6fUD8BYgaL96PH+mrAKFApDKB5wBGn8ZNeLLhWW32xSHy0abVChXxZxclq//DcQhUjSP64uif7o 3B7GjJHoz0Jq+Gek=; Received: from mail-wm1-f41.google.com ([209.85.128.41]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1sVrKj-0000JL-Ck for openvpn-devel@lists.sourceforge.net; Mon, 22 Jul 2024 11:36:02 +0000 Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-4266fd395eeso29843305e9.3 for ; Mon, 22 Jul 2024 04:36:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1721648150; x=1722252950; 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=8iz4Fzpv/2L6eD15asrLnLcRe6me9wsLOhz4LjA1Hdc=; b=Kfi5KR5H+/d3+KqbckKIYiyvXTNKtxGxYdnoytT8L7K+Fk1ZFUa9urlRWk8u6Z8fPY MhI1oj9q/InoLLU6xyf519OYJdj3OMJtIferDqQs3z0kiYf7DeAj1K5kXOXnAWL6IjFt cMRIqU509wK6Ly2JRJEcLWmgYUeBfL3USvlw86tli5E8QJb9c6JwhPPHK6lc3Mb2uAGZ s1XzSD6ui6YIBAVZZMG7iCf6ym+34w0Yq7k/qAJGYylY9yhR0JYiFCUBtf34ngOBtB2B Cpv31LLInFMgd2HPU/KMNem/McJR8gbxShRR6T2/Hineq6AIA5HAh0JcfY9Ob0hMJnP5 WyqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721648150; x=1722252950; 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=8iz4Fzpv/2L6eD15asrLnLcRe6me9wsLOhz4LjA1Hdc=; b=l4H/7lvC6tvUheYXA+VckYx+HdNsveH4rFXLwSrWZqLNnjru5bfdci4/bpk6edvrH4 p56kqZuuvT5WjIPqv9t2pDvtEKwE2/m/dBBnCoag2SPK9zerEzeF6ndWQZfX6EOk88Kq lBR7Q3jcAO2BafyImbofXALbnPpNe0K21W/jn3dxJ10qW9N+l92ToCNeB1min30I0lea M8HXWAEZeD2abeimJ+0WDRj1W8CVOyazRxSbqcIiIJ/e2lFA015/Y+cXCFwXmBTXKLw1 8CkQSHGKzYOmDqR2xXY4wkNZdL0TCe1D/6Yg8yCSV/pHydky3eMLt09TvWQlYQJFg7y9 eGnQ== X-Gm-Message-State: AOJu0Yzpd3kTpnFiFvsKjoasSMSrs2iX83ZxwwVd8uu9hCRR1mwEBEIC PMw8iscwUnDgLaf83itb2wzPOZK21NeqYRUyEmMJrXacme4s2X5juLNqHP2VQ2vjseH6dDyQXds K X-Received: by 2002:a05:600c:468b:b0:426:5416:67de with SMTP id 5b1f17b1804b1-427dc58f5bdmr38401315e9.30.1721648149796; Mon, 22 Jul 2024 04:35:49 -0700 (PDT) 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 ffacd0b85a97d-368787ec6a8sm8226541f8f.95.2024.07.22.04.35.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jul 2024 04:35:49 -0700 (PDT) From: "flichtenheld (Code Review)" X-Google-Original-From: "flichtenheld (Code Review)" X-Gerrit-PatchSet: 1 Date: Mon, 22 Jul 2024 11:35:48 +0000 To: plaisthos Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange X-Gerrit-Change-Id: Ic27d84c74c1dd6ff7973ca6966d186f475c67e21 X-Gerrit-Change-Number: 679 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: a3a7ede5d48ccf9ae7e92be076cf3d7892f97ba4 References: Message-ID: <9157d13486f6b44d891aae6bc5f935d1d000f991-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-2.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_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to DNSWL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [209.85.128.41 listed in list.dnswl.org] 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: openvpn.net] 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [209.85.128.41 listed in sa-trusted.bondedsender.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [209.85.128.41 listed in bl.score.senderscore.com] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.41 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -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_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML X-Headers-End: 1sVrKj-0000JL-Ck Subject: [Openvpn-devel] [S] Change in openvpn[master]: Fix missing spaces in various messages 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?1805278985044270045?= X-GMAIL-MSGID: =?utf-8?q?1805278985044270045?= 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/+/679?usp=email to review the following change. Change subject: Fix missing spaces in various messages ...................................................................... Fix missing spaces in various messages These result from broken up literals where it is easy to miss the missing space. Change-Id: Ic27d84c74c1dd6ff7973ca6966d186f475c67e21 Signed-off-by: Frank Lichtenheld --- M src/openvpn/dco.c M src/openvpn/multi.c M src/openvpn/options.c M src/openvpn/ssl_verify.c 4 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/79/679/1 diff --git a/src/openvpn/dco.c b/src/openvpn/dco.c index 78243b1..7f0d53d 100644 --- a/src/openvpn/dco.c +++ b/src/openvpn/dco.c @@ -185,7 +185,7 @@ } else { - msg(D_DCO_DEBUG, "Swapping primary and secondary keys to" + msg(D_DCO_DEBUG, "Swapping primary and secondary keys to " "primary-id=%d secondary-id=(to be deleted)", primary->key_id); } diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 162b23e..03177bb 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -1804,7 +1804,7 @@ } else if (dco_enabled(o)) { - msg(M_INFO, "Client does not support DATA_V2. Data channel offloaing " + msg(M_INFO, "Client does not support DATA_V2. Data channel offloading " "requires DATA_V2. Dropping client."); auth_set_client_reason(tls_multi, "Data channel negotiation " "failed (missing DATA_V2)"); @@ -1815,7 +1815,7 @@ * not accept our pushed ciphers */ if (proto & IV_PROTO_NCP_P2P) { - msg(M_WARN, "Note: peer reports running in P2P mode (no --pull/--client" + msg(M_WARN, "Note: peer reports running in P2P mode (no --pull/--client " "option). It will not negotiate ciphers with this server. " "Expect this connection to fail."); } @@ -2027,7 +2027,7 @@ /* Not EOF but other error -> fall through to error state */ default: /* We received an unknown/unexpected value. Assume failure. */ - msg(M_WARN, "WARNING: Unknown/unexpected value in deferred" + msg(M_WARN, "WARNING: Unknown/unexpected value in deferred " "client-connect resultfile"); ret = CC_RET_FAILED; } @@ -2427,7 +2427,7 @@ */ if (!mi->context.c2.push_ifconfig_defined) { - msg(D_MULTI_ERRORS, "MULTI: no dynamic or static remote" + msg(D_MULTI_ERRORS, "MULTI: no dynamic or static remote " "--ifconfig address is available for %s", multi_instance_string(mi, false, &gc)); } @@ -2443,7 +2443,7 @@ print_in_addr_t(mi->context.options.push_ifconfig_constraint_netmask, 0, &gc); /* JYFIXME -- this should cause the connection to fail */ - msg(D_MULTI_ERRORS, "MULTI ERROR: primary virtual IP for %s (%s)" + msg(D_MULTI_ERRORS, "MULTI ERROR: primary virtual IP for %s (%s) " "violates tunnel network/netmask constraint (%s/%s)", multi_instance_string(mi, false, &gc), print_in_addr_t(mi->context.c2.push_ifconfig_local, 0, &gc), @@ -2492,7 +2492,7 @@ } else if (mi->context.options.iroutes) { - msg(D_MULTI_ERRORS, "MULTI: --iroute options rejected for %s -- iroute" + msg(D_MULTI_ERRORS, "MULTI: --iroute options rejected for %s -- iroute " "only works with tun-style tunnels", multi_instance_string(mi, false, &gc)); } diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 64e67aa..ba9b05e 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -7033,7 +7033,7 @@ } else if (streq(p[0], "max-routes") && !p[2]) { - msg(M_WARN, "DEPRECATED OPTION: --max-routes option ignored." + msg(M_WARN, "DEPRECATED OPTION: --max-routes option ignored. " "The number of routes is unlimited as of OpenVPN 2.4. " "This option will be removed in a future version, " "please remove it from your configuration."); @@ -9328,7 +9328,7 @@ s++; } msg(M_WARN, "DEPRECATED FEATURE: automatically upcased the " - "--x509-username-field parameter to '%s'; please update your" + "--x509-username-field parameter to '%s'; please update your " "configuration", p[j]); } } diff --git a/src/openvpn/ssl_verify.c b/src/openvpn/ssl_verify.c index 934ff8d..0b0e2c3 100644 --- a/src/openvpn/ssl_verify.c +++ b/src/openvpn/ssl_verify.c @@ -717,7 +717,7 @@ { const char *hex_fp = format_hex_ex(BPTR(&cert_fp), BLEN(&cert_fp), 0, 1, ":", &gc); - msg(D_TLS_ERRORS, "TLS Error: --tls-verify/--peer-fingerprint" + msg(D_TLS_ERRORS, "TLS Error: --tls-verify/--peer-fingerprint " "certificate hash verification failed. (got certificate " "fingerprint: %s)", hex_fp); goto cleanup;