From patchwork Sat Apr 17 00:05:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 1747 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 UFBVN2+0emCRJQAAIUCqbw (envelope-from ) for ; Sat, 17 Apr 2021 06:11:59 -0400 Received: from proxy5.mail.ord1d.rsapps.net ([172.30.191.6]) by director14.mail.ord1d.rsapps.net with LMTP id wKo1N2+0emCNcQAAeJ7fFg (envelope-from ) for ; Sat, 17 Apr 2021 06:11:59 -0400 Received: from smtp1.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy5.mail.ord1d.rsapps.net with LMTPS id eO/tNm+0emDJfwAA8Zzt7w (envelope-from ) for ; Sat, 17 Apr 2021 06:11:59 -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: smtp1.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=greenie.muc.de X-Suspicious-Flag: YES X-Classification-ID: 5854f160-9f65-11eb-ad0f-5254002d775b-1-1 Received: from [216.105.38.7] ([216.105.38.7:40338] helo=lists.sourceforge.net) by smtp1.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 81/44-04360-F64BA706; Sat, 17 Apr 2021 06:11:59 -0400 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.90_1) (envelope-from ) id 1lXhqA-0003rb-DY; Sat, 17 Apr 2021 10:06:14 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXhq9-0003rU-EY for openvpn-devel@lists.sourceforge.net; Sat, 17 Apr 2021 10:06:13 +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=72zJ7pHMoiBa75HIyp/3I6cGE3Lh495ulxRFzaLB9bM=; b=KcBmGOFW+VsKpEGf09zr/RRR4c fPEGgVjYznwHFd8RlCnmdXXuzyKT83ODQSEEG/89aL1FjhGv7Blt6y25vHsz+kBelRSG86LIvFkUR TD72YaBjGB/YCGBrSY4SGo6VMv90uutH9VDmslMA9v5U88jo3oW48LxuZVBTadCQZ77E=; 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=72zJ7pHMoiBa75HIyp/3I6cGE3Lh495ulxRFzaLB9bM=; b=P WP/9Yy3mJlKYkmBuEOIM/Lik9R+SkIKuixc0n0qftCojolhwsxuQWqc0KU8IlYDvoEG5KebhzGDMs B4Olj+QKcwl59SBy0QcXvIkKsgi/LGTUr8glKTIgE/Cat7W0h7nrEIxFAXyISprcQunhGmzwGvbpD DQacLDq3pcKVUUuA=; 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 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) id 1lXhpt-0002Sb-VO for openvpn-devel@lists.sourceforge.net; Sat, 17 Apr 2021 10:06:13 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.15.2/8.14.9) with ESMTP id 13HA5kVb005547 for ; Sat, 17 Apr 2021 12:05:46 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.15.2/8.14.9/Submit) id 13HA5kCb005546 for openvpn-devel@lists.sourceforge.net; Sat, 17 Apr 2021 12:05:46 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Sat, 17 Apr 2021 12:05:44 +0200 Message-Id: <20210417100544.5497-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 TIME_LIMIT_EXCEEDED Exceeded time limit / deadline X-Headers-End: 1lXhpt-0002Sb-VO Subject: [Openvpn-devel] [PATCH] Repair --secret depreciation warning. 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 commit 60f5889ae formally depreciated use of configs without either "tls-client" or "tls-server" - but got the booleans wrong. Fix. Signed-off-by: Gert Doering Acked-by: Antonio Quartulli --- src/openvpn/options.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 3dd22d52..ef854c76 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -2541,7 +2541,7 @@ options_postprocess_verify_ce(const struct options *options, msg(M_USAGE, "specify only one of --tls-server, --tls-client, or --secret"); } - if (!options->tls_server || !options->tls_client) + if (!options->tls_server && !options->tls_client) { msg(M_INFO, "DEPRECATION: No tls-client or tls-server option in " "configuration detected. OpenVPN 2.7 will remove the "