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/+/1352?usp=email
to review the following change.
Change subject: pkcs11_openssl: Silence a conversion warning
......................................................................
pkcs11_openssl: Silence a conversion warning
The only caller of this function uses a constant
for this parameter, so this is all quite safe. Add
an ASSERT for good measure anyway to make the assumption
explicit.
Change-Id: I6079bf9e7f6b37cb2e2d7f28851a77d0b08be995
Signed-off-by: Frank Lichtenheld <[email protected]>
---
M src/openvpn/pkcs11_openssl.c
1 file changed, 2 insertions(+), 11 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/52/1352/1
diff --git a/src/openvpn/pkcs11_openssl.c b/src/openvpn/pkcs11_openssl.c
index f619b95..1d527db 100644
--- a/src/openvpn/pkcs11_openssl.c
+++ b/src/openvpn/pkcs11_openssl.c
@@ -428,18 +428,12 @@
return dn;
}
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-
int
pkcs11_certificate_serial(pkcs11h_certificate_t certificate, char *serial,
size_t serial_len)
{
X509 *x509 = NULL;
BIO *bio = NULL;
int ret = 1;
- int n;
if ((x509 = pkcs11h_openssl_getX509(certificate)) == NULL)
{
@@ -454,7 +448,8 @@
}
i2a_ASN1_INTEGER(bio, X509_get_serialNumber(x509));
- n = BIO_read(bio, serial, serial_len - 1);
+ ASSERT(serial_len <= INT_MAX);
+ int n = BIO_read(bio, serial, (int)serial_len - 1);
if (n < 0)
{
@@ -474,8 +469,4 @@
return ret;
}
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
#endif /* defined(ENABLE_PKCS11) && defined(ENABLE_OPENSSL) */
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1352?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: I6079bf9e7f6b37cb2e2d7f28851a77d0b08be995
Gerrit-Change-Number: 1352
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
