From patchwork Tue Mar 26 10:38:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Lichtenheld X-Patchwork-Id: 3672 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:c315:b0:55c:c090:46f0 with SMTP id jk21csp2928542mab; Tue, 26 Mar 2024 03:39:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVX45pXHFmCOXkFQtWaI9os8wScJHr45NxtXw2U7FPVZcoI7Iev4ihSUQQKODeJ3zLgVJjxNEqHfEVtgzUic2joAzwAKwk= X-Google-Smtp-Source: AGHT+IFa+5opY76cuyN6k6dTsPKyNYgZCvL8SsZlwhv5Ev+S71lSaY84k+RkY17BdZsCyWnbNqhk X-Received: by 2002:a17:903:50b:b0:1db:f23f:676c with SMTP id jn11-20020a170903050b00b001dbf23f676cmr9872204plb.0.1711449586217; Tue, 26 Mar 2024 03:39:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711449586; cv=none; d=google.com; s=arc-20160816; b=JabEwh6w/TZilYKpdFocvmULtQKlDo8p7C/N7eLoDCzWzoNMXPm+MwNk2cj2x0Zs5X jOJAJKKsxCGSXo3S5unHRcBXe9EXDtVO0Ut26H0jcJ4y9szXdxO5Uu76nS7rfRUnMbcR MzIRz3p7njSnjCxJj25JlTsUEsbjSGIrgDotLkksI8IFOtywxsD6qWXaerIYOMHpGEnf zdIRvg293gjDAB0TcfcrHaJAaq18phHzFlaOYb9MoRKNYgRUOv/Kj6urfArk1Q5Rj37b cGoypa9GV71wJdRLuUW3hWETtqehsvwVg0ZgfVsA6r/E9ACoO4wtkcUaqcO9QIuWhmow 0VsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:content-transfer-encoding:cc:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature:dkim-signature; bh=dqe+x7+tC9j4qw91zivmjZDGC9eTmEp8jG3T69lZEsI=; fh=CfxSpwd5kfiMJoL3kcov7PTxVKT7pGe/79idnx9XlBs=; b=N60DuUBUG7eqdR9C+mzuNX4V+21z1+Z388uHME4YJM7qXfXFp9KXeXTqI1xW2jSsqR QGxP132Wz0ITpfeggdWnZKausxinnYn3hNxsMTGNwemAM5pgYhw4VokWu+0wkhunFa2D 9Kr52tQEmDk5snduleTHycYtOKLxzjvm1axYTLsHsatf00t5SYjOHLCxvkj2/lTpQBX1 zt86/lb0qYbLn+zZW14EMdSX4F/YuhKApSg9Tl/7/xnK9KjzIb/CvXcMVqlOY/QZ8J8e kD/aJpVSmEe2N5MA/ZzmI0IKDhNEPDLZJFRQ13JLIvr12gL+Zy/b/cFbZ7yjYWbDs7VI H+dQ==; 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=W5UvPinF; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b="ILTzS/KM"; dkim=neutral (body hash did not verify) header.i=@lichtenheld.com header.s=MBO0001 header.b=ZYwdfHTV; 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 Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id z11-20020a170903018b00b001e0b467504csi5305963plg.57.2024.03.26.03.39.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2024 03:39:46 -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=W5UvPinF; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b="ILTzS/KM"; dkim=neutral (body hash did not verify) header.i=@lichtenheld.com header.s=MBO0001 header.b=ZYwdfHTV; 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 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 1rp4D3-0002jS-Gp; Tue, 26 Mar 2024 10:39:13 +0000 Received: from [172.30.20.202] (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 1rp4D1-0002jK-1T for openvpn-devel@lists.sourceforge.net; Tue, 26 Mar 2024 10:39:11 +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:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: 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=Ce9iZmh8Fm4m+ArpwFgKjsIY5+/w8+O2NqlCRFXDyyo=; b=W5UvPinFkEqTXJg/pTDqmiTrep rz+TTIC4e1/u6K94iIlxJ0X6Pv/WNWFD/R7PiGDwboOn7rQGlOIO9xYmHMz+Nop1N8TMp+eZmxBI7 LFcdzN+4E3JZ8anW3WdHZs2ma4WfO5sCnV3H6EzvXsfNCuZnvsaP9B6+L004r1hBpqSg=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: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=Ce9iZmh8Fm4m+ArpwFgKjsIY5+/w8+O2NqlCRFXDyyo=; b=ILTzS/KMeYA2smwzWiFGy69TNk qY3QnchWcy4JgkwlZt1FtbHwa8MjX97Od6yZFHm/GxiijCD+1cN+ICjryibHVX+BbggqbyDPFgdQ4 /68kD4JRHUeTMABocaAka7EUPQFXbVu6hR9ij8tJaYJWSGZy8dobLn20qEMugwfmOQ9Y=; Received: from mout-p-101.mailbox.org ([80.241.56.151]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1rp4Cy-00083n-Ku for openvpn-devel@lists.sourceforge.net; Tue, 26 Mar 2024 10:39:11 +0000 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4V3mW34Bjgz9sq4; Tue, 26 Mar 2024 11:38:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lichtenheld.com; s=MBO0001; t=1711449535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ce9iZmh8Fm4m+ArpwFgKjsIY5+/w8+O2NqlCRFXDyyo=; b=ZYwdfHTVvR1Ad7jT/6ZgU9Sw7cc5a6c7QgctSn+pQidQLc9+d+/iRvMvu1xlLoku8FjpvC 09uG8HLVLMTnMIK+g8yIfPWkX/wyT6F3ILq3ztIGECc0Fi2NBpwV+/p0jb3biXhO8Yf2sv 2oO9YWfAkdB3R/tvzyJoe8phXcOfHO/AUobMlXpCSY+WTo+ltyiJVC/Z/Zedk51tVipVR+ Y0t62jv28b48Pno0djTGEVKXXu582ljsQdkR48/vdBPDD+nV83qiXwLrJb1FKCrKbUqV6c dOKkrUX6xq1LYIy82yCXtWe8jbgS35MAEr0XmOFd4b9+xQTogSpZO5lKIzDwMw== From: Frank Lichtenheld To: openvpn-devel@lists.sourceforge.net Date: Tue, 26 Mar 2024 11:38:53 +0100 Message-Id: <20240326103853.494572-1-frank@lichtenheld.com> In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: 4V3mW34Bjgz9sq4 X-Spam-Score: -0.9 (/) 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: From: Arne Schwabe Change-Id: Ia73d53002f4ba2658af18c17cce1b68f79de5781 Signed-off-by: Arne Schwabe Acked-by: Frank Lichtenheld --- Content analysis details: (-0.9 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [80.241.56.151 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -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 X-Headers-End: 1rp4Cy-00083n-Ku Subject: [Openvpn-devel] [PATCH v1] Add bracket in fingerprint message and do not warn about missing verification 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: Arne Schwabe Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1794584961313073851?= X-GMAIL-MSGID: =?utf-8?q?1794584961313073851?= From: Arne Schwabe Change-Id: Ia73d53002f4ba2658af18c17cce1b68f79de5781 Signed-off-by: Arne Schwabe Acked-by: Frank Lichtenheld --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/546 This mail reflects revision 1 of this Change. Signed-off-by line for the author was added as per our policy. Acked-by according to Gerrit (reflected above): Frank Lichtenheld Note: Missing whitespace added for submission. diff --git a/src/openvpn/init.c b/src/openvpn/init.c index f2ce926..a398920 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -3594,7 +3594,8 @@ && !o->tls_verify && o->verify_x509_type == VERIFY_X509_NONE && !(o->ns_cert_type & NS_CERT_CHECK_SERVER) - && !o->remote_cert_eku) + && !o->remote_cert_eku + && !(o->verify_hash_depth == 0 && o->verify_hash)) { msg(M_WARN, "WARNING: No server certificate verification method has been enabled. See http://openvpn.net/howto.html#mitm for more info."); } diff --git a/src/openvpn/ssl_verify.c b/src/openvpn/ssl_verify.c index c7d7799..930769b 100644 --- a/src/openvpn/ssl_verify.c +++ b/src/openvpn/ssl_verify.c @@ -718,8 +718,8 @@ 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" - "certificate hash verification failed. (got " - "fingerprint: %s", hex_fp); + "certificate hash verification failed. (got certificate " + "fingerprint: %s)", hex_fp); goto cleanup; } }