From: "flichtenheld (Code Review)"
Date: Wed, 17 Dec 2025 14:25:27 +0000
In-Reply-To:
References:
Reply-To: frank@...2641..., arne-openvpn@...1227...,
matthias.andree@...68..., openvpn-devel@lists.sourceforge.net
Message-ID: <292c983e225e0a7dbfb6318798850253baa3750b-EmailReplacePatchSet-HTML@...2715...>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Disposition: inline
Content-Type: multipart/alternative; boundary="7CNxiM/7ThE="; charset=UTF-8
Subject: [Openvpn-devel] [S] Change in openvpn[master]: ssl_verify_openssl:
Avoid conversion warning in x509_verify_cert_ku
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
To: plaisthos , mandree
Cc: openvpn-devel
--7CNxiM/7ThE=
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: flichtenheld, plaisthos.
Hello mandree, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1445?usp=3Demail
to look at the new patch set (#2).
Change subject: ssl_verify_openssl: Avoid conversion warning in x509_verify=
_cert_ku
......................................................................
ssl_verify_openssl: Avoid conversion warning in x509_verify_cert_ku
Just use the correct types.
v2:
- Change type of expected_len argument to size_t
Change-Id: Ia6c3f0395bd6cd67064fe77420d9df2b66763049
Signed-off-by: Frank Lichtenheld
---
M src/openvpn/ssl_verify_backend.h
M src/openvpn/ssl_verify_mbedtls.c
M src/openvpn/ssl_verify_openssl.c
3 files changed, 5 insertions(+), 14 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/45/1445/2
diff --git a/src/openvpn/ssl_verify_backend.h b/src/openvpn/ssl_verify_back=
end.h
index 1d56533..d70f2df 100644
--- a/src/openvpn/ssl_verify_backend.h
+++ b/src/openvpn/ssl_verify_backend.h
@@ -243,7 +243,7 @@
* if key usage is not enabled, or the values do not =
match.
*/
result_t x509_verify_cert_ku(openvpn_x509_cert_t *x509, const unsigned *co=
nst expected_ku,
- int expected_len);
+ size_t expected_len);
/*
* Verify X.509 extended key usage extension field.
diff --git a/src/openvpn/ssl_verify_mbedtls.c b/src/openvpn/ssl_verify_mbed=
tls.c
index b7de550..a38f5e9 100644
--- a/src/openvpn/ssl_verify_mbedtls.c
+++ b/src/openvpn/ssl_verify_mbedtls.c
@@ -483,7 +483,7 @@
}
result_t
-x509_verify_cert_ku(mbedtls_x509_crt *cert, const unsigned *const expected=
_ku, int expected_len)
+x509_verify_cert_ku(mbedtls_x509_crt *cert, const unsigned int *const expe=
cted_ku, size_t expected_len)
{
msg(D_HANDSHAKE, "Validating certificate key usage");
diff --git a/src/openvpn/ssl_verify_openssl.c b/src/openvpn/ssl_verify_open=
ssl.c
index 633f78d..ec7acf8 100644
--- a/src/openvpn/ssl_verify_openssl.c
+++ b/src/openvpn/ssl_verify_openssl.c
@@ -674,13 +674,8 @@
return FAILURE;
}
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-
result_t
-x509_verify_cert_ku(X509 *x509, const unsigned *const expected_ku, int exp=
ected_len)
+x509_verify_cert_ku(X509 *x509, const unsigned int *const expected_ku, siz=
e_t expected_len)
{
ASN1_BIT_STRING *ku =3D X509_get_ext_d2i(x509, NID_key_usage, NULL, NU=
LL);
@@ -697,8 +692,8 @@
return SUCCESS;
}
- unsigned nku =3D 0;
- for (size_t i =3D 0; i < 8; i++)
+ unsigned int nku =3D 0;
+ for (int i =3D 0; i < 8; i++)
{
if (ASN1_BIT_STRING_get_bit(ku, i))
{
@@ -738,10 +733,6 @@
return fFound;
}
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
result_t
x509_verify_cert_eku(X509 *x509, const char *const expected_oid)
{
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1445?usp=3Demail
To unsubscribe, or for help writing mail filters, visit http://gerrit.openv=
pn.net/settings?usp=3Demail
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia6c3f0395bd6cd67064fe77420d9df2b66763049
Gerrit-Change-Number: 1445
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld
Gerrit-Reviewer: mandree
Gerrit-Reviewer: plaisthos
Gerrit-CC: openvpn-devel
Gerrit-Attention: plaisthos
Gerrit-Attention: flichtenheld
--7CNxiM/7ThE=
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is cur=
rently required from: flichtenheld, plaisthos.
flichtenheld uploaded patch set #2 to this change.
<=
p>View C=
hange
ssl_verify_openssl: Avoid conversion warning in =
x509_verify_cert_ku
Just use the correct types.
v2:
- Cha=
nge type of expected_len argument to size_t
Change-Id: Ia6c3f0395bd6=
cd67064fe77420d9df2b66763049
Signed-off-by: Frank Lichtenheld <frank@=
...2641...>
---
M src/openvpn/ssl_verify_backend.h
M src/openvp=
n/ssl_verify_mbedtls.c
M src/openvpn/ssl_verify_openssl.c
3 files cha=
nged, 5 insertions(+), 14 deletions(-)
git pull =
ssh://gerrit.openvpn.net:29418/openvpn refs/changes/45/1445/2
diff =
--git a/src/openvpn/ssl_verify_backend.h b/src/openvpn/ssl_verify_backend.h=
index 1d56533..d70f2df 100644
--- a/src/op=
envpn/ssl_verify_backend.h
+++ b/src/openvpn/ssl_verify_bac=
kend.h
@@ -243,7 +243,7 @@
* =
if key usage is not enabled, or the values do not match.
*/
result_t x509_verify_cert_ku(openvpn_x509_cert=
_t *x509, const unsigned *const expected_ku,
- int expected_len);
+ =
size_t expected_len);
/*
=
* Verify X.509 extended key usage extension field.
=
diff --git a/src/openvpn/ssl_verify_mbedtls.c b/src/openvpn/ssl_verify_mbed=
tls.c
index b7de550..a38f5e9 100644
--- a/s=
rc/openvpn/ssl_verify_mbedtls.c
+++ b/src/openvpn/ssl_verif=
y_mbedtls.c
@@ -483,7 +483,7 @@
}
result_t
-x509_verify_cert_ku(mbedtls_x509_crt *cert, const unsigned *c=
onst expected_ku, int expected_len)
+x509_verify_cert_ku(mbedtls_x509_crt *cert, const unsigned =
int *const expected_ku, size_t expected_len)
{
<=
span> msg(D_HANDSHAKE, "Validating certificate key usage");=
span>
diff --git a/src/openvpn/ssl_verify_openss=
l.c b/src/openvpn/ssl_verify_openssl.c
index 633f78d..ec7ac=
f8 100644
--- a/src/openvpn/ssl_verify_openssl.c
=
+++ b/src/openvpn/ssl_verify_openssl.c
@@ -674,13 +67=
4,8 @@
return FAILURE;
}
-#if defined(__GN=
UC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"<=
br>-#endif
-
result_t
-x509_verify_cert_ku(X509 *x509, const =
unsigned *const expected_ku, int expected_len)
+x509_verify_cert_ku(X509 *x509, const unsigned i=
nt *const expected_ku, size_t expected_len)
{
ASN1_BIT_STRING *ku =3D X509_get_ext_d2i(x509, NID_key_usage, NULL=
, NULL);
@@ -697,8 +692,8 @@
return SUCCESS;
}
- unsigned nku =3D 0;
- for (size_t i =3D 0; =
i < 8; i++)
+ u=
nsigned int nku =3D 0;
+ for (int i =3D 0; i < 8; i++)
{
if (ASN1_BIT_STRING_get_bit(ku, i))
{=
@@ -738,10 +733,6 @@
return fFound;=
span>
}
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
result_t
x509_=
verify_cert_eku(X509 *x509, const char *const expected_oid)
{
To view, visit change 1445. To unsubscr=
ibe, or for help writing mail filters, visit settings.
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia6c3f0395bd6cd67064fe77420d=
9df2b66763049
Gerrit-Change-Number: 1445
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <frank@...2723...=
.>
Gerrit-Reviewer: mandree <matthias.andree@...220...=
..68...>
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-Attention: flichtenheld <frank@...2375...=
41...>
=
--7CNxiM/7ThE=--