From: "cron2 (Code Review)" Date: Wed, 16 Jul 2025 21:02:47 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641..., sasepp@...2783... Message-ID: <88afeed904750262e9a25f160be201526df28c6c-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="k22Z2v+3twk="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: t_server_null: match test numbers with server numbers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mattock Cc: plaisthos , flichtenheld , openvpn-devel --k22Z2v+3twk= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/10= 86?usp=3Demail ) Change subject: t_server_null: match test numbers with server numbers ...................................................................... t_server_null: match test numbers with server numbers This makes it obvious which server each test connects to Change-Id: I49c69144ab6dcf1d26c96c2eafc2346ad4e0ca75 Signed-off-by: Samuli Sepp=C3=A4nen Acked-by: Gert Doering Message-Id: <20250716165656.18887-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32= 194.html Signed-off-by: Gert Doering --- M tests/t_server_null_default.rc 1 file changed, 42 insertions(+), 42 deletions(-) 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=3D"" CLIENT_CERT_OPTS=3D"--ca ${CA} --cert ${CLIENT_CERT} --key ${CLIENT_KEY} -= -tls-auth ${TA} 1" -TEST_RUN_LIST=3D"1 1L 2 2L 3 4a 4b 4c 5a 5b 5c" +TEST_RUN_LIST=3D"1a 1b 1c 1L 2a 2L 3a 3b 4a 4b 4c" CLIENT_CONF_BASE=3D"${CLIENT_NULL_OPTS} ${CLIENT_BASE_OPTS} ${CLIENT_CIPHE= R_OPTS} ${CLIENT_CERT_OPTS}" CLIENT_CONF_BASE_LWIP=3D"${CLIENT_LWIP_OPTS} ${CLIENT_BASE_OPTS} ${CLIENT_= CIPHER_OPTS} ${CLIENT_CERT_OPTS}" -TEST_NAME_1=3D"t_server_null_client.sh-openvpn_current_udp" -SHOULD_PASS_1=3D"yes" -CLIENT_EXEC_1=3D"${CLIENT_EXEC}" -CLIENT_CONF_1=3D"${CLIENT_CONF_BASE} --remote 127.0.0.1 1194 udp --proto u= dp" +TEST_NAME_1a=3D"t_server_null_client.sh-openvpn_current_udp" +SHOULD_PASS_1a=3D"yes" +CLIENT_EXEC_1a=3D"${CLIENT_EXEC}" +CLIENT_CONF_1a=3D"${CLIENT_CONF_BASE} --remote 127.0.0.1 1194 udp --proto = udp" + +TEST_NAME_1b=3D"t_server_null_client.sh-openvpn_current_udp_fail" +SHOULD_PASS_1b=3D"no" +CLIENT_EXEC_1b=3D"${CLIENT_EXEC}" +CLIENT_CONF_1b=3D"${CLIENT_CONF_BASE} --remote 127.0.0.1 11194 udp --proto= udp" + +# --data-cipher list against server with defaults +# --cipher ignored +TEST_NAME_1c=3D"t_server_null_client.sh-openvpn_current_udp_dc1" +SHOULD_PASS_1c=3D"yes" +CLIENT_EXEC_1c=3D"${CLIENT_EXEC}" +CLIENT_CONF_1c=3D"${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=3D"t_server_null_client.sh-openvpn_current_udp_lwip" SHOULD_PASS_1L=3D"yes" CLIENT_EXEC_1L=3D"${CLIENT_EXEC}" CLIENT_CONF_1L=3D"${CLIENT_CONF_BASE_LWIP} --remote 127.0.0.1 1194 udp --p= roto udp" -TEST_NAME_2=3D"t_server_null_client.sh-openvpn_current_tcp" -SHOULD_PASS_2=3D"yes" -CLIENT_EXEC_2=3D"${CLIENT_EXEC}" -CLIENT_CONF_2=3D"${CLIENT_CONF_BASE} --remote 127.0.0.1 1195 tcp --proto t= cp" +TEST_NAME_2a=3D"t_server_null_client.sh-openvpn_current_tcp" +SHOULD_PASS_2a=3D"yes" +CLIENT_EXEC_2a=3D"${CLIENT_EXEC}" +CLIENT_CONF_2a=3D"${CLIENT_CONF_BASE} --remote 127.0.0.1 1195 tcp --proto = tcp" TEST_NAME_2L=3D"t_server_null_client.sh-openvpn_current_tcp_lwip" SHOULD_PASS_2L=3D"yes" CLIENT_EXEC_2L=3D"${CLIENT_EXEC}" CLIENT_CONF_2L=3D"${CLIENT_CONF_BASE_LWIP} --remote 127.0.0.1 1195 tcp --p= roto tcp" -TEST_NAME_3=3D"t_server_null_client.sh-openvpn_current_udp_fail" -SHOULD_PASS_3=3D"no" -CLIENT_EXEC_3=3D"${CLIENT_EXEC}" -CLIENT_CONF_3=3D"${CLIENT_CONF_BASE} --remote 127.0.0.1 11194 udp --proto = udp" - -# --data-cipher list against server with defaults -# --cipher ignored -TEST_NAME_4a=3D"t_server_null_client.sh-openvpn_current_udp_dc1" -SHOULD_PASS_4a=3D"yes" -CLIENT_EXEC_4a=3D"${CLIENT_EXEC}" -CLIENT_CONF_4a=3D"${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=3D"t_server_null_client.sh-openvpn_current_udp_dc3" -SHOULD_PASS_4b=3D"yes" -CLIENT_EXEC_4b=3D"${CLIENT_EXEC}" -CLIENT_CONF_4b=3D"${CLIENT_CONF_BASE} --remote 127.0.0.1 1196 udp --proto = udp --cipher AES-128-CBC --data-ciphers AES-192-CBC" +TEST_NAME_3a=3D"t_server_null_client.sh-openvpn_current_udp_dc3" +SHOULD_PASS_3a=3D"yes" +CLIENT_EXEC_3a=3D"${CLIENT_EXEC}" +CLIENT_CONF_3a=3D"${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=3D"t_server_null_client.sh-openvpn_current_udp_dc3_fail" +TEST_NAME_3b=3D"t_server_null_client.sh-openvpn_current_udp_dc3_fail" +SHOULD_PASS_3b=3D"no" +CLIENT_EXEC_3b=3D"${CLIENT_EXEC}" +CLIENT_CONF_3b=3D"${CLIENT_CONF_BASE} --remote 127.0.0.1 1196 udp --proto = udp --cipher AES-192-CBC --data-ciphers AES-128-CBC" + +TEST_NAME_4a=3D"t_server_null_client.sh-openvpn_current_multisocket_ipv4_t= cp" +SHOULD_PASS_4a=3D"yes" +CLIENT_EXEC_4a=3D"${CLIENT_EXEC}" +CLIENT_CONF_4a=3D"${CLIENT_CONF_BASE} --remote 127.0.0.1 1197 tcp" + +TEST_NAME_4b=3D"t_server_null_client.sh-openvpn_current_multisocket_ipv6_u= dp" +SHOULD_PASS_4b=3D"yes" +CLIENT_EXEC_4b=3D"${CLIENT_EXEC}" +CLIENT_CONF_4b=3D"${CLIENT_CONF_BASE} --remote ::1 1197 udp" + +TEST_NAME_4c=3D"t_server_null_client.sh-openvpn_current_multisocket_ipv6_t= cp_fail" SHOULD_PASS_4c=3D"no" CLIENT_EXEC_4c=3D"${CLIENT_EXEC}" -CLIENT_CONF_4c=3D"${CLIENT_CONF_BASE} --remote 127.0.0.1 1196 udp --proto = udp --cipher AES-192-CBC --data-ciphers AES-128-CBC" - -TEST_NAME_5a=3D"t_server_null_client.sh-openvpn_current_multisocket_ipv4_t= cp" -SHOULD_PASS_5a=3D"yes" -CLIENT_EXEC_5a=3D"${CLIENT_EXEC}" -CLIENT_CONF_5a=3D"${CLIENT_CONF_BASE} --remote 127.0.0.1 1197 tcp" - -TEST_NAME_5b=3D"t_server_null_client.sh-openvpn_current_multisocket_ipv6_u= dp" -SHOULD_PASS_5b=3D"yes" -CLIENT_EXEC_5b=3D"${CLIENT_EXEC}" -CLIENT_CONF_5b=3D"${CLIENT_CONF_BASE} --remote ::1 1197 udp" - -TEST_NAME_5c=3D"t_server_null_client.sh-openvpn_current_multisocket_ipv6_t= cp_fail" -SHOULD_PASS_5c=3D"no" -CLIENT_EXEC_5c=3D"${CLIENT_EXEC}" -CLIENT_CONF_5c=3D"${CLIENT_CONF_BASE} --remote ::1 1197 tcp" +CLIENT_CONF_4c=3D"${CLIENT_CONF_BASE} --remote ::1 1197 tcp" -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1086?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I49c69144ab6dcf1d26c96c2eafc2346ad4e0ca75 Gerrit-Change-Number: 1086 Gerrit-PatchSet: 3 Gerrit-Owner: mattock Gerrit-Reviewer: cron2 Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-MessageType: merged --k22Z2v+3twk= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 submitted this change.

View Change

t_server_null: match test numbers with server=
 numbers

This makes it obvious which server each test connects to
Change-Id: I49c69144ab6dcf1d26c96c2eafc2346ad4e0ca75
Signed-off-by:= Samuli Sepp=C3=A4nen <sasepp@...2705...>
Acked-by: Gert Doering &= lt;gert@...1296...>
Message-Id: <20250716165656.18887-1-gert@...1711...= 96...>
URL: https://www.mail-archive.com/openvpn-devel@...1357...= rge.net/msg32194.html
Signed-off-by: Gert Doering <gert@...1296...>= ;
---
M tests/t_server_null_default.rc
1 file changed, 42 insertio= ns(+), 42 deletions(-)

diff --git a/tests/t_server_null_default.rc b/tests/t_server_null_defaul=
t.rc
index a1c68cd..900f189 100755
--- a/te= sts/t_server_null_default.rc
+++ b/tests/t_server_null_defa= ult.rc
@@ -80,67 +80,67 @@
CLIENT_CIPHER_O= PTS=3D""
CLIENT_CERT_OPTS=3D"--ca ${CA} --c= ert ${CLIENT_CERT} --key ${CLIENT_KEY} --tls-auth ${TA} 1"
<= span>
-TEST_RUN_LIST= =3D"1 1L 2 2L 3 4a 4b 4c 5a 5b 5c"
+TEST_RUN_LIST=3D"1a 1b 1c 1L 2a 2L 3a 3b 4a 4= b 4c"
CLIENT_CONF_BASE=3D"${CLIENT_NULL_OPTS} ${= CLIENT_BASE_OPTS} ${CLIENT_CIPHER_OPTS} ${CLIENT_CERT_OPTS}" CLIENT_CONF_BASE_LWIP=3D"${CLIENT_LWIP_OPTS} ${CLIENT_BASE_OPT= S} ${CLIENT_CIPHER_OPTS} ${CLIENT_CERT_OPTS}"
=
-TEST_NAME_1=3D"t_server= _null_client.sh-openvpn_current_udp"
-SHOULD_PASS_1=3D"yes"
-CLIENT_EXEC_1=3D"${CLIENT_EXEC}"<= /span>
-CLIENT_CONF_1=3D"= ${CLIENT_CONF_BASE} --remote 127.0.0.1 1194 udp --proto udp"+TEST_NAME_1a=3D"t_server= _null_client.sh-openvpn_current_udp"
+SHOULD_PASS_1a=3D"yes"
+CLIENT_EXEC_1a=3D"${CLIENT_EXEC}&qu= ot;
+CLIENT_CONF_1a= =3D"${CLIENT_CONF_BASE} --remote 127.0.0.1 1194 udp --proto udp"<= /span>
+
+TEST_NAME_1b=3D"t_server_null_clie= nt.sh-openvpn_current_udp_fail"
+SHOULD_PASS_1b=3D"no"
+CLIENT_EXEC_1b=3D"${CLIENT_EXEC}"
+CLIENT_CONF_1b=3D"= ;${CLIENT_CONF_BASE} --remote 127.0.0.1 11194 udp --proto udp"<= br>+
+# --data-cipher list against server with defau= lts
+# --cipher ignor= ed
+TEST_NAME_1c=3D&q= uot;t_server_null_client.sh-openvpn_current_udp_dc1"
+SHOULD_PASS_1c=3D"yes"
+CLIENT_EXEC_1c=3D"$= {CLIENT_EXEC}"
+= CLIENT_CONF_1c=3D"${CLIENT_CONF_BASE} --remote 127.0.0.1 1194 udp --pr= oto udp --cipher AES-128-CBC --data-ciphers AES-192-CBC:DEFAULT"

TEST_NAME_1L=3D"t_server_null_client.sh-= openvpn_current_udp_lwip"
SHOULD_PASS_1L=3D"yes&= quot;
CLIENT_EXEC_1L=3D"${CLIENT_EXEC}" CLIENT_CONF_1L=3D"${CLIENT_CONF_BASE_LWIP} --remote 127.0.0.1= 1194 udp --proto udp"

-TEST_NAME_2=3D"t_server_null_client.sh-openvpn= _current_tcp"
-SHO= ULD_PASS_2=3D"yes"
-CLIENT_EXEC_2=3D"${CLIENT_EXEC}"
-CLIENT_CONF_2=3D"${CLIENT_CONF_BASE} --rem= ote 127.0.0.1 1195 tcp --proto tcp"
+TEST_NAME_2a=3D"t_server_null_client.sh-openvpn_c= urrent_tcp"
+SHO= ULD_PASS_2a=3D"yes"
+CLIENT_EXEC_2a=3D"${CLIENT_EXEC}"
+CLIENT_CONF_2a=3D"${CLIENT_CONF_BASE= } --remote 127.0.0.1 1195 tcp --proto tcp"
TEST_NAME_2L=3D"t_server_null_client.sh-openvpn_current_tcp_lw= ip"
SHOULD_PASS_2L=3D"yes"
= CLIENT_EXEC_2L=3D"${CLIENT_EXEC}"
CLIENT_CONF_2= L=3D"${CLIENT_CONF_BASE_LWIP} --remote 127.0.0.1 1195 tcp --proto tcp&= quot;

-TEST_NAME_3=3D"t_server_null_client.sh-openvpn_current_udp_fail"= ;
-SHOULD_PASS_3=3D&quo= t;no"
-CLIENT_EXEC= _3=3D"${CLIENT_EXEC}"
-CLIENT_CONF_3=3D"${CLIENT_CONF_BASE} --remote 127.0.0.1 1119= 4 udp --proto udp"
-
-# --data-cipher lis= t against server with defaults
-# --cipher ignored
-TEST_NAME_4a=3D"t_server_null_client.sh-openvpn_current_udp_dc1&= quot;
-SHOULD_PASS_4a= =3D"yes"
-CLI= ENT_EXEC_4a=3D"${CLIENT_EXEC}"
-CLIENT_CONF_4a=3D"${CLIENT_CONF_BASE} --remote 127.= 0.0.1 1194 udp --proto udp --cipher AES-128-CBC --data-ciphers AES-192-CBC:= DEFAULT"
-<= br> # specific --data-cipher against server that supports that cipher=
# --cipher ignored
-TEST_NAME_4b=3D"t_server_null_client.sh-openvpn_current= _udp_dc3"
-SHOULD_= PASS_4b=3D"yes"
-CLIENT_EXEC_4b=3D"${CLIENT_EXEC}"
-CLIENT_CONF_4b=3D"${CLIENT_CONF_BASE} --remo= te 127.0.0.1 1196 udp --proto udp --cipher AES-128-CBC --data-ciphers AES-1= 92-CBC"
+TEST_NA= ME_3a=3D"t_server_null_client.sh-openvpn_current_udp_dc3"<= br>+SHOULD_PASS_3a=3D"yes&= quot;
+CLIENT_EXEC_3a= =3D"${CLIENT_EXEC}"
+CLIENT_CONF_3a=3D"${CLIENT_CONF_BASE} --remote 127.0.0.1 119= 6 udp --proto udp --cipher AES-128-CBC --data-ciphers AES-192-CBC"


# specific --data-cipher against server tha= t doesn't support that cipher
# --cipher ignored
-TEST_NAME_4c=3D"t_serv= er_null_client.sh-openvpn_current_udp_dc3_fail"
+TEST_NAME_3b=3D"t_server_null_client= .sh-openvpn_current_udp_dc3_fail"
+SHOULD_PASS_3b=3D"no"
+CLIENT_EXEC_3b=3D"${CLIENT_EXEC}"<= /span>
+CLIENT_CONF_3b=3D&qu= ot;${CLIENT_CONF_BASE} --remote 127.0.0.1 1196 udp --proto udp --cipher AES= -192-CBC --data-ciphers AES-128-CBC"
+
+SHOU= LD_PASS_4a=3D"yes"
+CLIENT_EXEC_4a=3D"${CLIENT_EXEC}"
+CLIENT_CONF_4a=3D"${CLIENT_CONF_BASE= } --remote 127.0.0.1 1197 tcp"
+
+TES= T_NAME_4b=3D"t_server_null_client.sh-openvpn_current_multisocket_ipv6_= udp"
+SHOULD_PAS= S_4b=3D"yes"
+CLIENT_CONF_4b=3D"${CLIENT_CONF_BASE} --rem= ote ::1 1197 udp"
+TEST_NAME_4c=3D&= quot;t_server_null_client.sh-openvpn_current_multisocket_ipv6_tcp_fail"= ;
SHOULD_PASS_4c=3D"no"
CLIENT_= EXEC_4c=3D"${CLIENT_EXEC}"
-CLIENT_CONF_4c=3D"${CLIENT_CONF_BASE} --remote 127.0.0.= 1 1196 udp --proto udp --cipher AES-192-CBC --data-ciphers AES-128-CBC"= ;
-
-TEST_NAME_5a=3D"t_server_null_client= .sh-openvpn_current_multisocket_ipv4_tcp"
-SHOULD_PASS_5a=3D"yes"
-CLIENT_EXEC_5a=3D"${CLIENT_EXEC}&q= uot;
-CLIENT_CONF_5a=3D= "${CLIENT_CONF_BASE} --remote 127.0.0.1 1197 tcp"
-

-TEST_NAME_5b=3D"t_server_null_client.sh-openvpn_curre= nt_multisocket_ipv6_udp"
-SHOULD_PASS_5b=3D"yes"
-CLIENT_EXEC_5b=3D"${CLIENT_EXEC}"
-CLIENT_CONF_5b=3D"${CLIENT_CO= NF_BASE} --remote ::1 1197 udp"

-
-TEST_N= AME_5c=3D"t_server_null_client.sh-openvpn_current_multisocket_ipv6_tcp= _fail"
-SHOULD_PAS= S_5c=3D"no"
-= CLIENT_EXEC_5c=3D"${CLIENT_EXEC}"
-CLIENT_CONF_5c=3D"${CLIENT_CONF_BASE} --remote := :1 1197 tcp"
+CL= IENT_CONF_4c=3D"${CLIENT_CONF_BASE} --remote ::1 1197 tcp"=

To view, visit change 1086. To unsubscribe, or fo= r help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I49c69144ab6dcf1d26c96c2eafc= 2346ad4e0ca75
Gerrit-Change-Number: 1086
Gerrit-PatchSet: 3
Gerrit-Owner: mattock <sasepp@...2783...>= ;
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: merged
--k22Z2v+3twk=--