From patchwork Fri Dec 11 01:59:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1547 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director11.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net with LMTP id UHwxIJ5t018BKwAAIUCqbw (envelope-from ) for ; Fri, 11 Dec 2020 08:01:18 -0500 Received: from proxy18.mail.iad3b.rsapps.net ([172.31.255.6]) by director11.mail.ord1d.rsapps.net with LMTP id SDgFIJ5t01/mSgAAvGGmqA (envelope-from ) for ; Fri, 11 Dec 2020 08:01:18 -0500 Received: from smtp19.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy18.mail.iad3b.rsapps.net with LMTPS id uHSjFp5t018sUAAA3NpJmQ (envelope-from ) for ; Fri, 11 Dec 2020 08:01:18 -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: smtp19.gate.iad3b.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: f4bb957c-3bb0-11eb-a119-525400cbaf6c-1-1 Received: from [216.105.38.7] ([216.105.38.7:49972] helo=lists.sourceforge.net) by smtp19.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id EE/D0-20932-D9D63DF5; Fri, 11 Dec 2020 08:01:17 -0500 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.90_1) (envelope-from ) id 1kni21-0000if-6n; Fri, 11 Dec 2020 13:00:21 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kni20-0000iO-1O for openvpn-devel@lists.sourceforge.net; Fri, 11 Dec 2020 13:00:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding: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=ihEffOvX+8lEDHRiwJfA9qtEg8k4IOQwEsdoyz3YLVw=; b=gEsMMLSUQcEetRZGVipOhmPte/ Y81zcmw6eB5MxPBwTO9t7MOHrP9epdIecuV3x5wbtC3Rop/S/13hu0/jabZ4dS9tyS1SfUVIM0oQY 0PGqirrp1v2+mS0h6QVU7K8d3q8gUDP4yNDA8El4H3fS1V+BO4lbD69Hc8CGmvFG+FEg=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:MIME-Version: Content-Type:Content-Transfer-Encoding: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=ihEffOvX+8lEDHRiwJfA9qtEg8k4IOQwEsdoyz3YLVw=; b=UjfZiCS6JNSCyhKrr63ADhOqf1 mLdR6y2TTILbl0WDntkF1swsfHzosarYoVcgtz2XOmQNfl8Ln6eZ7fB8Sv9iMB6Eo38E8l2hs6E4h MnknNVil6pSwdvSaPuGFBL+CZ1j6h8qCrWVjh75L37zymhW1n/5oTHWvoG1P6svPXAmQ=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1kni1u-00A5UF-1f for openvpn-devel@lists.sourceforge.net; Fri, 11 Dec 2020 13:00:19 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.94 (FreeBSD)) (envelope-from ) id 1kni1d-0001Jd-7k for openvpn-devel@lists.sourceforge.net; Fri, 11 Dec 2020 13:59:57 +0100 Received: (nullmailer pid 7809 invoked by uid 10006); Fri, 11 Dec 2020 12:59:57 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Fri, 11 Dec 2020 13:59:57 +0100 Message-Id: <20201211125957.7764-1-arne@rfc2549.org> X-Mailer: git-send-email 2.17.1 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 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: rfc2549.org] 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Headers-End: 1kni1u-00A5UF-1f Subject: [Openvpn-devel] [PATCH] Fix tls-auth mismatch OCC message when tls-cryptv2 is used. 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: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox A server with tls-cryptv2 and tls-auth produces the warning: WARNING: 'tls-auth' is present in local config but missing in remote config, local='tls-auth'" The tls-auth option has no argument so the strpefix with the space included does not match it. Signed-off-by: Arne Schwabe Acked-by: Steffan Karger --- 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 d824cbad..d9d492b2 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -4138,7 +4138,7 @@ options_warning_safe_scan2(const int msglevel, if (strprefix(p1, "key-method ") || strprefix(p1, "keydir ") || strprefix(p1, "proto ") - || strprefix(p1, "tls-auth ") + || streq(p1, "tls-auth") || strprefix(p1, "tun-ipv6") || strprefix(p1, "cipher ")) {