From patchwork Mon Jun 2 15:21:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4272 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:9994:b0:667:60b:5921 with SMTP id d20csp2636716mav; Mon, 2 Jun 2025 08:21:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVnOwU/XE3cTkMMHSuRxeBSRm6ucv7bUCNfqoUOld520h+JIhLQB6BNXSVh7DRZmsD6j2epCzmeIkk=@openvpn.net X-Google-Smtp-Source: AGHT+IGLhDzw3e8fF9XJCSKaufpXG53JCE6aWSRsdbi0C6Ec3jb/XEelTqVpx1q71D0mU9c0Oy7p X-Received: by 2002:a05:6820:d0a:b0:60e:cf85:c0d3 with SMTP id 006d021491bc7-60ecf85c375mr2957480eaf.0.1748877689281; Mon, 02 Jun 2025 08:21:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748877689; cv=none; d=google.com; s=arc-20240605; b=hZNhKNfmmbTCBSqB2nFnkXKmEDB0tFaBNsloswuJQ3KBm1LJmrKFS/wnXcQ4FHSLil EXpp7xzob09g3tl4NjnqV54HNyFwBYDPuukUWw4tG/87RhpL/pSPf1e5GUvA+Gf83xXy INih5iPOiGNWb8+8klsSiDUI6hYOigzk0giF58me37DeVmfcLujQupusgXAupVQNuQZn aC8MbExJZxTrZRnHPfuxwitpZHayPkU0Fs0WNMYMZfBycRTF0fP8JR9uJnUTgy0DxCYK d8yUnlKMBp38eK19iPPSItHEw4lsgqhz8+6wD94h5fLGn6cBOJe88jlUENFarWi7YhvR 8s8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:content-transfer-encoding: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=TPlh1L/W2W+ir5jS/bqGJ9eeVJV5NBEq9EUbVIN+ueg=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=lJGBRtOspDBeqLaepX6Hoy15cuUFVyQfpVNLghV0gvSoIDmwOn1YmNuCkiuPSRoX8O BKKriqhOosOUKbgW5lGpeq27m6eTvcFRN/P7qYot4bhrmTZT/RBHxP7aKkM7VdFK7X21 4ZUtwCHCeApoQCk5ggTX4yfi7O4YSzOTopLXtcAmOx4K9Dfj9bCk1CqvJ2wubqDVhoRJ nFcVy/Sn9yevNseSuify4kNzoHzMM65DNL2LVSG5GNZV/K6yN0OrVXjPEJLk+O5DiXQD Zfo+yUW4Sh2JQ6pd82l3LEFd7NtYCH5AJ5fjSBHb6mAWcG0BrXJ5PHpFsfrdZP6uAbqQ 6pKQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b="bdVj/oq6"; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=Gfd2L0jm; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=NrZQ2UTE; 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=muc.de Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 006d021491bc7-60c1eb9bfa0si4150037eaf.54.2025.06.02.08.21.28 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Jun 2025 08:21:28 -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=pass header.i=@lists.sourceforge.net header.s=beta header.b="bdVj/oq6"; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=Gfd2L0jm; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=NrZQ2UTE; 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=muc.de DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Subject:MIME-Version:References:In-Reply-To:Message-ID:Date:To:From:Sender: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=TPlh1L/W2W+ir5jS/bqGJ9eeVJV5NBEq9EUbVIN+ueg=; b=bdVj/oq6vbhRMfzxf76Ve8LyNx 1JKrcnwVasbajLHo4mh/GVhWug+xQuEHwxC0ZC36JTPFUhUQur9L/yP+APXtXzsacWVfUSPEn+G9q wFajT0FkEDbBsWVz/joUUKgQdY2jOqw85VYNcOA/+Ew3oRyrb4q6w2CN0CAxJra+V73w=; 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 1uM6yc-0003Of-RC; Mon, 02 Jun 2025 15:21:26 +0000 Received: from [172.30.29.66] (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 1uM6yb-0003OZ-D3 for openvpn-devel@lists.sourceforge.net; Mon, 02 Jun 2025 15:21:25 +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: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:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=g8ziZY2BJlaQksxVeC4o/lifXXtKHv7XTUCgzdbwqCs=; b=Gfd2L0jmt+VcN2Vc/WKXkAOnR3 PyA5exe3T+r3wXR34w79OfkF0TPyNUEeRxDVo+ZKQ3xhzHCNS+9v3yfL2bex7llHClDrhHJb90voL d2y7OEWlrzcrL5gAj8k2WNk+IPl9n2RoMTA2fxhCdCBcOiRc1plGn9j5BpP2PaztZXcI=; 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: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:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=g8ziZY2BJlaQksxVeC4o/lifXXtKHv7XTUCgzdbwqCs=; b=NrZQ2UTEYmd9Ugf0QCJa1C0C5O p15DLR6X0O71za11YCvCvVHpnJpCP9gKOsoeMhOsqYQap/WUHCH5koAhvraWpLEFE8nfPoFp+3uks JStSaf/CS7qb2+OpNU+WLEvNYdnrwrk9W0OqDsdj8LzydiwsO6LCS4HHZJCGAAabm69Q=; Received: from [193.149.48.143] (helo=blue.greenie.muc.de) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1uM6yZ-0005YK-92 for openvpn-devel@lists.sourceforge.net; Mon, 02 Jun 2025 15:21:25 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.17.1.9/8.17.1.9) with ESMTP id 552FLGXV027147 for ; Mon, 2 Jun 2025 17:21:16 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.17.1.9/8.17.1.9/Submit) id 552FLG9R027145 for openvpn-devel@lists.sourceforge.net; Mon, 2 Jun 2025 17:21:16 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Mon, 2 Jun 2025 17:21:08 +0200 Message-ID: <20250602152115.27130-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: 1.7 (+) X-Spam-Report: Spam detection software, running on the system "util-spamd-1.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: Frank Lichtenheld Change-Id: I0e13595c1057c680e1065eae84ca94b273ed9ca1 Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering --- Content analysis details: (1.7 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 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. [193.149.48.143 listed in sa-accredit.habeas.com] 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. [193.149.48.143 listed in bl.score.senderscore.com] 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.4 NO_DNS_FOR_FROM DNS: Envelope sender has no MX or A DNS records 0.0 SPF_HELO_FAIL SPF: HELO does not match SPF record (fail) [SPF failed: Rejected by SPF record] 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS X-Headers-End: 1uM6yZ-0005YK-92 Subject: [Openvpn-devel] [PATCH v1] Do not segfault on missing --dh in server config 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 X-GMAIL-THRID: =?utf-8?q?1833831171664327746?= X-GMAIL-MSGID: =?utf-8?q?1833831171664327746?= From: Frank Lichtenheld Change-Id: I0e13595c1057c680e1065eae84ca94b273ed9ca1 Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering --- 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/+/1037 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 0d648ba..b9708343 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -3698,7 +3698,7 @@ if (o->tls_server) { - if (streq(o->dh_file, "none")) + if (o->dh_file && streq(o->dh_file, "none")) { o->dh_file = NULL; }