upstream/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2026-05-28 04:03:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Collect trivial conversion fixes

Browse source 
These are very local, simple fixes that do not
warrant their own commit.

Change-Id: Id565ec17856444b580dd89edab92e9fe18d39b77
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20250817143922.17988-1-gert@greenie.muc.de>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32611.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Frank Lichtenheld 2025-08-17 16:39:15 +02:00 committed by Gert Doering
parent c4f4f26d48
commit acc8f82fca
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/openvpn/crypto.c
View file

@ -1901,7 +1901,7 @@ check_tls_prf_working(void)
const char *seed = "tls1-prf-test";
const char *secret = "tls1-prf-test-secret";
uint8_t out[8];
uint8_t expected_out[] = { 'q', 'D', '\xfe', '%', '@', 's', 'u', '\x95' };
uint8_t expected_out[] = { 'q', 'D', 0xfe, '%', '@', 's', 'u', 0x95 };
int ret = ssl_tls1_PRF((uint8_t *)seed, (int)strlen(seed), (uint8_t *)secret,
(int)strlen(secret), out, sizeof(out));

2
src/openvpn/init.c
View file

@ -343,7 +343,7 @@ management_callback_remote_entry_get(void *arg, unsigned int index, char **remot
const char *status = (ce->flags & CE_DISABLED) ? "disabled" : "enabled";
/* space for output including 3 commas and a nul */
int len =
size_t len =
strlen(ce->remote) + strlen(ce->remote_port) + strlen(proto) + strlen(status) + 3 + 1;
char *out = malloc(len);
check_malloc_return(out);

2
src/openvpn/options.c
View file

@ -4957,7 +4957,7 @@ atou(const char *str)
#endif
static inline bool
space(unsigned char c)
space(char c)
{
return c == '\0' || isspace(c);
}

2
src/openvpn/pool.c
View file

@ -158,7 +158,7 @@ ifconfig_pool_init(const bool ipv4_pool, enum pool_type type, in_addr_t start, i
switch (pool->ipv4.type)
{
case IFCONFIG_POOL_30NET:
pool->ipv4.base = start & ~3;
pool->ipv4.base = start & ~3u;
pool_ipv4_size = (((end | 3) + 1) - pool->ipv4.base) >> 2;
break;