From: "flichtenheld (Code Review)" Date: Tue, 16 Dec 2025 17:53:22 +0000 References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: <90ad906283534ffdf41ecefd668f2facce1591fe-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="6JqKIYm9QlM="; 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 Cc: openvpn-devel --6JqKIYm9QlM= 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/+/1445?usp=3Demail to review the following change. 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 type. Change-Id: Ia6c3f0395bd6cd67064fe77420d9df2b66763049 Signed-off-by: Frank Lichtenheld --- M src/openvpn/ssl_verify_openssl.c 1 file changed, 4 insertions(+), 13 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/45/1445/1 diff --git a/src/openvpn/ssl_verify_openssl.c b/src/openvpn/ssl_verify_open= ssl.c index 633f78d..92b0e98 100644 --- a/src/openvpn/ssl_verify_openssl.c +++ b/src/openvpn/ssl_verify_openssl.c @@ -674,11 +674,6 @@ 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) { @@ -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)) { @@ -716,7 +711,7 @@ msg(D_HANDSHAKE, "Validating certificate key usage"); result_t fFound =3D FAILURE; - for (size_t i =3D 0; fFound !=3D SUCCESS && i < expected_len; i++) + for (int i =3D 0; fFound !=3D SUCCESS && i < expected_len; i++) { if (expected_ku[i] !=3D 0 && (nku & expected_ku[i]) =3D=3D expecte= d_ku[i]) { @@ -727,7 +722,7 @@ if (fFound !=3D SUCCESS) { msg(D_TLS_ERRORS, "ERROR: Certificate has key usage %04x, expected= one of:", nku); - for (size_t i =3D 0; i < expected_len && expected_ku[i]; i++) + for (int i =3D 0; i < expected_len && expected_ku[i]; i++) { msg(D_TLS_ERRORS, " * %04x", expected_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: newchange Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Ia6c3f0395bd6cd67064fe77420d9df2b66763049 Gerrit-Change-Number: 1445 Gerrit-PatchSet: 1 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos --6JqKIYm9QlM= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is cur= rently required from: plaisthos.

flichtenheld would like plaisthos to review this change.

V= iew Change

ssl_verify_openssl: Avoid conversion warnin=
g in x509_verify_cert_ku

Just use the correct type.

Change-Id= : Ia6c3f0395bd6cd67064fe77420d9df2b66763049
Signed-off-by: Frank Lichten= held <frank@...2641...>
---
M src/openvpn/ssl_verify_openssl.c<= br>1 file changed, 4 insertions(+), 13 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/45/1445/1<=
/pre>
-#if defined(__GNUC__) || defined(__clang_=
_)
-#pragma GCC diagnos= tic push
-#pragma GCC d= iagnostic ignored "-Wconversion"
-#endif
-
result_t
x509_verify_cert_ku(X509 = *x509, const unsigned *const expected_ku, int expected_len)
{
@@ -697,8 +692,8 @@
return SUC= CESS;
}

- unsigned nku =3D 0;
- for (size_t i =3D 0; i < 8; i++)+ unsigned int nku =3D 0;<= /span>
+ for (int i =3D 0= ; i < 8; i++)
{
if (ASN1_B= IT_STRING_get_bit(ku, i))
{
@@ -71= 6,7 +711,7 @@

msg(D_HANDSHAKE, "= ;Validating certificate key usage");
result_t fFo= und =3D FAILURE;
- f= or (size_t i =3D 0; fFound !=3D SUCCESS && i < expected_len; i++= )
+ for (int i =3D= 0; fFound !=3D SUCCESS && i < expected_len; i++)
{

if (expected_ku[i] !=3D 0 && (nku= & expected_ku[i]) =3D=3D expected_ku[i])
{
@@ -727,7 +722,7 @@
if (fFound !=3D SUCC= ESS)
{
msg(D_TLS_ERRORS, &quo= t;ERROR: Certificate has key usage %04x, expected one of:", nku);
- for (size_t i =3D = 0; i < expected_len && expected_ku[i]; i++)
+ for (int i =3D 0; i < expecte= d_len && expected_ku[i]; i++)
{
= msg(D_TLS_ERRORS, " * %04x", expected_ku[i]);<= /span>
}
@@ -738,10 +733,6 @@
<= span> return fFound;

}

-#if defined(__GNUC__) || defined(__= clang__)

-#pragma GCC d= iagnostic pop
-#endif
-
resul= t_t
x509_verify_cert_eku(X509 *x509, const char *const exp= ected_oid)
{

To view, = visit ch= ange 1445. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia6c3f0395bd6cd67064fe77420d= 9df2b66763049
Gerrit-Change-Number: 1445
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...>
= --6JqKIYm9QlM=--