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/+/1464?usp=email
to review the following change.
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 <[email protected]>
---
M src/openvpn/cryptoapi.c
1 file changed, 11 insertions(+), 16 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/64/1464/1
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 = *siglen;
+ ASSERT(*siglen <= UINT_MAX);
+ ASSERT(tbslen <= UINT_MAX);
+ DWORD len = (DWORD)*siglen;
msg(D_LOW, "Signing using NCryptSignHash with EC key");
- DWORD status = NCryptSignHash(cd->crypt_prov, NULL, (BYTE *)tbs, tbslen,
sig, len, &len, 0);
+ DWORD status = NCryptSignHash(cd->crypt_prov, NULL, (BYTE *)tbs,
(DWORD)tbslen, sig, len, &len, 0);
if (status != ERROR_SUCCESS)
{
@@ -383,7 +380,9 @@
ASSERT(cd);
ASSERT(sig);
+ ASSERT(*siglen <= UINT_MAX);
ASSERT(tbs);
+ ASSERT(tbslen <= INT_MAX);
DWORD status = ERROR_SUCCESS;
DWORD len = 0;
@@ -406,10 +405,10 @@
}
else if (!strcmp(sigalg.padmode, "pss"))
{
- int saltlen = tbslen; /* digest size by default */
+ int saltlen = (int)tbslen; /* digest size by default */
if (!strcmp(sigalg.saltlen, "max"))
{
- saltlen = xkey_max_saltlen(EVP_PKEY_bits(cd->pubkey), tbslen);
+ saltlen = 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, "Signing using NCryptSignHash with PSS padding: hashalg
<%s>, saltlen <%d>",
sigalg.mdname, saltlen);
- BCRYPT_PSS_PADDING_INFO padinfo = { hashalg,
- (DWORD)saltlen }; /* cast is safe
as saltlen >= 0 */
+ /* cast is safe as saltlen >= 0 */
+ BCRYPT_PSS_PADDING_INFO padinfo = { hashalg, (DWORD)saltlen };
status = 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_<rsa/ec>_sign */
static int
xkey_cng_sign(void *handle, unsigned char *sig, size_t *siglen, const unsigned
char *tbs,
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1464?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: I789022af7c4977c4dff4f7671f491fe5836828fa
Gerrit-Change-Number: 1464
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
