From patchwork Tue Jun 3 14:20:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4276 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:9994:b0:667:60b:5921 with SMTP id d20csp3239314mav; Tue, 3 Jun 2025 07:20:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVx5cdTzNpgHLbvfTJhkH9KWVn3HMbv2nPH/F3YnOj4DhMOfzFB/yQTOaW8+yBM6Q66gFksl/dNexA=@openvpn.net X-Google-Smtp-Source: AGHT+IE5XrFoyzEFGwEXPP5ACVJ+exlY6acwpiwk3Jip2xMA8Pq5aC2vxf59aXiXJDn/o9k1ztsT X-Received: by 2002:a05:6808:2116:b0:404:a09a:dc0d with SMTP id 5614622812f47-407a662416dmr7116732b6e.33.1748960453736; Tue, 03 Jun 2025 07:20:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748960453; cv=none; d=google.com; s=arc-20240605; b=TVhjqKeslStAgTo2iNwNNY2TnsxD9SOXhtt26rcSOwQ/gumON6Nl2oComTbqx+LtD2 dyGNX47RGoidhbR7DFHXrjySGSxeR0z5r4EgWUVBjkHA3pR21mZWzZI3uBe6bQ3RkAcE LV0KU65/9UOrv5uH0768Jo2+YyV4m6gR7PYTPiQ3HoAJIG+udcA1eu6+ywjxwpwmGKZc q+FpDcKZO0T/izV3RLWrfXFaOaOJILZJ1tJ1X46OVZgZkb+44LIagwzEaq1wZqIu6MXj 4CIWGxfqeHFCMsCg0zKXmfLvlp7IKjacAzkwtrcs5yidcFvMPFGTzj0K60exueNHn9ZI HQ/A== 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=qrFZQuVFbrrAfYL6v5Pbkj7zhuDo5KyuZcFjK3aYGnw=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=daCYiUeHir6HT3bCCj0g7/8W18wBC18ejcv9sxkgtL0UresJmENcEozCayfnTnaYe4 uCs/0ge4wbo8od4o8WkvyUQyBm/DS/TYnZJTzJxZgBJ0DN3VcLmmlMex0IxAiV7HymPq h3hE0HfHsyhpiT66lnzpXjXqqWWMgtlP2MJaBnYgy1XaQykMkvOl9e0FruHDjRDHvD1Q 6k8SNRlIPp0lK6JzI0kF85Iu64LtDVTgJD3XMtFQenzh6o0e8wHlPYWk8H1qSv6fIYae hmDDKrHto3UPhk8FunUsHo0vwxOVlzIic1vX2mG5awpfozHzWXxnk4Qg2XFRsq8dhobf FH4A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=ERwO9C9T; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=PWwelkXP; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=GDAJT0pZ; 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 5614622812f47-40678c232b8si5514141b6e.88.2025.06.03.07.20.53 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Jun 2025 07:20:53 -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=ERwO9C9T; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=PWwelkXP; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=GDAJT0pZ; 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=qrFZQuVFbrrAfYL6v5Pbkj7zhuDo5KyuZcFjK3aYGnw=; b=ERwO9C9TIktPaO743U53mPuKdS 2eHc9LBF/dWNoiLP3OOkS8KWNv06qsqitNlbBOpeKE5UF+DwAOSyJHo9TFwQq3xmT8E2If7v4NYxF epXVW1lixU2YgWy2OmMhXStYhHHPVbhfBlL/z1UzeQ9CVSHSH3eb30FdmTAzCqmC/HT0=; Received: from [127.0.0.1] (helo=sfs-ml-3.v29.lw.sourceforge.com) by sfs-ml-3.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1uMSVX-0006Ve-As; Tue, 03 Jun 2025 14:20:51 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-3.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1uMSVV-0006VV-Cf for openvpn-devel@lists.sourceforge.net; Tue, 03 Jun 2025 14:20:49 +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=kFodWvmZTbsVe1He5bmKIyQLALowLLuMbkjjO2uc2No=; b=PWwelkXP16zJK8ljAncn0GQigp KoNTsICRzOJciyJtVnL7v7zUzDZu/6NvkqAzYiGc7aIc6BQPt5crhb3UkqR1fa8ozocfbEFlCsYoG dliw0zFxJEiq2cb4BKef64zeNVNE7a+mBkB2eYLERiwYccLMpsG/97BHzkK9f+NR0G1A=; 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=kFodWvmZTbsVe1He5bmKIyQLALowLLuMbkjjO2uc2No=; b=GDAJT0pZngjfqPVSRT48V0FiF8 O4TdWd1lYK2hAe3OjopuicU2IoRv+7bPFviXQXz6jMYJQJ4vPQjlVT/CTJTFDQMU2MxuB9D9SqV2d vqlqIGxJTmt4jIF+ZiPDHnverRogX3dOum3S10gOWsOoxVedzdryWCCmpRfkZYa9AlM4=; 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 1uMSVU-0005Hr-1a for openvpn-devel@lists.sourceforge.net; Tue, 03 Jun 2025 14:20:48 +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 553EKaYJ013709 for ; Tue, 3 Jun 2025 16:20:36 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.17.1.9/8.17.1.9/Submit) id 553EKaGc013708 for openvpn-devel@lists.sourceforge.net; Tue, 3 Jun 2025 16:20:36 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Tue, 3 Jun 2025 16:20:29 +0200 Message-ID: <20250603142035.13685-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 X-Headers-End: 1uMSVU-0005Hr-1a Subject: [Openvpn-devel] [PATCH v2] t_server_null: Test different permutations of --dh 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?1833917957143417474?= X-GMAIL-MSGID: =?utf-8?q?1833917957143417474?= From: Frank Lichtenheld Do not include --dh by default, since we do not actually need it. Use the different servers for different ways of specifying it. Change-Id: I480442a55025bfcce7cb68ec7564ff33b0b780e2 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/+/1038 This mail reflects revision 2 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering diff --git a/tests/t_server_null_default.rc b/tests/t_server_null_default.rc index ca8004a..365b5a8 100755 --- a/tests/t_server_null_default.rc +++ b/tests/t_server_null_default.rc @@ -40,7 +40,7 @@ SERVER_EXEC="${top_builddir}/src/openvpn/openvpn" SERVER_BASE_OPTS="--daemon --local 127.0.0.1 --dev tun --topology subnet --max-clients $MAX_CLIENTS --persist-tun --verb 3 --duplicate-cn" SERVER_CIPHER_OPTS="" -SERVER_CERT_OPTS="--ca ${CA} --dh ${DH} --cert ${SERVER_CERT} --key ${SERVER_KEY} --tls-auth ${TA} 0" +SERVER_CERT_OPTS="--ca ${CA} --cert ${SERVER_CERT} --key ${SERVER_KEY} --tls-auth ${TA} 0" SERVER_CONF_BASE="${SERVER_BASE_OPTS} ${SERVER_CIPHER_OPTS} ${SERVER_CERT_OPTS}" TEST_SERVER_LIST="1 2 3" @@ -55,13 +55,13 @@ SERVER_SERVER_2="--server 10.29.42.0 255.255.255.0" SERVER_MGMT_PORT_2="11195" SERVER_EXEC_2="${SERVER_EXEC}" -SERVER_CONF_2="${SERVER_CONF_BASE} ${SERVER_SERVER_2} --lport 1195 --proto tcp --management 127.0.0.1 ${SERVER_MGMT_PORT_2}" +SERVER_CONF_2="${SERVER_CONF_BASE} ${SERVER_SERVER_2} --lport 1195 --proto tcp --management 127.0.0.1 ${SERVER_MGMT_PORT_2} --dh ${DH}" SERVER_NAME_3="t_server_null_server-1196_udp" SERVER_SERVER_3="--server 10.29.43.0 255.255.255.0" SERVER_MGMT_PORT_3="11196" SERVER_EXEC_3="${SERVER_EXEC}" -SERVER_CONF_3="${SERVER_CONF_BASE} ${SERVER_SERVER_3} --lport 1196 --proto udp --management 127.0.0.1 ${SERVER_MGMT_PORT_3} --cipher AES-192-CBC --data-ciphers DEFAULT:AES-192-CBC" +SERVER_CONF_3="${SERVER_CONF_BASE} ${SERVER_SERVER_3} --lport 1196 --proto udp --management 127.0.0.1 ${SERVER_MGMT_PORT_3} --dh none --cipher AES-192-CBC --data-ciphers DEFAULT:AES-192-CBC" # Test client configurations CLIENT_EXEC="${top_builddir}/src/openvpn/openvpn"