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=email
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 <[email protected]>
---
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_openssl.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
expected_len)
{
@@ -697,8 +692,8 @@
return SUCCESS;
}
- unsigned nku = 0;
- for (size_t i = 0; i < 8; i++)
+ unsigned int nku = 0;
+ for (int i = 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 = FAILURE;
- for (size_t i = 0; fFound != SUCCESS && i < expected_len; i++)
+ for (int i = 0; fFound != SUCCESS && i < expected_len; i++)
{
if (expected_ku[i] != 0 && (nku & expected_ku[i]) == expected_ku[i])
{
@@ -727,7 +722,7 @@
if (fFound != SUCCESS)
{
msg(D_TLS_ERRORS, "ERROR: Certificate has key usage %04x, expected one
of:", nku);
- for (size_t i = 0; i < expected_len && expected_ku[i]; i++)
+ for (int i = 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=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia6c3f0395bd6cd67064fe77420d9df2b66763049
Gerrit-Change-Number: 1445
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
