From patchwork Wed Jul 16 16:56:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4313 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:d91b:b0:671:5a2c:6455 with SMTP id lg27csp295450mab; Wed, 16 Jul 2025 09:57:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXewHxdaK0xo6HWKYWFkTt2NxHlS/U5iFnKH/si6uFvJwxNRvUJgZNu1GuIHkEGiPimAeX+oHNNq0Y=@openvpn.net X-Google-Smtp-Source: AGHT+IHQrDSC27iHqvO/m14cXHevEEAMLlMmZyxhmVLBx0SNoYwxDnYwdCU+gK84TbVcVdX0aH+M X-Received: by 2002:a05:6830:8104:b0:73e:5eaf:1a0d with SMTP id 46e09a7af769-73e66140dddmr2458319a34.8.1752685034404; Wed, 16 Jul 2025 09:57:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1752685034; cv=none; d=google.com; s=arc-20240605; b=AezCq4wbDPR+4rUH7Ys/Z7u13+Ql92NLl/PU1oR4+7dBxVWJUJWxkTCRWsu4uC08Tc YdPpo2dZ1waNvuJVMFMU3Rpni3mmppm2seP4J8Su9SuCZa96vpfLU+c3WxbysY7dw+w3 c30DhohFICeeQ6jVF/2BojEWu/EaAWORAx1OnwE76xDvcFCEtJ2eD9KUj6N1iW/KPRyw fmULYyUBmU/6O5BC6A9O1bBzOEOodJn6ClbFp8NcfJS6hninQyS7vFoI/lQkJaAmOtLy 2AFtmuowJqEn0VY6zhHyTr0fVVc03SzSOmAS+90Jc+jG7X1nIOlNjI0jibakGHx7H6ug U8bw== 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=e6SFNTHzVEL8K1sJHdS/5p6ZikhPRM/58vAX8BR7Qs8=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=DO6U4+Rlhwx8LdWljW01DpEENNa8ltDVoS200UnDDfjWCOiOfpevWZ2sAYsFFMgwSf M44TzzibiPxGQMHO7QXtaTQa9OpPUxJ3vfvucj/1u+RGEu3sizdPjc3nAfjf6PcoVKyj uGT/zIYb3QHgGKNB3DPrTwl5rHEkM8Bf0dkoDPwh7uAThnmK40I7pijP6d7vDnZ/Wc+H EYjSmhKINqRnK4FGbeJfwfa9E5QM4/sf5xL/NDAEXzcAxjnt0kBud7t6o6V+SFvq3tEJ jbwRBO+DAjqmPOgfE2KAjKK5nuoSaEu73XtYvQjU4yPi1M/hL4kxhP5PcAacGnwTztLp 2Y3A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=TH11N+Rs; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b="C+87CWR/"; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b="P0Oq+b/5"; 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 46e09a7af769-73e71b202dasi192030a34.364.2025.07.16.09.57.13 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jul 2025 09:57:13 -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=TH11N+Rs; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b="C+87CWR/"; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b="P0Oq+b/5"; 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=e6SFNTHzVEL8K1sJHdS/5p6ZikhPRM/58vAX8BR7Qs8=; b=TH11N+Rsk1lY2+RQ+yEXRxaBOr k9rqj+kLE2GlE/3AX66KtLuUJ1KblymJeKu7xFsY7lnMmuTXToy6A2OqMknNAHvuoiWaninLazIau qFnCfk62WBwdVxj/Mwip3M4P5GjWwFEpReGXvwOHtpX8C/rbVd7P5lzmTiIZ+lOM366M=; 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 1uc5RO-0001pC-V8; Wed, 16 Jul 2025 16:57:10 +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 1uc5RO-0001p6-8p for openvpn-devel@lists.sourceforge.net; Wed, 16 Jul 2025 16:57:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:Content-Type:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc: 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=oYgZSrRcWEHTUuvh+wFHj3I1GeZ0N1mf2Fh/7ffN7Mo=; b=C+87CWR/t+Jx+k7E1DMIhpiZ5E q4Qpt86zG/aPmdMfawC5PNKdDbgL/OEXMOVHh2DGMQhtpE7TPMkyWnr3q8MrDXzqywLs+Zxbi12tI qLyyRj2OIzn3QHF//jHuouP8fEhH87lZpN8ZdS1+YC2Rb3ny2nc4pEXgv34HipD7Qlds=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc: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=oYgZSrRcWEHTUuvh+wFHj3I1GeZ0N1mf2Fh/7ffN7Mo=; b=P0Oq+b/5ZDNlBf/Pp3l2vh+b1E J+wP6NnuR4cta2xfl5XmEgoq9uJ+BUxnDqJxU46ZvWBmDJWpbhJuMLNHvf6xPEdKwD4CoSWwrafIb mzunx28WHz7ByY+ldhJrEB/2bCWItyMTOs/aYPP9lmEpyct1jutXvktGnKJoSTslYNZs=; 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 1uc5RN-0005Xv-4f for openvpn-devel@lists.sourceforge.net; Wed, 16 Jul 2025 16:57:10 +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 56GGuvfu018912 for ; Wed, 16 Jul 2025 18:56:57 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.17.1.9/8.17.1.9/Submit) id 56GGuvxS018911 for openvpn-devel@lists.sourceforge.net; Wed, 16 Jul 2025 18:56:57 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Wed, 16 Jul 2025 18:56:49 +0200 Message-ID: <20250716165656.18887-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.3 (+) X-Spam-Report: =?unknown-8bit?q?Spam_detection_software=2C_running_on_the_sy?= =?unknown-8bit?q?stem_=22sfi-spamd-2=2Ehosts=2Ecolo=2Esdot=2Eme=22=2C?= =?unknown-8bit?q?_has_NOT_identified_this_incoming_email_as_spam=2E__The_ori?= =?unknown-8bit?q?ginal?= =?unknown-8bit?q?_message_has_been_attached_to_this_so_you_can_view_it_or_la?= =?unknown-8bit?q?bel?= =?unknown-8bit?q?_similar_future_email=2E__If_you_have_any_questions=2C_see?= =?unknown-8bit?q?_the_administrator_of_that_system_for_details=2E?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_preview=3A__From=3A_Samuli_Sepp=C3=A4nen_=3Csasepp?= =?unknown-8bit?q?=40pm=2Eme=3E_This_makes_it_obvious?= =?unknown-8bit?q?_which_server_each_test_connects_to_Change-Id=3A_I49c69144a?= =?unknown-8bit?q?b6dcf1d26c96c2eafc2346ad4e0ca75?= =?unknown-8bit?q?_Signed-off-by=3A_Samuli_Sepp=C3=A4nen_=3Csasepp=40pm=2Eme?= =?unknown-8bit?q?=3E_Acked-by=3A_Gert_Doering_=3Cgert=40greenie=2Emuc=2Ede?= =?unknown-8bit?q?=3E?= =?unknown-8bit?q?_---_?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_analysis_details=3A___=281=2E3_points=2C_5=2E0_req?= =?unknown-8bit?q?uired=29?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_pts_rule_name______________description?= =?unknown-8bit?q?_----_----------------------_------------------------------?= =?unknown-8bit?q?--------------------?= =?unknown-8bit?q?_1=2E3_RDNS=5FNONE______________Delivered_to_internal_netwo?= =?unknown-8bit?q?rk_by_a_host_with_no_rDNS?= X-Headers-End: 1uc5RN-0005Xv-4f Subject: [Openvpn-devel] [PATCH v2] t_server_null: match test numbers with server numbers 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?1837823461604907928?= X-GMAIL-MSGID: =?utf-8?q?1837823461604907928?= From: Samuli Seppänen This makes it obvious which server each test connects to Change-Id: I49c69144ab6dcf1d26c96c2eafc2346ad4e0ca75 Signed-off-by: Samuli Seppänen 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/+/1086 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 a1c68cd..900f189 100755 --- a/tests/t_server_null_default.rc +++ b/tests/t_server_null_default.rc @@ -80,67 +80,67 @@ CLIENT_CIPHER_OPTS="" CLIENT_CERT_OPTS="--ca ${CA} --cert ${CLIENT_CERT} --key ${CLIENT_KEY} --tls-auth ${TA} 1" -TEST_RUN_LIST="1 1L 2 2L 3 4a 4b 4c 5a 5b 5c" +TEST_RUN_LIST="1a 1b 1c 1L 2a 2L 3a 3b 4a 4b 4c" CLIENT_CONF_BASE="${CLIENT_NULL_OPTS} ${CLIENT_BASE_OPTS} ${CLIENT_CIPHER_OPTS} ${CLIENT_CERT_OPTS}" CLIENT_CONF_BASE_LWIP="${CLIENT_LWIP_OPTS} ${CLIENT_BASE_OPTS} ${CLIENT_CIPHER_OPTS} ${CLIENT_CERT_OPTS}" -TEST_NAME_1="t_server_null_client.sh-openvpn_current_udp" -SHOULD_PASS_1="yes" -CLIENT_EXEC_1="${CLIENT_EXEC}" -CLIENT_CONF_1="${CLIENT_CONF_BASE} --remote 127.0.0.1 1194 udp --proto udp" +TEST_NAME_1a="t_server_null_client.sh-openvpn_current_udp" +SHOULD_PASS_1a="yes" +CLIENT_EXEC_1a="${CLIENT_EXEC}" +CLIENT_CONF_1a="${CLIENT_CONF_BASE} --remote 127.0.0.1 1194 udp --proto udp" + +TEST_NAME_1b="t_server_null_client.sh-openvpn_current_udp_fail" +SHOULD_PASS_1b="no" +CLIENT_EXEC_1b="${CLIENT_EXEC}" +CLIENT_CONF_1b="${CLIENT_CONF_BASE} --remote 127.0.0.1 11194 udp --proto udp" + +# --data-cipher list against server with defaults +# --cipher ignored +TEST_NAME_1c="t_server_null_client.sh-openvpn_current_udp_dc1" +SHOULD_PASS_1c="yes" +CLIENT_EXEC_1c="${CLIENT_EXEC}" +CLIENT_CONF_1c="${CLIENT_CONF_BASE} --remote 127.0.0.1 1194 udp --proto udp --cipher AES-128-CBC --data-ciphers AES-192-CBC:DEFAULT" TEST_NAME_1L="t_server_null_client.sh-openvpn_current_udp_lwip" SHOULD_PASS_1L="yes" CLIENT_EXEC_1L="${CLIENT_EXEC}" CLIENT_CONF_1L="${CLIENT_CONF_BASE_LWIP} --remote 127.0.0.1 1194 udp --proto udp" -TEST_NAME_2="t_server_null_client.sh-openvpn_current_tcp" -SHOULD_PASS_2="yes" -CLIENT_EXEC_2="${CLIENT_EXEC}" -CLIENT_CONF_2="${CLIENT_CONF_BASE} --remote 127.0.0.1 1195 tcp --proto tcp" +TEST_NAME_2a="t_server_null_client.sh-openvpn_current_tcp" +SHOULD_PASS_2a="yes" +CLIENT_EXEC_2a="${CLIENT_EXEC}" +CLIENT_CONF_2a="${CLIENT_CONF_BASE} --remote 127.0.0.1 1195 tcp --proto tcp" TEST_NAME_2L="t_server_null_client.sh-openvpn_current_tcp_lwip" SHOULD_PASS_2L="yes" CLIENT_EXEC_2L="${CLIENT_EXEC}" CLIENT_CONF_2L="${CLIENT_CONF_BASE_LWIP} --remote 127.0.0.1 1195 tcp --proto tcp" -TEST_NAME_3="t_server_null_client.sh-openvpn_current_udp_fail" -SHOULD_PASS_3="no" -CLIENT_EXEC_3="${CLIENT_EXEC}" -CLIENT_CONF_3="${CLIENT_CONF_BASE} --remote 127.0.0.1 11194 udp --proto udp" - -# --data-cipher list against server with defaults -# --cipher ignored -TEST_NAME_4a="t_server_null_client.sh-openvpn_current_udp_dc1" -SHOULD_PASS_4a="yes" -CLIENT_EXEC_4a="${CLIENT_EXEC}" -CLIENT_CONF_4a="${CLIENT_CONF_BASE} --remote 127.0.0.1 1194 udp --proto udp --cipher AES-128-CBC --data-ciphers AES-192-CBC:DEFAULT" - # specific --data-cipher against server that supports that cipher # --cipher ignored -TEST_NAME_4b="t_server_null_client.sh-openvpn_current_udp_dc3" -SHOULD_PASS_4b="yes" -CLIENT_EXEC_4b="${CLIENT_EXEC}" -CLIENT_CONF_4b="${CLIENT_CONF_BASE} --remote 127.0.0.1 1196 udp --proto udp --cipher AES-128-CBC --data-ciphers AES-192-CBC" +TEST_NAME_3a="t_server_null_client.sh-openvpn_current_udp_dc3" +SHOULD_PASS_3a="yes" +CLIENT_EXEC_3a="${CLIENT_EXEC}" +CLIENT_CONF_3a="${CLIENT_CONF_BASE} --remote 127.0.0.1 1196 udp --proto udp --cipher AES-128-CBC --data-ciphers AES-192-CBC" # specific --data-cipher against server that doesn't support that cipher # --cipher ignored -TEST_NAME_4c="t_server_null_client.sh-openvpn_current_udp_dc3_fail" +TEST_NAME_3b="t_server_null_client.sh-openvpn_current_udp_dc3_fail" +SHOULD_PASS_3b="no" +CLIENT_EXEC_3b="${CLIENT_EXEC}" +CLIENT_CONF_3b="${CLIENT_CONF_BASE} --remote 127.0.0.1 1196 udp --proto udp --cipher AES-192-CBC --data-ciphers AES-128-CBC" + +TEST_NAME_4a="t_server_null_client.sh-openvpn_current_multisocket_ipv4_tcp" +SHOULD_PASS_4a="yes" +CLIENT_EXEC_4a="${CLIENT_EXEC}" +CLIENT_CONF_4a="${CLIENT_CONF_BASE} --remote 127.0.0.1 1197 tcp" + +TEST_NAME_4b="t_server_null_client.sh-openvpn_current_multisocket_ipv6_udp" +SHOULD_PASS_4b="yes" +CLIENT_EXEC_4b="${CLIENT_EXEC}" +CLIENT_CONF_4b="${CLIENT_CONF_BASE} --remote ::1 1197 udp" + +TEST_NAME_4c="t_server_null_client.sh-openvpn_current_multisocket_ipv6_tcp_fail" SHOULD_PASS_4c="no" CLIENT_EXEC_4c="${CLIENT_EXEC}" -CLIENT_CONF_4c="${CLIENT_CONF_BASE} --remote 127.0.0.1 1196 udp --proto udp --cipher AES-192-CBC --data-ciphers AES-128-CBC" - -TEST_NAME_5a="t_server_null_client.sh-openvpn_current_multisocket_ipv4_tcp" -SHOULD_PASS_5a="yes" -CLIENT_EXEC_5a="${CLIENT_EXEC}" -CLIENT_CONF_5a="${CLIENT_CONF_BASE} --remote 127.0.0.1 1197 tcp" - -TEST_NAME_5b="t_server_null_client.sh-openvpn_current_multisocket_ipv6_udp" -SHOULD_PASS_5b="yes" -CLIENT_EXEC_5b="${CLIENT_EXEC}" -CLIENT_CONF_5b="${CLIENT_CONF_BASE} --remote ::1 1197 udp" - -TEST_NAME_5c="t_server_null_client.sh-openvpn_current_multisocket_ipv6_tcp_fail" -SHOULD_PASS_5c="no" -CLIENT_EXEC_5c="${CLIENT_EXEC}" -CLIENT_CONF_5c="${CLIENT_CONF_BASE} --remote ::1 1197 tcp" +CLIENT_CONF_4c="${CLIENT_CONF_BASE} --remote ::1 1197 tcp"