From: "flichtenheld (Code Review)" Date: Mon, 22 Jul 2024 11:35:48 +0000 References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: <9157d13486f6b44d891aae6bc5f935d1d000f991-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="SXl87eufRpo="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: Fix missing spaces in various messages List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos Cc: openvpn-devel --SXl87eufRpo= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: plaisthos. Hello plaisthos, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/679?usp=3Demail to review the following change. Change subject: Fix missing spaces in various messages ...................................................................... Fix missing spaces in various messages These result from broken up literals where it is easy to miss the missing space. Change-Id: Ic27d84c74c1dd6ff7973ca6966d186f475c67e21 Signed-off-by: Frank Lichtenheld --- M src/openvpn/dco.c M src/openvpn/multi.c M src/openvpn/options.c M src/openvpn/ssl_verify.c 4 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/79/679/1 diff --git a/src/openvpn/dco.c b/src/openvpn/dco.c index 78243b1..7f0d53d 100644 --- a/src/openvpn/dco.c +++ b/src/openvpn/dco.c @@ -185,7 +185,7 @@ } else { - msg(D_DCO_DEBUG, "Swapping primary and secondary keys to" + msg(D_DCO_DEBUG, "Swapping primary and secondary keys to " "primary-id=3D%d secondary-id=3D(to be deleted)", primary->key_id); } diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 162b23e..03177bb 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -1804,7 +1804,7 @@ } else if (dco_enabled(o)) { - msg(M_INFO, "Client does not support DATA_V2. Data channel offloai= ng " + msg(M_INFO, "Client does not support DATA_V2. Data channel offload= ing " "requires DATA_V2. Dropping client."); auth_set_client_reason(tls_multi, "Data channel negotiation " "failed (missing DATA_V2)"); @@ -1815,7 +1815,7 @@ * not accept our pushed ciphers */ if (proto & IV_PROTO_NCP_P2P) { - msg(M_WARN, "Note: peer reports running in P2P mode (no --pull/--c= lient" + msg(M_WARN, "Note: peer reports running in P2P mode (no --pull/--c= lient " "option). It will not negotiate ciphers with this server. " "Expect this connection to fail."); } @@ -2027,7 +2027,7 @@ /* Not EOF but other error -> fall through to error state */ default: /* We received an unknown/unexpected value. Assume failure. */ - msg(M_WARN, "WARNING: Unknown/unexpected value in deferred" + msg(M_WARN, "WARNING: Unknown/unexpected value in deferred " "client-connect resultfile"); ret =3D CC_RET_FAILED; } @@ -2427,7 +2427,7 @@ */ if (!mi->context.c2.push_ifconfig_defined) { - msg(D_MULTI_ERRORS, "MULTI: no dynamic or static remote" + msg(D_MULTI_ERRORS, "MULTI: no dynamic or static remote " "--ifconfig address is available for %s", multi_instance_string(mi, false, &gc)); } @@ -2443,7 +2443,7 @@ print_in_addr_t(mi->context.options.push_ifconfig_constraint_n= etmask, 0, &gc); /* JYFIXME -- this should cause the connection to fail */ - msg(D_MULTI_ERRORS, "MULTI ERROR: primary virtual IP for %s (%s)" + msg(D_MULTI_ERRORS, "MULTI ERROR: primary virtual IP for %s (%s) " "violates tunnel network/netmask constraint (%s/%s)", multi_instance_string(mi, false, &gc), print_in_addr_t(mi->context.c2.push_ifconfig_local, 0, &gc), @@ -2492,7 +2492,7 @@ } else if (mi->context.options.iroutes) { - msg(D_MULTI_ERRORS, "MULTI: --iroute options rejected for %s -- ir= oute" + msg(D_MULTI_ERRORS, "MULTI: --iroute options rejected for %s -- ir= oute " "only works with tun-style tunnels", multi_instance_string(mi, false, &gc)); } diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 64e67aa..ba9b05e 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -7033,7 +7033,7 @@ } else if (streq(p[0], "max-routes") && !p[2]) { - msg(M_WARN, "DEPRECATED OPTION: --max-routes option ignored." + msg(M_WARN, "DEPRECATED OPTION: --max-routes option ignored. " "The number of routes is unlimited as of OpenVPN 2.4. " "This option will be removed in a future version, " "please remove it from your configuration."); @@ -9328,7 +9328,7 @@ s++; } msg(M_WARN, "DEPRECATED FEATURE: automatically upcased= the " - "--x509-username-field parameter to '%s'; please u= pdate your" + "--x509-username-field parameter to '%s'; please u= pdate your " "configuration", p[j]); } } diff --git a/src/openvpn/ssl_verify.c b/src/openvpn/ssl_verify.c index 934ff8d..0b0e2c3 100644 --- a/src/openvpn/ssl_verify.c +++ b/src/openvpn/ssl_verify.c @@ -717,7 +717,7 @@ { const char *hex_fp =3D format_hex_ex(BPTR(&cert_fp), BLEN(&cer= t_fp), 0, 1, ":", &gc); - msg(D_TLS_ERRORS, "TLS Error: --tls-verify/--peer-fingerprint" + msg(D_TLS_ERRORS, "TLS Error: --tls-verify/--peer-fingerprint " "certificate hash verification failed. (got certificate " "fingerprint: %s)", hex_fp); goto cleanup; -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/679?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: Ic27d84c74c1dd6ff7973ca6966d186f475c67e21 Gerrit-Change-Number: 679 Gerrit-PatchSet: 1 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-MessageType: newchange --SXl87eufRpo= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: plaisthos.

flichtenheld would like plaisthos to review this change.

Vi= ew Change

Fix missing spaces in various messages

These result fr= om broken up literals where it
is easy to miss the missing space.
Change-Id: Ic27d84c74c1dd6ff7973ca6966d186f475c67e21
Signed-off-by: Fra= nk Lichtenheld <frank@...2641...>
---
M src/openvpn/dco.c
M = src/openvpn/multi.c
M src/openvpn/options.c
M src/openvpn/ssl_verify.= c
4 files changed, 10 insertions(+), 10 deletions(-)

git pull =
ssh://gerrit.openvpn.net:29418/openvpn refs/changes/79/679/1
diff -=
-git a/src/openvpn/dco.c b/src/openvpn/dco.c
index 78243b1.= .7f0d53d 100644
--- a/src/openvpn/dco.c
+++= b/src/openvpn/dco.c
@@ -185,7 +185,7 @@
= }
else
{- msg(D_DCO_DEBUG, &q= uot;Swapping primary and secondary keys to"
+ msg(D_DCO_DEBUG, "Swapping pr= imary and secondary keys to "
"p= rimary-id=3D%d secondary-id=3D(to be deleted)",
= primary->key_id);
}
= diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c
inde= x 162b23e..03177bb 100644
--- a/src/openvpn/multi.c<= br>+++ b/src/openvpn/multi.c
@@ -1804,7 +1804,7 @@
}
else if (dco_enabled(o)) {
- = msg(M_INFO, "Client does not support DATA_V2. Data channel offloaing = "
+ msg(M= _INFO, "Client does not support DATA_V2. Data channel offloading "= ;
"requires DATA_V2. Dropping client.&quo= t;);
auth_set_client_reason(tls_multi, "Data = channel negotiation "
= "failed (missing DATA_V2)");
@@ -1815,7 +1815,7 @= @
* not accept our pushed ciphers */
= if (proto & IV_PROTO_NCP_P2P)
{
- msg(M_WARN, "Note: pee= r reports running in P2P mode (no --pull/--client"

+ msg(M_WARN, "Note: peer re= ports running in P2P mode (no --pull/--client "
= "option). It will not negotiate ciphers with this server. "= ;
"Expect this connection to fail.")= ;
}
@@ -2027,7 +2027,7 @@
/* Not EOF but other error -> fall through to error state *= /
default:
/* We rece= ived an unknown/unexpected value. Assume failure. */
- msg(M_WARN, "WARNING: Unkn= own/unexpected value in deferred"
+ msg(M_WARN, "WARNING: Unknown/unexpecte= d value in deferred "
"client-co= nnect resultfile");
ret =3D CC_RET_FAILED= ;
}
@@ -2427,7 +2427,7 @@
*/
if (!mi->context.c2.push_ifconfig_defi= ned)
{
- msg(D_MULTI_ERRORS, "MULTI: no dynamic or static remote&= quot;
+ msg(D_= MULTI_ERRORS, "MULTI: no dynamic or static remote "
"--ifconfig address is available for %s",<= br> multi_instance_string(mi, false, &gc)); }
@@ -2443,7 +2443,7 @@
= print_in_addr_t(mi->context.options.push_ifconfig_constraint_netma= sk, 0, &gc);

/* JYFIXME -- t= his should cause the connection to fail */
- msg(D_MULTI_ERRORS, "MULTI ERROR: primary= virtual IP for %s (%s)"
+ msg(D_MULTI_ERRORS, "MULTI ERROR: primary virtual IP= for %s (%s) "
"violates tunnel netw= ork/netmask constraint (%s/%s)",
multi_in= stance_string(mi, false, &gc),
print_in_ad= dr_t(mi->context.c2.push_ifconfig_local, 0, &gc),
@@= -2492,7 +2492,7 @@
}
else if (mi= ->context.options.iroutes)
{
- msg(D_MULTI_ERRORS, "MULTI: --= iroute options rejected for %s -- iroute"
+ msg(D_MULTI_ERRORS, "MULTI: --irout= e options rejected for %s -- iroute "
&qu= ot;only works with tun-style tunnels",
mu= lti_instance_string(mi, false, &gc));
}
= diff --git a/src/openvpn/options.c b/src/openvpn/options.c
= index 64e67aa..ba9b05e 100644
--- a/src/openvpn/optio= ns.c
+++ b/src/openvpn/options.c
@@ -7033,7= +7033,7 @@
}
else if (streq(p[0]= , "max-routes") && !p[2])
{- msg(M_WARN, "DEPR= ECATED OPTION: --max-routes option ignored."
+ msg(M_WARN, "DEPRECATED OPTION: = --max-routes option ignored. "
"The = number of routes is unlimited as of OpenVPN 2.4. "
= "This option will be removed in a future version, "

"please remove it from your configuration.&q= uot;);
@@ -9328,7 +9328,7 @@
= s++;
}
= msg(M_WARN, "DEPRECATED FEATURE: automatically upcase= d the "
- = "--x509-username-field parameter to '%s'; pleas= e update your"
+= "--x509-username-field parameter to '%s= 9;; please update your "
&quo= t;configuration", p[j]);
}
= }
diff --git a/src/openvpn/ssl_verify.c = b/src/openvpn/ssl_verify.c
index 934ff8d..0b0e2c3 100644

--- a/src/openvpn/ssl_verify.c
+++ b/src/open= vpn/ssl_verify.c
@@ -717,7 +717,7 @@
= {
const char *hex_fp =3D format_hex_ex(BPTR= (&cert_fp), BLEN(&cert_fp),
= 0, 1, ":", &gc);
- msg(D_TLS_ERRORS, "TLS E= rror: --tls-verify/--peer-fingerprint"
+ msg(D_TLS_ERRORS, "TLS Error: --tl= s-verify/--peer-fingerprint "
"c= ertificate hash verification failed. (got certificate "
"fingerprint: %s)", hex_fp);
= goto cleanup;

To view, visi= t change = 679. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ic27d84c74c1dd6ff7973ca6966d= 186f475c67e21
Gerrit-Change-Number: 679
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-MessageType: newchange
--SXl87eufRpo=--