From: "cron2 (Code Review)" Date: Mon, 19 Jan 2026 11:40:41 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., selva.nair@...277..., 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="XvagbwK9oJE="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: cryptoapi: Avoid conversion warnings List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: selvanair , plaisthos , openvpn-devel --XvagbwK9oJE= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/14= 64?usp=3Demail ) Change subject: cryptoapi: Avoid conversion warnings ...................................................................... cryptoapi: Avoid conversion warnings Due to the differences in the types of APIs between xkey provider and Windows cryptoapi we can't avoid the casts. And they should be safe generally since the involved sizes should be small compared to the maximum values. So just add asserts and explicit cast to avoid the warnings. Change-Id: I789022af7c4977c4dff4f7671f491fe5836828fa Signed-off-by: Frank Lichtenheld Acked-by: Selva Nair Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1464 Message-Id: <20260116135729.40545-1-frank@...2641...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg35= 304.html Signed-off-by: Gert Doering --- M src/openvpn/cryptoapi.c 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/src/openvpn/cryptoapi.c b/src/openvpn/cryptoapi.c index b18b9d4..49f5bbb 100644 --- a/src/openvpn/cryptoapi.c +++ b/src/openvpn/cryptoapi.c @@ -61,7 +61,7 @@ return 0; } -#else /* HAVE_XKEY_PROVIDER */ +#else /* HAVE_XKEY_PROVIDER */ static XKEY_EXTERNAL_SIGN_fn xkey_cng_sign; @@ -341,21 +341,18 @@ return rv; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wconversion" -#endif - /** Sign hash in tbs using EC key in cd and NCryptSignHash */ static int xkey_cng_ec_sign(CAPI_DATA *cd, unsigned char *sig, size_t *siglen, const = unsigned char *tbs, size_t tbslen) { - DWORD len =3D *siglen; + ASSERT(*siglen <=3D UINT_MAX); + ASSERT(tbslen <=3D UINT_MAX); + DWORD len =3D (DWORD)*siglen; msg(D_LOW, "Signing using NCryptSignHash with EC key"); - DWORD status =3D NCryptSignHash(cd->crypt_prov, NULL, (BYTE *)tbs, tbs= len, sig, len, &len, 0); + DWORD status =3D NCryptSignHash(cd->crypt_prov, NULL, (BYTE *)tbs, (DW= ORD)tbslen, sig, len, &len, 0); if (status !=3D ERROR_SUCCESS) { @@ -383,7 +380,9 @@ ASSERT(cd); ASSERT(sig); + ASSERT(*siglen <=3D UINT_MAX); ASSERT(tbs); + ASSERT(tbslen <=3D INT_MAX); DWORD status =3D ERROR_SUCCESS; DWORD len =3D 0; @@ -406,10 +405,10 @@ } else if (!strcmp(sigalg.padmode, "pss")) { - int saltlen =3D tbslen; /* digest size by default */ + int saltlen =3D (int)tbslen; /* digest size by default */ if (!strcmp(sigalg.saltlen, "max")) { - saltlen =3D xkey_max_saltlen(EVP_PKEY_bits(cd->pubkey), tbslen= ); + saltlen =3D xkey_max_saltlen(EVP_PKEY_bits(cd->pubkey), saltle= n); if (saltlen < 0) { msg(M_NONFATAL, "Error in cryptoapicert: invalid salt leng= th (%d)", saltlen); @@ -420,8 +419,8 @@ msg(D_LOW, "Signing using NCryptSignHash with PSS padding: hashalg= <%s>, saltlen <%d>", sigalg.mdname, saltlen); - BCRYPT_PSS_PADDING_INFO padinfo =3D { hashalg, - (DWORD)saltlen }; /* cast is s= afe as saltlen >=3D 0 */ + /* cast is safe as saltlen >=3D 0 */ + BCRYPT_PSS_PADDING_INFO padinfo =3D { hashalg, (DWORD)saltlen }; status =3D NCryptSignHash(cd->crypt_prov, &padinfo, (BYTE *)tbs, (= DWORD)tbslen, sig, (DWORD)*siglen, &len, BCRYPT_PAD_PSS); } @@ -442,10 +441,6 @@ return (*siglen > 0); } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - /** Dispatch sign op to xkey_cng__sign */ static int xkey_cng_sign(void *handle, unsigned char *sig, size_t *siglen, const unsi= gned char *tbs, -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1464?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings?usp=3Demail Gerrit-MessageType: merged Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I789022af7c4977c4dff4f7671f491fe5836828fa Gerrit-Change-Number: 1464 Gerrit-PatchSet: 2 Gerrit-Owner: flichtenheld Gerrit-Reviewer: cron2 Gerrit-Reviewer: plaisthos Gerrit-Reviewer: selvanair Gerrit-CC: openvpn-devel --XvagbwK9oJE= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 sub= mitted this change.

View Change

cryptoapi: Avoid conversion warnings

Due = to the differences in the types of APIs
between xkey provider and Window= s cryptoapi
we can't avoid the casts. And they should be
safe gen= erally since the involved sizes should
be small compared to the maximum = values. So
just add asserts and explicit cast to avoid
the warnings.<= br>
Change-Id: I789022af7c4977c4dff4f7671f491fe5836828fa
Signed-off-b= y: Frank Lichtenheld <frank@...2641...>
Acked-by: Selva Nair <s= elva.nair@...277...>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn= /+/1464
Message-Id: <20260116135729.40545-1-frank@...2641...>
U= RL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg353= 04.html
Signed-off-by: Gert Doering <gert@...1296...>
---
M = src/openvpn/cryptoapi.c
1 file changed, 11 insertions(+), 16 deletions(-= )

diff --git a/src/openvpn/cryptoapi.c b/src/openvpn/cryptoapi.cindex b18b9d4..49f5bbb 100644
--- a/src/openvpn/cryp= toapi.c
+++ b/src/openvpn/cryptoapi.c
@@ -6= 1,7 +61,7 @@
return 0;
}

-#else /* HAVE_XK= EY_PROVIDER */
+#else= /* HAVE_XKEY_PROVIDER */

static XKEY_E= XTERNAL_SIGN_fn xkey_cng_sign;

@@ -341,21= +341,18 @@
return rv;
}

-#if defined(__GN= UC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"<= br>-#endif
-
/** Sign hash in tbs usin= g EC key in cd and NCryptSignHash */
static int
= xkey_cng_ec_sign(CAPI_DATA *cd, unsigned char *sig, size_t *siglen, = const unsigned char *tbs,
size_t tbslen)<= /span>
{
- = DWORD len =3D *siglen;
+ ASSERT(*siglen <=3D UINT_MAX);
+ ASSERT(tbslen <=3D UINT_MAX);
+ DWORD len =3D (DWORD)*siglen;


msg(D_LOW, "Signing using NCryptS= ignHash with EC key");

- DWORD status =3D NCryptSignHash(cd->crypt_pr= ov, NULL, (BYTE *)tbs, tbslen, sig, len, &len, 0);
+ DWORD status =3D NCryptSignHash(cd-&= gt;crypt_prov, NULL, (BYTE *)tbs, (DWORD)tbslen, sig, len, &len, 0);


if (status !=3D ERROR_SUCCESS)<= br> {
@@ -383,7 +380,9 @@

ASSERT(cd);
ASSERT(sig);
+ ASSERT(*siglen <=3D UINT_M= AX);

ASSERT(tbs);
+ ASSERT(tbslen <=3D INT_MAX);

DWORD status =3D ERROR_SUCCESS;
DWO= RD len =3D 0;
@@ -406,10 +405,10 @@
}<= /span>
else if (!strcmp(sigalg.padmode, "pss"))

{
- = int saltlen =3D tbslen; /* digest size by default */
+ int saltlen =3D (int)tbslen;= /* digest size by default */
if (!strcmp(sigalg.s= altlen, "max"))
{
- saltlen =3D xkey_max_saltlen(EV= P_PKEY_bits(cd->pubkey), tbslen);
+ saltlen =3D xkey_max_saltlen(EVP_PKEY_bits(cd-= >pubkey), saltlen);
if (saltlen < 0)
{
msg(M_NONFATAL= , "Error in cryptoapicert: invalid salt length (%d)", saltlen);
@@ -420,8 +419,8 @@
msg(D_LOW, &quo= t;Signing using NCryptSignHash with PSS padding: hashalg <%s>, saltle= n <%d>",
sigalg.mdname, saltlen);

- = BCRYPT_PSS_PADDING_INFO padinfo =3D { hashalg,
- (DW= ORD)saltlen }; /* cast is safe as saltlen >=3D 0 */
+ /* cast is safe as saltlen >= =3D 0 */
+ BCR= YPT_PSS_PADDING_INFO padinfo =3D { hashalg, (DWORD)saltlen };
status =3D NCryptSignHash(cd->crypt_prov, &padinfo, (BYT= E *)tbs, (DWORD)tbslen, sig,

= (DWORD)*siglen, &len, BCRYPT_PAD_PSS);
}=
@@ -442,10 +441,6 @@
return (*siglen > 0)= ;
}

-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
/** Dispatch sign op to xkey= _cng_<rsa/ec>_sign */
static int
xk= ey_cng_sign(void *handle, unsigned char *sig, size_t *siglen, const unsigne= d char *tbs,

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

Gerrit-MessageType: merged
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I789022af7c4977c4dff4f7671f4= 91fe5836828fa
Gerrit-Change-Number: 1464
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-Reviewer: selvanair <selva.nair@...1665...= 77...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
= --XvagbwK9oJE=--