From: "flichtenheld (Code Review)"
Date: Tue, 5 Aug 2025 16:00:20 +0000
In-Reply-To:
References:
Reply-To: frank@...2641..., arne-openvpn@...1227...,
openvpn-devel@lists.sourceforge.net
Message-ID:
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Disposition: inline
Content-Type: multipart/alternative; boundary="LLicvBsxcGA="; charset=UTF-8
Subject: [Openvpn-devel] [S] Change in openvpn[master]: crypto: Make sure
crypto flags are treated as unsigned
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
To: plaisthos
Cc: openvpn-devel
--LLicvBsxcGA=
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 reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1103?usp=3Demail
to look at the new patch set (#4).
Change subject: crypto: Make sure crypto flags are treated as unsigned
......................................................................
crypto: Make sure crypto flags are treated as unsigned
crypto_options.flags is already unsigned, make sure the
flags are as well to avoid spurious conversion warnings.
Change-Id: I89820c76e2e099f7acb817c71c8aeb83736ac556
Signed-off-by: Frank Lichtenheld
---
M src/openvpn/crypto.h
1 file changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/03/1103/4
diff --git a/src/openvpn/crypto.h b/src/openvpn/crypto.h
index cee4145..efd7f60 100644
--- a/src/openvpn/crypto.h
+++ b/src/openvpn/crypto.h
@@ -342,39 +342,39 @@
* keeping state between successive
* OpenVPN process startups. */
-#define CO_PACKET_ID_LONG_FORM (1 << 0)
+#define CO_PACKET_ID_LONG_FORM (1u << 0)
/**< Bit-flag indicating whether to use
* OpenVPN's long packet ID format. */
-#define CO_IGNORE_PACKET_ID (1 << 1)
+#define CO_IGNORE_PACKET_ID (1u << 1)
/**< Bit-flag indicating whether to ignore
* the packet ID of a received packet.
* This flag is used during processing
* of the first packet received from a
* client. */
-#define CO_MUTE_REPLAY_WARNINGS (1 << 2)
+#define CO_MUTE_REPLAY_WARNINGS (1u << 2)
/**< Bit-flag indicating not to display
* replay warnings. */
-#define CO_USE_TLS_KEY_MATERIAL_EXPORT (1 << 3)
+#define CO_USE_TLS_KEY_MATERIAL_EXPORT (1u << 3)
/**< Bit-flag indicating that data channel key derivation
* is done using TLS keying material export [RFC5705]
*/
-#define CO_RESEND_WKC (1 << 4)
+#define CO_RESEND_WKC (1u << 4)
/**< Bit-flag indicating that the client is expected to
* resend the wrapped client key with the 2nd packet (packet-id 1)
* like with the HARD_RESET_CLIENT_V3 packet */
-#define CO_FORCE_TLSCRYPTV2_COOKIE (1 << 5)
+#define CO_FORCE_TLSCRYPTV2_COOKIE (1u << 5)
/**< Bit-flag indicating that we do not allow clients that do
* not support resending the wrapped client key (WKc) with the
* third packet of the three-way handshake */
-#define CO_USE_CC_EXIT_NOTIFY (1 << 6)
+#define CO_USE_CC_EXIT_NOTIFY (1u << 6)
/**< Bit-flag indicating that explicit exit notifies should be
* sent via the control channel instead of using an OCC message
*/
-#define CO_USE_DYNAMIC_TLS_CRYPT (1 << 7)
+#define CO_USE_DYNAMIC_TLS_CRYPT (1u << 7)
/**< Bit-flag indicating that renegotiations are using tls-crypt
* with a TLS-EKM derived key.
*/
-#define CO_EPOCH_DATA_KEY_FORMAT (1 << 8)
+#define CO_EPOCH_DATA_KEY_FORMAT (1u << 8)
/**< Bit-flag indicating the epoch the data format. This format
* has the AEAD tag at the end of the packet and is using a longer
* 64-bit packet id that is split into a 16 bit epoch and 48 bit
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1103?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: I89820c76e2e099f7acb817c71c8aeb83736ac556
Gerrit-Change-Number: 1103
Gerrit-PatchSet: 4
Gerrit-Owner: flichtenheld
Gerrit-Reviewer: plaisthos
Gerrit-CC: openvpn-devel
Gerrit-Attention: plaisthos
Gerrit-MessageType: newpatchset
--LLicvBsxcGA=
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: plaisthos.
flichtenheld uploaded patch set #4 to this change.
<=
p>View C=
hange
crypto: Make sure crypto flags are treated as unsigned
cry=
pto_options.flags is already unsigned, make sure the
flags are as well t=
o avoid spurious conversion warnings.
Change-Id: I89820c76e2e099f7ac=
b817c71c8aeb83736ac556
Signed-off-by: Frank Lichtenheld <frank@...2716...=
1...>
---
M src/openvpn/crypto.h
1 file changed, 9 insertions(+=
), 9 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn=
refs/changes/03/1103/4
diff --git a/src/openvpn/crypto.h b/src/ope=
nvpn/crypto.h
index cee4145..efd7f60 100644
--- a/src/openvpn/crypto.h
+++ b/src/openvpn/crypto.h
@@ -342,39 +342,39 @@
* keeping state b=
etween successive
* OpenVPN process startups. */
-#defin=
e CO_PACKET_ID_LONG_FORM (1 << 0)
+#define CO_PACKET_ID_LONG_FORM (1u <=
< 0)
/**< Bit-flag indicating whether to use
* OpenVPN's long packet ID format. */
-#define CO_IGNORE_PACKET_ID =
(1 << 1)
+=
#define CO_IGNORE_PACKET_ID (1u << 1)
=
/**< Bit-flag indicating whether to ignore
* th=
e packet ID of a received packet.
* This flag is us=
ed during processing
* of the first packet received=
from a
* client. */
-#define CO_MUTE_REPLAY_WARNINGS (1 << 2=
)
+#define CO_MUTE_RE=
PLAY_WARNINGS (1u << 2)
/**< Bit-flag =
indicating not to display
* replay warnings. */
-#define CO_USE_TLS_KEY_MA=
TERIAL_EXPORT (1 << 3)
+#define CO_USE_TLS_KEY_MATERIAL_EXPORT (1u << 3)
<=
span> /**< Bit-flag indicating that data channel key derivation
* is done using TLS keying material export [RFC5705]
*/
-#=
define CO_RESEND_WKC (1 << 4)
+#define CO_RESEND_WKC (1=
u << 4)
/**< Bit-flag indicating that the cli=
ent is expected to
* resend the wrapped client key wi=
th the 2nd packet (packet-id 1)
* like with the HARD_=
RESET_CLIENT_V3 packet */
-#define CO_FORCE_TLSCRYPTV2_COOKIE (1 << 5)
+#define CO_FORCE_TLSCRYPTV2_COOKIE =
(1u << 5)
/**< Bit-flag indicating that we =
do not allow clients that do
* not support resending =
the wrapped client key (WKc) with the
* third packet =
of the three-way handshake */
-#define CO_USE_CC_EXIT_NOTIFY (1 << 6)
+#define CO_USE_CC_EXIT_NOTIFY =
(1u << 6)
/**< Bit-flag indicating that=
explicit exit notifies should be
* sent via the cont=
rol channel instead of using an OCC message
*/=
-#define CO_USE_DYNAMIC_TLS_C=
RYPT (1 << 7)
+#define CO_USE_DYNAMIC_TLS_CRYPT (1u << 7)
/**< Bit-flag indicating that renegotiations are using tls-crypt<=
/span>
* with a TLS-EKM derived key.
=
*/
-#define CO_EPOCH_D=
ATA_KEY_FORMAT (1 << 8)
+#define CO_EPOCH_DATA_KEY_FORMAT (1u << 8)
/**< Bit-flag indicating the epoch the data format. Thi=
s format
* has the AEAD tag at the end of the packet =
and is using a longer
* 64-bit packet id that is spli=
t into a 16 bit epoch and 48 bit
To vie=
w, visit change 1103. To unsubscribe, or for help writing mail filters, visit <=
a href=3D"http://gerrit.openvpn.net/settings">settings.
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I89820c76e2e099f7acb817c71c8=
aeb83736ac556
Gerrit-Change-Number: 1103
Gerrit-PatchSet: 4
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: newpatchset
--LLicvBsxcGA=--