From: "cron2 (Code Review)" Date: Wed, 27 Aug 2025 18:50:37 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="lGYg2Az854c="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: options: Make sure option types are treated as unsigned List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: plaisthos , openvpn-devel --lGYg2Az854c= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/11= 06?usp=3Demail ) Change subject: options: Make sure option types are treated as unsigned ...................................................................... options: Make sure option types are treated as unsigned verify_permissions already expects them to be unsigned, make sure they are to avoid spurious conversion warnings. Change-Id: I1d27cb81d32058e40147e1d6dcd12df7f6cb2b30 Signed-off-by: Frank Lichtenheld Acked-by: Arne Schwabe Message-Id: <20250826183941.21338-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32= 685.html Signed-off-by: Gert Doering --- M src/openvpn/options.h M src/openvpn/ssl_ncp.c M src/openvpn/ssl_ncp.h 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/openvpn/options.h b/src/openvpn/options.h index 38e67c8..4fa6800 100644 --- a/src/openvpn/options.h +++ b/src/openvpn/options.h @@ -729,38 +729,38 @@ /* * Option classes. */ -#define OPT_P_GENERAL (1 << 0) -#define OPT_P_UP (1 << 1) -#define OPT_P_ROUTE (1 << 2) -#define OPT_P_DHCPDNS (1 << 3) /* includes ip windows options like= */ -#define OPT_P_SCRIPT (1 << 4) -#define OPT_P_SETENV (1 << 5) -#define OPT_P_SHAPER (1 << 6) -#define OPT_P_TIMER (1 << 7) -#define OPT_P_PERSIST (1 << 8) -#define OPT_P_PERSIST_IP (1 << 9) -#define OPT_P_COMP (1 << 10) /* TODO */ -#define OPT_P_MESSAGES (1 << 11) -#define OPT_P_NCP (1 << 12) /**< Negotiable crypto parameters = */ -#define OPT_P_TLS_PARMS (1 << 13) /* TODO */ -#define OPT_P_MTU (1 << 14) /* TODO */ -#define OPT_P_NICE (1 << 15) -#define OPT_P_PUSH (1 << 16) -#define OPT_P_INSTANCE (1 << 17) /**< allowed in ccd, client-connec= t etc*/ -#define OPT_P_CONFIG (1 << 18) -#define OPT_P_EXPLICIT_NOTIFY (1 << 19) -#define OPT_P_ECHO (1 << 20) -#define OPT_P_INHERIT (1 << 21) -#define OPT_P_ROUTE_EXTRAS (1 << 22) -#define OPT_P_PULL_MODE (1 << 23) -#define OPT_P_PLUGIN (1 << 24) -#define OPT_P_SOCKBUF (1 << 25) -#define OPT_P_SOCKFLAGS (1 << 26) -#define OPT_P_CONNECTION (1 << 27) -#define OPT_P_PEER_ID (1 << 28) -#define OPT_P_INLINE (1 << 29) -#define OPT_P_PUSH_MTU (1 << 30) -#define OPT_P_ROUTE_TABLE (1 << 31) +#define OPT_P_GENERAL (1u << 0) +#define OPT_P_UP (1u << 1) +#define OPT_P_ROUTE (1u << 2) +#define OPT_P_DHCPDNS (1u << 3) /* includes ip windows options lik= e */ +#define OPT_P_SCRIPT (1u << 4) +#define OPT_P_SETENV (1u << 5) +#define OPT_P_SHAPER (1u << 6) +#define OPT_P_TIMER (1u << 7) +#define OPT_P_PERSIST (1u << 8) +#define OPT_P_PERSIST_IP (1u << 9) +#define OPT_P_COMP (1u << 10) /* TODO */ +#define OPT_P_MESSAGES (1u << 11) +#define OPT_P_NCP (1u << 12) /**< Negotiable crypto parameters= */ +#define OPT_P_TLS_PARMS (1u << 13) /* TODO */ +#define OPT_P_MTU (1u << 14) /* TODO */ +#define OPT_P_NICE (1u << 15) +#define OPT_P_PUSH (1u << 16) +#define OPT_P_INSTANCE (1u << 17) /**< allowed in ccd, client-conne= ct etc*/ +#define OPT_P_CONFIG (1u << 18) +#define OPT_P_EXPLICIT_NOTIFY (1u << 19) +#define OPT_P_ECHO (1u << 20) +#define OPT_P_INHERIT (1u << 21) +#define OPT_P_ROUTE_EXTRAS (1u << 22) +#define OPT_P_PULL_MODE (1u << 23) +#define OPT_P_PLUGIN (1u << 24) +#define OPT_P_SOCKBUF (1u << 25) +#define OPT_P_SOCKFLAGS (1u << 26) +#define OPT_P_CONNECTION (1u << 27) +#define OPT_P_PEER_ID (1u << 28) +#define OPT_P_INLINE (1u << 29) +#define OPT_P_PUSH_MTU (1u << 30) +#define OPT_P_ROUTE_TABLE (1u << 31) #define OPT_P_DEFAULT (~(OPT_P_INSTANCE | OPT_P_PULL_MODE)) diff --git a/src/openvpn/ssl_ncp.c b/src/openvpn/ssl_ncp.c index 5e094a2..51f7f92 100644 --- a/src/openvpn/ssl_ncp.c +++ b/src/openvpn/ssl_ncp.c @@ -307,7 +307,7 @@ } bool -check_pull_client_ncp(struct context *c, const int found) +check_pull_client_ncp(struct context *c, const unsigned int found) { if (found & OPT_P_NCP) { diff --git a/src/openvpn/ssl_ncp.h b/src/openvpn/ssl_ncp.h index 2b2ff85..ed5d281 100644 --- a/src/openvpn/ssl_ncp.h +++ b/src/openvpn/ssl_ncp.h @@ -49,7 +49,7 @@ * * @return Wether the client NCP process suceeded or failed */ -bool check_pull_client_ncp(struct context *c, int found); +bool check_pull_client_ncp(struct context *c, unsigned int found); /** * Iterates through the ciphers in server_list and return the first -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1106?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: I1d27cb81d32058e40147e1d6dcd12df7f6cb2b30 Gerrit-Change-Number: 1106 Gerrit-PatchSet: 10 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-MessageType: merged --lGYg2Az854c= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 submitted this change.

View Change

options: Make sure option types are treated a=
s unsigned

verify_permissions already expects them to be unsigned,make sure they are to avoid spurious conversion warnings.

Change-I= d: I1d27cb81d32058e40147e1d6dcd12df7f6cb2b30
Signed-off-by: Frank Lichte= nheld <frank@...2641...>
Acked-by: Arne Schwabe <arne-openvpn@...220...= ..1227...>
Message-Id: <20250826183941.21338-1-gert@...1296...>=
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/m= sg32685.html
Signed-off-by: Gert Doering <gert@...1296...>
---<= br>M src/openvpn/options.h
M src/openvpn/ssl_ncp.c
M src/openvpn/ssl_= ncp.h
3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/openvpn/options.h b/src/openvpn/options.h
index 38e67c8..4fa6800 100644
--- a/src/openvpn/options.= h
+++ b/src/openvpn/options.h
@@ -729,38 +7= 29,38 @@
/*
* Option classes.
= */
-#define OPT= _P_GENERAL (1 << 0)
-#define OPT_P_UP (1 << 1)
-#define OPT_P_ROUTE (1 <<= ; 2)
-#define OPT_P_DHC= PDNS (1 << 3) /* includes ip windows options like */-#define OPT_P_SCRIPT = (1 << 4)
-#define= OPT_P_SETENV (1 << 5)
-#define OPT_P_SHAPER (1 << 6)
-#define OPT_P_TIMER (1 <= ;< 7)
-#define OPT_P= _PERSIST (1 << 8)
-#define OPT_P_PERSIST_IP (1 << 9)
-#define OPT_P_COMP (1 << = 10) /* TODO */
-#define= OPT_P_MESSAGES (1 << 11)
-#define OPT_P_NCP (1 << 12) /**< Nego= tiable crypto parameters */
-#define OPT_P_TLS_PARMS (1 << 13) /* TODO */
-#define OPT_P_MTU (1 &= lt;< 14) /* TODO */
= -#define OPT_P_NICE (1 << 15)
-#define OPT_P_PUSH (1 << 16)

-#define OPT_P_INSTANCE = (1 << 17) /**< allowed in ccd, client-connect etc*/
= -#define OPT_P_CONFIG (1= << 18)
-#define = OPT_P_EXPLICIT_NOTIFY (1 << 19)
-#define OPT_P_ECHO (1 << 20)
-#define OPT_P_INHERIT (1 &l= t;< 21)
-#define OPT= _P_ROUTE_EXTRAS (1 << 22)
-#define OPT_P_PULL_MODE (1 << 23)
-#define OPT_P_PLUGIN (1 <&= lt; 24)
-#define OPT_P_= SOCKBUF (1 << 25)
-#define OPT_P_SOCKFLAGS (1 << 26)
-#define OPT_P_CONNECTION (1 <<= 27)
-#define OPT_P_PEE= R_ID (1 << 28)
-#define OPT_P_INLINE (1 << 29)
-#define OPT_P_PUSH_MTU (1 << 3= 0)
-#define OPT_P_ROUTE= _TABLE (1 << 31)
+#define OPT_P_GENERAL (1u << 0)
+#define OPT_P_UP (1u <<= ; 1)
+#define OPT_P_R= OUTE (1u << 2)
+#define OPT_P_DHCPDNS (1u << 3) /* includes ip win= dows options like */
= +#define OPT_P_SCRIPT (1u << 4)
+#define OPT_P_SETENV (1u << 5)
+#define OPT_P_SHAPER = (1u << 6)
+#define OPT_P_TIMER (1u << 7)
+#define OPT_P_PERSIST (1u << 8)=
+#define OPT_P_PERSI= ST_IP (1u << 9)
+#define OPT_P_COMP (1u << 10) /* TODO */
= +#define OPT_P_MESSAGES = (1u << 11)
+#de= fine OPT_P_NCP (1u << 12) /**< Negotiable crypto param= eters */
+#define OPT= _P_TLS_PARMS (1u << 13) /* TODO */
+#define OPT_P_MTU (1u << 14) /= * TODO */
+#define OP= T_P_NICE (1u << 15)
+#define OPT_P_PUSH (1u << 16)
<= span style=3D"color: hsl(120, 100%, 40%);">+#define OPT_P_INSTANCE (= 1u << 17) /**< allowed in ccd, client-connect etc*/

+#define OPT_P_CONFIG (1u = << 18)
+#define= OPT_P_EXPLICIT_NOTIFY (1u << 19)
+#define OPT_P_ECHO (1u << 20)+#define OPT_P_INHERIT = (1u << 21)
+#= define OPT_P_ROUTE_EXTRAS (1u << 22)
+#define OPT_P_PULL_MODE (1u << 23)
+#define OPT_P_PLUGIN = (1u << 24)
+#define OPT_P_SOCKBUF (1u << 25)
+#define OPT_P_SOCKFLAGS (1u <<= ; 26)
+#define OPT_P_= CONNECTION (1u << 27)
+#define OPT_P_PEER_ID (1u << 28)
+#define OPT_P_INLINE (1u &= lt;< 29)

+#define = OPT_P_PUSH_MTU (1u << 30)
+#define OPT_P_ROUTE_TABLE (1u << 31)
#define OPT_P_DEFAULT (~(OPT_P_INSTANCE | OPT_P_P= ULL_MODE))

diff --git a/src/openvpn/ssl_n= cp.c b/src/openvpn/ssl_ncp.c
index 5e094a2..51f7f92 100644<= /span>
--- a/src/openvpn/ssl_ncp.c
+++ b/src/openv= pn/ssl_ncp.c
@@ -307,7 +307,7 @@
}<= br>
bool
-check_pull_client_ncp(struct context *c, const int found)=
+check_pull_client_ncp(stru= ct context *c, const unsigned int found)
{
if (found & OPT_P_NCP)

{
dif= f --git a/src/openvpn/ssl_ncp.h b/src/openvpn/ssl_ncp.h
ind= ex 2b2ff85..ed5d281 100644
--- a/src/openvpn/ssl_ncp.h

+++ b/src/openvpn/ssl_ncp.h
@@ -49,7 +49,7 @@
*
* @return Wether the client NCP proce= ss suceeded or failed
*/
-bool check_pull_client_ncp(struct context *c, int foun= d);
+bool check_pull_= client_ncp(struct context *c, unsigned int found);
=
/**
* Iterates through the ciphers in server_l= ist and return the first

To view, visit= change = 1106. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I1d27cb81d32058e40147e1d6dcd= 12df7f6cb2b30
Gerrit-Change-Number: 1106
Gerrit-PatchSet: 10
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: merged
--lGYg2Az854c=--