mirror/openvpn
0
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2024-09-19 19:42:30 +02:00
Code

Various fixes for -Wconversion errors

Browse Source 
These are all fixes I considered "safe". They either

- Have sufficient checks/shifts for a cast to be safe
- Fix the type of a variable without requiring code changes
- Are in non-critical unittest code

v2:
 - add min_size instead of abusing min_int
v6:
 - remove change of return value of link_socket_write.
   Move to separate patch.

Change-Id: I6818b153bdeb1eed65870af99b0531e95807fe0f
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Arne Schwabe <arne@rfc2549.org>
Message-Id: <20240910122008.23507-1-gert@greenie.muc.de>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg29172.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Frank Lichtenheld 2024-09-10 14:20:08 +02:00 committed by Gert Doering
parent aa1dd09b5f
commit 53449cb61f
15 changed files with 48 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openvpn/buffer.c
View File

@ -326,7 +326,7 @@ buffer_write_file(const char *filename, const struct buffer *buf)
return false;
}
const int size = write(fd, BPTR(buf), BLEN(buf));
const ssize_t size = write(fd, BPTR(buf), BLEN(buf));
if (size != BLEN(buf))
{
msg(M_ERRNO, "Write error on file '%s'", filename);
@ -863,7 +863,7 @@ buf_parse(struct buffer *buf, const int delim, char *line, const int size)
{
break;
}
line[n++] = c;
line[n++] = (char)c;
}
while (c);

10
src/openvpn/crypto.c
View File

@ -26,6 +26,8 @@
#include "config.h"
#endif
#include <inttypes.h>
#include "syshead.h"
#include <string.h>
@ -1283,8 +1285,8 @@ read_key_file(struct key2 *key2, const char *file, const unsigned int flags)
hex_byte[hb_index++] = c;
if (hb_index == 2)
{
unsigned int u;
ASSERT(sscanf((const char *)hex_byte, "%x", &u) == 1);
uint8_t u;
ASSERT(sscanf((const char *)hex_byte, "%" SCNx8, &u) == 1);
*out++ = u;
hb_index = 0;
if (++count == keylen)
@ -1546,13 +1548,13 @@ write_key(const struct key *key, const struct key_type *kt,
ASSERT(cipher_kt_key_size(kt->cipher) <= MAX_CIPHER_KEY_LENGTH
&& md_kt_size(kt->digest) <= MAX_HMAC_KEY_LENGTH);
const uint8_t cipher_length = cipher_kt_key_size(kt->cipher);
const uint8_t cipher_length = (uint8_t)cipher_kt_key_size(kt->cipher);
if (!buf_write(buf, &cipher_length, 1))
{
return false;
}
uint8_t hmac_length = md_kt_size(kt->digest);
uint8_t hmac_length = (uint8_t)md_kt_size(kt->digest);
if (!buf_write(buf, &hmac_length, 1))
{

17
src/openvpn/integer.h
View File

@ -28,12 +28,12 @@
#ifndef htonll
#define htonll(x) ((1==htonl(1)) ? (x) : \
((uint64_t)htonl((x) & 0xFFFFFFFF) << 32) | htonl((x) >> 32))
((uint64_t)htonl((uint32_t)((x) & 0xFFFFFFFF)) << 32) | htonl((uint32_t)((x) >> 32)))
#endif
#ifndef ntohll
#define ntohll(x) ((1==ntohl(1)) ? (x) : \
((uint64_t)ntohl((x) & 0xFFFFFFFF) << 32) | ntohl((x) >> 32))
((uint64_t)ntohl((uint32_t)((x) & 0xFFFFFFFF)) << 32) | ntohl((uint32_t)((x) >> 32)))
#endif
static inline int
@ -72,6 +72,19 @@ min_uint(unsigned int x, unsigned int y)
}
}
static inline size_t
min_size(size_t x, size_t y)
{
if (x < y)
{
return x;
}
else
{
return y;
}
}
static inline int
max_int(int x, int y)
{

2
src/openvpn/mss.c
View File

@ -165,7 +165,7 @@ mss_fixup_dowork(struct buffer *buf, uint16_t maxmss)
return;
}
for (olen = hlen - sizeof(struct openvpn_tcphdr),
for (olen = hlen - (int) sizeof(struct openvpn_tcphdr),
opt = (uint8_t *)(tc + 1);
olen > 1;
olen -= optlen, opt += optlen)

2
src/openvpn/otime.c
View File

@ -105,7 +105,7 @@ tv_string_abs(const struct timeval *tv, struct gc_arena *gc)
/* format a time_t as ascii, or use current time if 0 */
const char *
time_string(time_t t, int usec, bool show_usec, struct gc_arena *gc)
time_string(time_t t, long usec, bool show_usec, struct gc_arena *gc)
{
struct buffer out = alloc_buf_gc(64, gc);
struct timeval tv;

2
src/openvpn/otime.h
View File

@ -43,7 +43,7 @@ void frequency_limit_free(struct frequency_limit *f);
bool frequency_limit_event_allowed(struct frequency_limit *f);
/* format a time_t as ascii, or use current time if 0 */
const char *time_string(time_t t, int usec, bool show_usec, struct gc_arena *gc);
const char *time_string(time_t t, long usec, bool show_usec, struct gc_arena *gc);
/* struct timeval functions */

4
src/openvpn/packet_id.c
View File

@ -588,14 +588,14 @@ packet_id_debug_print(int msglevel,
}
else
{
diff = (int) prev_now - v;
diff = (int)(prev_now - v);
if (diff < 0)
{
c = 'N';
}
else if (diff < 10)
{
c = '0' + diff;
c = (char)('0' + diff);
}
else
{

7
src/openvpn/reliable.c
View File

@ -257,8 +257,7 @@ reliable_ack_write(struct reliable_ack *ack,
struct buffer *buf,
const struct session_id *sid, int max, bool prepend)
{
int i, j;
uint8_t n;
int i, j, n;
struct buffer sub;
n = ack->len;
@ -270,9 +269,9 @@ reliable_ack_write(struct reliable_ack *ack,
copy_acks_to_mru(ack, ack_mru, n);
/* Number of acks we can resend that still fit into the packet */
uint8_t total_acks = min_int(max, ack_mru->len);
uint8_t total_acks = (uint8_t)min_int(max, ack_mru->len);
sub = buf_sub(buf, ACK_SIZE(total_acks), prepend);
sub = buf_sub(buf, (int)ACK_SIZE(total_acks), prepend);
if (!BDEF(&sub))
{
goto error;

2
src/openvpn/tls_crypt.c
View File

@ -634,7 +634,7 @@ tls_crypt_v2_extract_client_key(struct buffer *buf,
memcpy(&net_len, BEND(&wrapped_client_key) - sizeof(net_len),
sizeof(net_len));
size_t wkc_len = ntohs(net_len);
uint16_t wkc_len = ntohs(net_len);
if (!buf_advance(&wrapped_client_key, BLEN(&wrapped_client_key) - wkc_len))
{
msg(D_TLS_ERRORS, "Can not locate tls-crypt-v2 client key");

14
src/openvpn/xkey_helper.c
View File

@ -292,7 +292,7 @@ xkey_management_sign(void *unused, unsigned char *sig, size_t *siglen,
* @return false on error, true on success
*
* On return enc_len is set to actual size of the result.
* enc is NULL or enc_len is not enough to store the result, it is set
* If enc is NULL or enc_len is not enough to store the result, it is set
* to the required size and false is returned.
*/
bool
@ -337,8 +337,8 @@ encode_pkcs1(unsigned char *enc, size_t *enc_len, const char *mdname,
MAKE_DI(sha512), MAKE_DI(sha224), MAKE_DI(sha512_224),
MAKE_DI(sha512_256), {0, NULL, 0}};
int out_len = 0;
int ret = 0;
size_t out_len = 0;
bool ret = false;
int nid = OBJ_sn2nid(mdname);
if (nid == NID_undef)
@ -354,7 +354,7 @@ encode_pkcs1(unsigned char *enc, size_t *enc_len, const char *mdname,
if (tbslen != EVP_MD_size(EVP_get_digestbyname(mdname)))
{
msg(M_WARN, "Error: encode_pkcs11: invalid input length <%d>", (int)tbslen);
msg(M_WARN, "Error: encode_pkcs11: invalid input length <%zu>", tbslen);
goto done;
}
@ -383,13 +383,13 @@ encode_pkcs1(unsigned char *enc, size_t *enc_len, const char *mdname,
out_len = tbslen + di->sz;
if (enc && (out_len <= (int) *enc_len))
if (enc && (out_len <= *enc_len))
{
/* combine header and digest */
memcpy(enc, di->header, di->sz);
memcpy(enc + di->sz, tbs, tbslen);
dmsg(D_XKEY, "encode_pkcs1: digest length = %d encoded length = %d",
(int) tbslen, (int) out_len);
dmsg(D_XKEY, "encode_pkcs1: digest length = %zu encoded length = %zu",
tbslen, out_len);
ret = true;
}

2
tests/unit_tests/openvpn/mock_get_random.c
View File

@ -41,6 +41,6 @@ prng_bytes(uint8_t *output, int len)
{
for (int i = 0; i < len; i++)
{
output[i] = rand();
output[i] = (uint8_t)rand();
}
}

6
tests/unit_tests/openvpn/test_crypto.c
View File

@ -97,8 +97,8 @@ test_cipher_names(const char *ciphername, const char *openvpn_name)
for (int i = 0; i < strlen(ciphername); i++)
{
upper[i] = toupper(ciphername[i]);
lower[i] = tolower(ciphername[i]);
upper[i] = (char)toupper((unsigned char)ciphername[i]);
lower[i] = (char)tolower((unsigned char)ciphername[i]);
if (rand() & 0x1)
{
random_case[i] = upper[i];
@ -155,7 +155,7 @@ crypto_test_tls_prf(void **state)
uint8_t out[32];
bool ret = ssl_tls1_PRF(seed, seed_len, secret, secret_len, out, sizeof(out));
bool ret = ssl_tls1_PRF(seed, (int)seed_len, secret, (int)secret_len, out, sizeof(out));
#if defined(LIBRESSL_VERSION_NUMBER) || defined(ENABLE_CRYPTO_WOLFSSL)
/* No TLS1 PRF support in these libraries */

6
tests/unit_tests/openvpn/test_packet_id.c
View File

@ -93,7 +93,7 @@ test_packet_id_write_long(void **state)
assert(data->pis.id == 1);
assert(data->pis.time == now);
assert_true(data->test_buf_data.buf_id == htonl(1));
assert_true(data->test_buf_data.buf_time == htonl(now));
assert_true(data->test_buf_data.buf_time == htonl((uint32_t)now));
}
static void
@ -120,7 +120,7 @@ test_packet_id_write_long_prepend(void **state)
assert(data->pis.id == 1);
assert(data->pis.time == now);
assert_true(data->test_buf_data.buf_id == htonl(1));
assert_true(data->test_buf_data.buf_time == htonl(now));
assert_true(data->test_buf_data.buf_time == htonl((uint32_t)now));
}
static void
@ -151,7 +151,7 @@ test_packet_id_write_long_wrap(void **state)
assert(data->pis.id == 1);
assert(data->pis.time == now);
assert_true(data->test_buf_data.buf_id == htonl(1));
assert_true(data->test_buf_data.buf_time == htonl(now));
assert_true(data->test_buf_data.buf_time == htonl((uint32_t)now));
}
static void

2
tests/unit_tests/openvpn/test_provider.c
View File

@ -368,7 +368,7 @@ xkey_sign(void *handle, unsigned char *sig, size_t *siglen,
}
/* return a predefined string as sig */
memcpy(sig, good_sig, min_int(sizeof(good_sig), *siglen));
memcpy(sig, good_sig, min_size(sizeof(good_sig), *siglen));
return 1;
}

2
tests/unit_tests/openvpn/test_tls_crypt.c
View File

@ -137,7 +137,7 @@ __wrap_rand_bytes(uint8_t *output, int len)
{
for (int i = 0; i < len; i++)
{
output[i] = i;
output[i] = (uint8_t)i;
}
return true;
}