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/+/1296?usp=email
to review the following change.
Change subject: pkcs11: Avoid some conversion warnings
......................................................................
pkcs11: Avoid some conversion warnings
Since we translate between different APIs
casts are unavoidable. Make sure they are safe.
Change-Id: If3331a2d0477634af077b4c29963dbec6d04e17b
Signed-off-by: Frank Lichtenheld <[email protected]>
---
M src/openvpn/pkcs11.c
1 file changed, 13 insertions(+), 12 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/96/1296/1
diff --git a/src/openvpn/pkcs11.c b/src/openvpn/pkcs11.c
index ce64135..a253503 100644
--- a/src/openvpn/pkcs11.c
+++ b/src/openvpn/pkcs11.c
@@ -53,18 +53,17 @@
}
#endif
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-
static void
-__mysleep(const unsigned long usec)
+__mysleep(unsigned long usec)
{
#if defined(_WIN32)
Sleep(usec / 1000);
#else
- usleep(usec);
+ if (usec > UINT_MAX)
+ {
+ usec = UINT_MAX;
+ }
+ usleep((useconds_t)usec);
#endif
}
@@ -531,7 +530,13 @@
goto cleanup;
}
- if (openvpn_base64_encode(certificate_blob, certificate_blob_size,
&internal_base64) == -1)
+ if (certificate_blob_size > INT_MAX)
+ {
+ msg(M_WARN, "PKCS#11: Invalid certificate size %zu",
certificate_blob_size);
+ goto cleanup;
+ }
+
+ if (openvpn_base64_encode(certificate_blob, (int)certificate_blob_size,
&internal_base64) == -1)
{
msg(M_WARN, "PKCS#11: Cannot encode certificate");
goto cleanup;
@@ -563,10 +568,6 @@
return success;
}
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
int
tls_ctx_use_pkcs11(struct tls_root_ctx *const ssl_ctx, bool
pkcs11_id_management,
const char *const pkcs11_id)
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1296?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: If3331a2d0477634af077b4c29963dbec6d04e17b
Gerrit-Change-Number: 1296
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
