From patchwork Mon Jun 7 08:48:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 1852 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director14.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id kJQYE+RwvmBOHwAAIUCqbw (envelope-from ) for ; Mon, 07 Jun 2021 15:17:56 -0400 Received: from proxy7.mail.ord1d.rsapps.net ([172.30.191.6]) by director14.mail.ord1d.rsapps.net with LMTP id KK30EuRwvmCDCwAAeJ7fFg (envelope-from ) for ; Mon, 07 Jun 2021 15:17:56 -0400 Received: from smtp26.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy7.mail.ord1d.rsapps.net with LMTPS id eIuyEuRwvmBDUgAAMe1Fpw (envelope-from ) for ; Mon, 07 Jun 2021 15:17:56 -0400 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: smtp26.gate.ord1c.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; dkim=fail (signature verification failed) header.d=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: 0f88483c-c7c5-11eb-b9f6-b8ca3a5bd12c-1-1 Received: from [216.105.38.7] ([216.105.38.7:54206] helo=lists.sourceforge.net) by smtp26.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id E1/3B-44693-3E07EB06; Mon, 07 Jun 2021 15:17:55 -0400 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.92.3) (envelope-from ) id 1lqKk1-0003Tv-6z; Mon, 07 Jun 2021 19:16:53 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) (envelope-from ) id 1lqKjz-0003Tn-PP for openvpn-devel@lists.sourceforge.net; Mon, 07 Jun 2021 19:16:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:Content-Type:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: 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=noyupykxeRWOcKdVuUIXyINFksqXRWB4Wx4EMGB7bsc=; b=SYTxvdH5ZCHIfuGrwVqL066p/B OkZqaWJu98BXzDqmLacb6M0zmnqRB0v+wUwa2y3Bl+0Tusc5P2w/dIr+Q3bB29radADoifwCHiPDA 9Ysti8gpDyPmt8qH/gv1dZZ49hCVOwBc2mQp6OwVfrVLMCG4D+fif/15qStrhKVOZq2Y=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: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=noyupykxeRWOcKdVuUIXyINFksqXRWB4Wx4EMGB7bsc=; b=Wrpfhx8Figh8v9ranjSrl+Yyek lPS8yKE1BpRmcGisutNZzuKD5skV5RpjuqECIJx0PT6pXgTwF40Ii4whgo7Xcb/eO+2pD8yxj2i6O bHH6XgtOm+lxyymcOMEPJdV1pIrG6FfBzNLyamNYsQyJPKi14V67lTMxScIM1nuETf08=; Received: from mail-lf1-f51.google.com ([209.85.167.51]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.3) id 1lqKjs-00038R-Ox for openvpn-devel@lists.sourceforge.net; Mon, 07 Jun 2021 19:16:52 +0000 Received: by mail-lf1-f51.google.com with SMTP id w33so28134347lfu.7 for ; Mon, 07 Jun 2021 12:16:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=noyupykxeRWOcKdVuUIXyINFksqXRWB4Wx4EMGB7bsc=; b=F0R28i/k6BF8BfzOxcKYntMr2krOAnmWKLmsMfnEJ7kiyJ4VWalqFKzZBM9NPzzOpF 45bnTAGKnB4pKwX5oKGtJKPPK/ov2HlFKiA6ma+h6sZhizFUbMBACkx5d4xjNfOiXNs7 sz5e2i4MYlb7+OKrUVsVheBsWDvMgfuhMyGJdpNeHFcbgihaXHaLoSaDxf0Ge8qNMdFw d4lPedS7/qfZlrhV93iINjxQgCsfW9zOrBjaX6ZyFS/k7ZsAevjhdm0Ns6s/oqlFCyo6 LN/nq5LeNx5jfdzUdmFjLf4UOu3rbCCSWFc4id/8frTN2vc5tWbxEJETztOnFZZuZlac BZ2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=noyupykxeRWOcKdVuUIXyINFksqXRWB4Wx4EMGB7bsc=; b=OoL1PCL6aeWjgBm7oclA61IijUTrYifaAOB6Q7ZmMlD7lDFqm0XFhvsMx8lA+EZ+uy jIGlIa56/n5h6WQpUB3inUdMuiq1wh2hQphfOu10rzlLmWswvNJRgYkOgfnyqyRgK8O9 0nATe3v/Oh4xCkYy2F6gj7JCOO/N7V3QYWqY1/UBo0Jw7i5hOQHSDpwy305IaPrthbJY M64qiJHGzTJnHSXqpC2MQvqzrch3zs1OCQb8+LWfBp5kpRG4NFxNFw2jZabNRNDmjShS nEEjZ2k0Eoo75Nk/3pfHRjH+vTNeAnb31bk0q0MlgbIOF6v0RmbvfKWau81iIrCMiuFr z0Tw== X-Gm-Message-State: AOAM5329DOq2n/fAnTsSlQSUJ0bjQPSLHGTxfdjWJzqjHuKljoKZopkW WKbQoUySf3AWHuQo6yC1QIfEf7IGWs3r8A== X-Google-Smtp-Source: ABdhPJydDGpT/YjgdRafibYm2dLfPQrefBpi2FsjWYdyLnCT8L1Ub9s7eyI7XAOC4EwA4DMlS3KK6w== X-Received: by 2002:a19:640c:: with SMTP id y12mr12629659lfb.42.1623093398726; Mon, 07 Jun 2021 12:16:38 -0700 (PDT) Received: from LAPTOP-4L3N7KFS.localdomain (81-175-157-115.bb.dnainternet.fi. [81.175.157.115]) by smtp.gmail.com with ESMTPSA id 28sm1602361lfr.232.2021.06.07.12.16.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 12:16:37 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Mon, 7 Jun 2021 21:48:20 +0300 Message-Id: <20210607184820.343-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210607182602.273-1-lstipakov@gmail.com> References: <20210607182602.273-1-lstipakov@gmail.com> MIME-Version: 1.0 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.167.51 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (lstipakov[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -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.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.167.51 listed in wl.mailspike.net] X-Headers-End: 1lqKjs-00038R-Ox Subject: [Openvpn-devel] [PATCH v2] options.c: fix msvc build error 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: , Cc: Lev Stipakov Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Lev Stipakov Commit b7fe49c ("Do not require CA when peer-fingerprint is used") broke msvc build by adding #ifdef within msg() macro call. options.c(2074,1): error C2121: '#': invalid character: possibly the result of a macro expansion options.c(2074,1): error C2146: syntax error: missing ')' before identifier 'ifndef' options.c(2074,1): error C2059: syntax error: ')' Fix by moving #ifdef outside of msg(). Reported-by: Samuli Seppänen Signed-off-by: Lev Stipakov Acked-by: Gert Doering --- v2: - fix typo in "fingerprint" - remove unneeded quotation marks src/openvpn/options.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 6bbe5c15..a36d270e 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -2067,11 +2067,12 @@ check_ca_required(const struct options *options) return; } - msg(M_USAGE, "You must define CA file (--ca)" + const char* str = "You must define CA file (--ca)" #ifndef ENABLE_CRYPTO_MBEDTLS " or CA path (--capath)" #endif - " and/or peer fingeprint verification " "(--peer-fingerprint)"); + " and/or peer fingerprint verification (--peer-fingerprint)"; + msg(M_USAGE, str); } static void