Attention is currently required from: MaxF, cron2, flichtenheld, plaisthos.
Hello cron2, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1217?usp=email
to look at the new patch set (#4).
The following approvals got outdated and were removed:
Code-Review-1 by cron2, Code-Review-1 by flichtenheld
Change subject: crypto: Make some casts to int explicit
......................................................................
crypto: Make some casts to int explicit
In all of these cases the cast is safe to do
since we have limits imposed in other ways.
And we want those values as int, so no
alternative to casting.
Change-Id: I3b8dd8d5671e31dba2a23a0a78f36d9dda034b88
Signed-off-by: Frank Lichtenheld <[email protected]>
---
M src/openvpn/crypto.c
1 file changed, 7 insertions(+), 14 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/17/1217/4
diff --git a/src/openvpn/crypto.c b/src/openvpn/crypto.c
index 6376c11..307d1ee 100644
--- a/src/openvpn/crypto.c
+++ b/src/openvpn/crypto.c
@@ -186,11 +186,6 @@
return;
}
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-
static void
openvpn_encrypt_v1(struct buffer *buf, struct buffer work, struct
crypto_options *opt)
{
@@ -302,7 +297,7 @@
if (ctx->hmac)
{
hmac_ctx_reset(ctx->hmac);
- hmac_ctx_update(ctx->hmac, hmac_start, BEND(&work) - hmac_start);
+ hmac_ctx_update(ctx->hmac, hmac_start, (int)(BEND(&work) -
hmac_start));
hmac_ctx_final(ctx->hmac, mac_out);
dmsg(D_PACKET_CONTENT, "ENCRYPT HMAC: %s",
format_hex(mac_out, hmac_ctx_size(ctx->hmac), 80, &gc));
@@ -533,7 +528,7 @@
}
}
- const int ad_size = BPTR(buf) - ad_start;
+ const int ad_size = (int)(BPTR(buf) - ad_start);
uint8_t *tag_ptr = NULL;
int data_len = 0;
@@ -1366,8 +1361,8 @@
int state = PARSE_INITIAL;
/* constants */
- const int hlen = strlen(static_key_head);
- const int flen = strlen(static_key_foot);
+ const int hlen = (int)strlen(static_key_head);
+ const int flen = (int)strlen(static_key_foot);
const int onekeylen = sizeof(key2->keys[0]);
CLEAR(*key2);
@@ -1378,7 +1373,9 @@
*/
if (flags & RKF_INLINE) /* 'file' is a string containing ascii
representation of key */
{
- size = strlen(file) + 1;
+ size_t buf_size = strlen(file) + 1;
+ ASSERT(buf_size <= INT_MAX);
+ size = (int)buf_size;
buf_set_read(&in, (const uint8_t *)file, size);
}
else /* 'file' is a filename which refers to a file containing the ascii
key */
@@ -1537,10 +1534,6 @@
gc_free(&gc);
}
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
int
write_key_file(const int nkeys, const char *filename)
{
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1217?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I3b8dd8d5671e31dba2a23a0a78f36d9dda034b88
Gerrit-Change-Number: 1217
Gerrit-PatchSet: 4
Gerrit-Owner: flichtenheld <[email protected]>
Gerrit-Reviewer: cron2 <[email protected]>
Gerrit-Reviewer: flichtenheld <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: MaxF <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
Gerrit-Attention: cron2 <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]>
Gerrit-Attention: MaxF <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
