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

Enable -Wconversion -Wno-sign-conversion by default

Browse source 
Grand-father all known locations of existing errors,
so that -Werror builds still pass and we do not spam
build logs.

Still, this should give us a much better roadmap to
work on these issues one by one while still enabling
the warnings for a lot of code-paths.

In general I did go for least amount of pragmas, so
usually there is only one override per file, covering
ALL of the failures in that file. While this protects
a lot of code that doesn't need it, it also cut down
the amount of pragmas by a lot.

This does cover gcc builds including mingw and clang
builds. Does not cover MSVC.

Once the amount of issues has been suitable reduced
more warnings could be enabled.

Change-Id: Iad5b00c35a1f1993b1fa99e8b945ab17b230ef59
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1168
Message-Id: <20250924122755.14391-1-gert@greenie.muc.de>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg33181.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Frank Lichtenheld 2025-09-24 14:27:47 +02:00 committed by Gert Doering
parent bd27319f2a
commit 3ac840942b
69 changed files with 697 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -113,8 +113,7 @@ else ()
check_and_add_compiler_flag(-Wno-stringop-truncation NoStringOpTruncation)
check_and_add_compiler_flag(-Wstrict-prototypes StrictPrototypes)
check_and_add_compiler_flag(-Wold-style-definition OldStyleDefinition)
# We are not ready for this
#add_compile_options(-Wconversion -Wno-sign-conversion)
add_compile_options(-Wconversion -Wno-sign-conversion)
add_compile_options(-Wextra -Wno-sign-compare -Wno-type-limits -Wno-unused-parameter)
# clang doesn't have the different levels but also doesn't include it in -Wextra
check_and_add_compiler_flag(-Wimplicit-fallthrough=2 GCCImplicitFallthrough)

1
configure.ac
View file

@ -1397,6 +1397,7 @@ AC_DEFUN([ACL_CHECK_ADD_COMPILE_FLAGS], [
ACL_CHECK_ADD_COMPILE_FLAGS([-Wno-stringop-truncation])
ACL_CHECK_ADD_COMPILE_FLAGS([-Wstrict-prototypes])
ACL_CHECK_ADD_COMPILE_FLAGS([-Wold-style-definition])
ACL_CHECK_ADD_COMPILE_FLAGS([-Wconversion -Wno-sign-conversion])
ACL_CHECK_ADD_COMPILE_FLAGS([-Wall])
ACL_CHECK_ADD_COMPILE_FLAGS([-Wextra -Wno-sign-compare -Wno-type-limits -Wno-unused-parameter])
# clang doesn't have the different levels but also doesn't include it in -Wextra

9
src/openvpn/comp-lz4.c
View file

@ -88,6 +88,11 @@ lz4v2_compress(struct buffer *buf, struct buffer work, struct compress_context *
compv2_escape_data_ifneeded(buf);
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
static void
do_lz4_decompress(size_t zlen_max, struct buffer *work, struct buffer *buf,
struct compress_context *compctx)
@ -113,6 +118,10 @@ do_lz4_decompress(size_t zlen_max, struct buffer *work, struct buffer *buf,
*buf = *work;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
static void
lz4_decompress(struct buffer *buf, struct buffer work, struct compress_context *compctx,
const struct frame *frame)

17
src/openvpn/console_builtin.c
View file

@ -45,6 +45,11 @@
#include "win32.h"
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
/**
* Get input from a Windows console.
*
@ -134,6 +139,10 @@ get_console_input_win32(const char *prompt, const bool echo, char *input, const
return false;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
#endif /* _WIN32 */
@ -264,6 +273,10 @@ get_console_input(const char *prompt, const bool echo, char *input, const int ca
return ret;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
/**
* @copydoc query_user_exec()
@ -296,3 +309,7 @@ query_user_exec_builtin(void)
return ret;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif

9
src/openvpn/crypto.c
View file

@ -186,6 +186,11 @@ err:
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)
{
@ -1532,6 +1537,10 @@ read_key_file(struct key2 *key2, const char *file, const unsigned int flags)
gc_free(&gc);
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
int
write_key_file(const int nkeys, const char *filename)
{

9
src/openvpn/crypto_epoch.c
View file

@ -72,6 +72,11 @@ ovpn_hkdf_expand(const uint8_t *secret, const uint8_t *info, int info_len, uint8
hmac_ctx_free(hmac_ctx);
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
bool
ovpn_expand_label(const uint8_t *secret, size_t secret_len, const uint8_t *label, size_t label_len,
const uint8_t *context, size_t context_len, uint8_t *out, uint16_t out_len)
@ -163,6 +168,10 @@ epoch_data_key_derive(struct key_parameters *key, const struct epoch_key *epoch_
key->epoch = epoch_key->epoch;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
static void
epoch_init_send_key_ctx(struct crypto_options *co)
{

11
src/openvpn/crypto_mbedtls.c
View file

@ -230,6 +230,11 @@ show_available_engines(void)
"available\n");
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
bool
crypto_pem_encode(const char *name, struct buffer *dst, const struct buffer *src,
struct gc_arena *gc)
@ -760,7 +765,6 @@ cipher_ctx_final_check_tag(mbedtls_cipher_context_t *ctx, uint8_t *dst, int *dst
return 1;
}
/*
*
* Generic message digest information functions
@ -1119,4 +1123,9 @@ ssl_tls1_PRF(const uint8_t *label, size_t label_len, const uint8_t *sec, size_t
return true;
}
#endif /* HAVE_MBEDTLS_SSL_TLS_PRF && defined(MBEDTLS_SSL_TLS_PRF_TLS1) */
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
#endif /* ENABLE_CRYPTO_MBEDTLS */

26
src/openvpn/crypto_openssl.c
View file

@ -895,6 +895,10 @@ cipher_ctx_mode(const EVP_CIPHER_CTX *ctx)
return EVP_CIPHER_CTX_mode(ctx);
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
bool
cipher_ctx_mode_cbc(const cipher_ctx_t *ctx)
@ -999,6 +1003,9 @@ cipher_ctx_final_check_tag(EVP_CIPHER_CTX *ctx, uint8_t *dst, int *dst_len, uint
return cipher_ctx_final(ctx, dst, dst_len);
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
/*
*
@ -1214,12 +1221,21 @@ hmac_ctx_cleanup(HMAC_CTX *ctx)
HMAC_CTX_reset(ctx);
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
int
hmac_ctx_size(HMAC_CTX *ctx)
{
return HMAC_size(ctx);
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
void
hmac_ctx_reset(HMAC_CTX *ctx)
{
@ -1398,6 +1414,11 @@ ssl_tls1_PRF(const uint8_t *label, size_t label_len, const uint8_t *sec, size_t
CRYPTO_tls1_prf(EVP_md5_sha1(), out1, olen, sec, slen, label, label_len, NULL, 0, NULL, 0);
}
#elif !defined(LIBRESSL_VERSION_NUMBER) && !defined(ENABLE_CRYPTO_WOLFSSL)
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
bool
ssl_tls1_PRF(const uint8_t *seed, size_t seed_len, const uint8_t *secret, size_t secret_len,
uint8_t *output, size_t output_len)
@ -1443,6 +1464,11 @@ out:
EVP_PKEY_CTX_free(pctx);
return ret;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
#else /* if defined(LIBRESSL_VERSION_NUMBER) */
/* LibreSSL and wolfSSL do not expose a TLS 1.0/1.1 PRF via the same APIs as
* OpenSSL does. As result they will only be able to support

11
src/openvpn/cryptoapi.c
View file

@ -62,7 +62,7 @@ SSL_CTX_use_CryptoAPI_certificate(SSL_CTX *ssl_ctx, const char *cert_prop)
return 0;
}
#else /* HAVE_XKEY_PROVIDER */
#else /* HAVE_XKEY_PROVIDER */
static XKEY_EXTERNAL_SIGN_fn xkey_cng_sign;
@ -342,6 +342,11 @@ out:
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,
@ -438,6 +443,10 @@ xkey_cng_rsa_sign(CAPI_DATA *cd, unsigned char *sig, size_t *siglen, const unsig
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,

9
src/openvpn/dco.c
View file

@ -491,6 +491,11 @@ dco_check_pull_options(msglvl_t msglevel, const struct options *o)
return true;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
int
dco_p2p_add_new_peer(struct context *c)
{
@ -645,6 +650,10 @@ dco_multi_add_new_peer(struct multi_context *m, struct multi_instance *mi)
return 0;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
void
dco_install_iroute(struct multi_context *m, struct multi_instance *mi, struct mroute_addr *addr)
{

9
src/openvpn/dco_freebsd.c
View file

@ -72,6 +72,11 @@ sockaddr_to_nvlist(const struct sockaddr *sa)
return (nvl);
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
static bool
nvlist_to_sockaddr(const nvlist_t *nvl, struct sockaddr_storage *ss)
{
@ -854,6 +859,10 @@ retry:
return 0;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
int
dco_get_peer_stats(struct context *c, const bool raise_sigusr1_on_err)
{

9
src/openvpn/dco_linux.c
View file

@ -62,6 +62,11 @@ void dco_check_key_ctx(const struct key_ctx_bi *key);
typedef int (*ovpn_nl_cb)(struct nl_msg *msg, void *arg);
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
/**
* @brief resolves the netlink ID for ovpn-dco
*
@ -1298,4 +1303,8 @@ dco_get_supported_ciphers(void)
return "AES-128-GCM:AES-256-GCM:AES-192-GCM:CHACHA20-POLY1305";
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
#endif /* defined(ENABLE_DCO) && defined(TARGET_LINUX) */

10
src/openvpn/dco_win.c
View file

@ -525,6 +525,11 @@ dco_set_peer(dco_context_t *dco, unsigned int peerid, int keepalive_interval, in
return 0;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
int
dco_new_key(dco_context_t *dco, unsigned int peerid, int keyid, dco_key_slot_t slot,
const uint8_t *encrypt_key, const uint8_t *encrypt_iv, const uint8_t *decrypt_key,
@ -564,6 +569,11 @@ dco_new_key(dco_context_t *dco, unsigned int peerid, int keyid, dco_key_slot_t s
}
return 0;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
int
dco_del_key(dco_context_t *dco, unsigned int peerid, dco_key_slot_t slot)
{

9
src/openvpn/dhcp.c
View file

@ -72,6 +72,11 @@ get_dhcp_message_type(const struct dhcp *dhcp, const int optlen)
return -1;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
static in_addr_t
do_extract(struct dhcp *dhcp, int optlen)
{
@ -185,3 +190,7 @@ dhcp_extract_router_msg(struct buffer *ipbuf)
}
return 0;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif

9
src/openvpn/event.c
View file

@ -65,6 +65,11 @@
#define SELECT_MAX_FDS 256
#endif
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
static inline int
tv_to_ms_timeout(const struct timeval *tv)
{
@ -78,6 +83,10 @@ tv_to_ms_timeout(const struct timeval *tv)
}
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
#ifdef _WIN32
struct we_set

9
src/openvpn/forward.c
View file

@ -367,6 +367,11 @@ check_connection_established(struct context *c)
}
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
bool
send_control_channel_string_dowork(struct tls_session *session, const char *str,
msglvl_t msglevel)
@ -1966,6 +1971,10 @@ process_outgoing_tun(struct context *c, struct link_socket *in_sock)
perf_pop();
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
void
pre_select(struct context *c)
{

10
src/openvpn/gremlin.c
View file

@ -98,6 +98,11 @@ flip(int n)
return (get_random() % n) == 0;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
/*
* Return uniformly distributed random number between
* low and high.
@ -229,4 +234,9 @@ corrupt_gremlin(struct buffer *buf, int flags)
}
}
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
#endif /* ifdef ENABLE_DEBUG */

9
src/openvpn/httpdigest.c
View file

@ -61,6 +61,11 @@ CvtHex(IN HASH Bin, OUT HASHHEX Hex)
Hex[HASHHEXLEN] = '\0';
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
/* calculate H(A1) as per spec */
void
DigestCalcHA1(IN char *pszAlg, IN char *pszUserName, IN char *pszRealm, IN char *pszPassword,
@ -145,4 +150,8 @@ DigestCalcResponse(IN HASHHEX HA1, /* H(A1) */
CvtHex(RespHash, Response);
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
#endif /* if PROXY_DIGEST_AUTH */

9
src/openvpn/init.c
View file

@ -455,6 +455,11 @@ ce_management_query_remote(struct context *c)
}
#endif /* ENABLE_MANAGEMENT */
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
/*
* Initialize and possibly randomize the connection list.
*
@ -3490,6 +3495,10 @@ do_init_frame_tls(struct context *c)
}
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
/*
* No encryption or authentication.
*/

9
src/openvpn/interval.c
View file

@ -38,6 +38,11 @@ interval_init(struct interval *top, int horizon, int refresh)
top->horizon = horizon;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
bool
event_timeout_trigger(struct event_timeout *et, struct timeval *tv, const int et_const_retry)
{
@ -77,3 +82,7 @@ event_timeout_trigger(struct event_timeout *et, struct timeval *tv, const int et
}
return ret;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif

9
src/openvpn/lzo.c
View file

@ -72,6 +72,11 @@ lzo_compress(struct buffer *buf, struct buffer work, struct compress_context *co
*header = NO_COMPRESS_BYTE;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
static void
lzo_decompress(struct buffer *buf, struct buffer work, struct compress_context *compctx,
const struct frame *frame)
@ -121,6 +126,10 @@ lzo_decompress(struct buffer *buf, struct buffer work, struct compress_context *
}
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
const struct compress_alg lzo_alg = { "lzo", lzo_compress_init, lzo_compress_uninit, lzo_compress,
lzo_decompress };
#endif /* ENABLE_LZO */

18
src/openvpn/manage.c
View file

@ -206,6 +206,11 @@ man_password_needed(struct management *man)
return man->settings.up.defined && !man->connection.password_verified;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
static void
man_check_password(struct management *man, const char *line)
{
@ -236,6 +241,10 @@ man_check_password(struct management *man, const char *line)
}
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
static void
man_update_io_state(struct management *man)
{
@ -2305,6 +2314,11 @@ managment_android_persisttun_action(struct management *man)
#endif /* ifdef TARGET_ANDROID */
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
static int
man_read(struct management *man)
{
@ -2442,6 +2456,10 @@ man_write(struct management *man)
return sent;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
static void
man_connection_clear(struct man_connection *mc)
{

9
src/openvpn/mbuf.c
View file

@ -34,6 +34,11 @@
#include "memdbg.h"
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
struct mbuf_set *
mbuf_init(unsigned int size)
{
@ -44,6 +49,10 @@ mbuf_init(unsigned int size)
return ret;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
void
mbuf_free(struct mbuf_set *ms)
{

9
src/openvpn/misc.c
View file

@ -72,6 +72,11 @@ set_std_files_to_null(bool stdin_only)
#endif
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
#ifdef ENABLE_MANAGEMENT
/* Get username/password from the management interface */
static bool
@ -184,6 +189,10 @@ parse_auth_challenge(const char *auth_challenge, struct gc_arena *gc)
#endif /* ifdef ENABLE_MANAGEMENT */
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
/*
* Get and store a username/password
*/

9
src/openvpn/mroute.c
View file

@ -103,6 +103,11 @@ mroute_learnable_address(const struct mroute_addr *addr, struct gc_arena *gc)
return true;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
static inline void
mroute_get_in_addr_t(struct mroute_addr *ma, const in_addr_t src, unsigned int mask)
{
@ -547,6 +552,10 @@ mroute_helper_del_iroute46(struct mroute_helper *mh, int netbits)
}
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
void
mroute_helper_free(struct mroute_helper *mh)
{

9
src/openvpn/mss.c
View file

@ -130,6 +130,11 @@ mss_fixup_ipv6(struct buffer *buf, uint16_t maxmss)
}
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
/*
* change TCP MSS option in SYN/SYN-ACK packets, if present
* this is generic for IPv4 and IPv6, as the TCP header is the same
@ -199,6 +204,10 @@ mss_fixup_dowork(struct buffer *buf, uint16_t maxmss)
}
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
static inline size_t
adjust_payload_max_cbc(const struct key_type *kt, size_t target)
{

9
src/openvpn/mtcp.c
View file

@ -45,6 +45,11 @@ struct ta_iow_flags
unsigned int sock;
};
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
struct multi_instance *
multi_create_instance_tcp(struct multi_context *m, struct link_socket *sock)
{
@ -120,6 +125,10 @@ multi_tcp_instance_specific_init(struct multi_context *m, struct multi_instance
return true;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
void
multi_tcp_instance_specific_free(struct multi_instance *mi)
{

9
src/openvpn/mtu.c
View file

@ -280,6 +280,11 @@ struct probehdr
struct timeval tv;
};
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
const char *
format_extended_socket_error(int fd, int *mtu, struct gc_arena *gc)
{
@ -389,6 +394,10 @@ exit:
return BSTR(&out);
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
void
set_sock_extended_error_passing(int sd, sa_family_t proto_af)
{

9
src/openvpn/mudp.c
View file

@ -180,6 +180,11 @@ do_pre_decrypt_check(struct multi_context *m, struct tls_pre_decrypt_state *stat
return false;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
/*
* Get a client instance based on real address. If
* the instance doesn't exist, create it while
@ -310,6 +315,10 @@ multi_get_create_instance_udp(struct multi_context *m, bool *floated, struct lin
return mi;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
/*
* Send a packet to UDP socket.
*/

9
src/openvpn/multi.c
View file

@ -256,6 +256,11 @@ cid_compare_function(const void *key1, const void *key2)
#endif
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
#ifdef ENABLE_ASYNC_PUSH
static uint32_t
/*
@ -3982,6 +3987,10 @@ management_callback_kill_by_addr(void *arg, const in_addr_t addr, const int port
return count;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
static void
management_delete_event(void *arg, event_t event)
{

9
src/openvpn/networking_sitnl.c
View file

@ -131,6 +131,11 @@ struct sitnl_route_data_cb
inet_address_t gw;
};
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
/**
* Helper function used to easily add attributes to a rtnl message
*/
@ -1469,6 +1474,10 @@ net_iface_del(openvpn_net_ctx_t *ctx, const char *iface)
return sitnl_send(&req.n, 0, 0, NULL, NULL);
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
#endif /* !ENABLE_SITNL */
#endif /* TARGET_LINUX */

9
src/openvpn/ntlm.c
View file

@ -74,6 +74,11 @@ gen_hmac_md5(const uint8_t *data, int data_len, const uint8_t *key, uint8_t *res
hmac_ctx_free(hmac_ctx);
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
static void
gen_timestamp(uint8_t *timestamp)
{
@ -383,4 +388,8 @@ ntlm_phase_3(const struct http_proxy_info *p, const char *phase_2, struct gc_are
return ((const char *)make_base64_string2((unsigned char *)phase3, phase3_bufpos, gc));
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
#endif /* if NTLM */

9
src/openvpn/occ.c
View file

@ -174,6 +174,11 @@ check_send_occ_req_dowork(struct context *c)
}
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
void
check_send_occ_load_test_dowork(struct context *c)
{
@ -347,6 +352,10 @@ check_send_occ_msg_dowork(struct context *c)
c->c2.occ_op = -1;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
void
process_received_occ_msg(struct context *c)
{

9
src/openvpn/openssl_compat.h
View file

@ -194,12 +194,21 @@ SSL_get0_peer_signature_name(const SSL *ssl, const char **sigalg)
LIBRESSL_VERSION_NUMBER > 0x3050400fL) */
#if OPENSSL_VERSION_NUMBER < 0x30200000L && OPENSSL_VERSION_NUMBER >= 0x30000000L
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
static inline const char *
SSL_get0_group_name(SSL *s)
{
int nid = SSL_get_negotiated_group(s);
return SSL_group_to_name(s, nid);
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
#endif
#endif /* OPENSSL_COMPAT_H_ */

9
src/openvpn/options.c
View file

@ -1158,6 +1158,11 @@ ipv6_addr_safe_hexplusbits(const char *ipv6_prefix_spec)
return get_ipv6_addr(ipv6_prefix_spec, &t_addr, &t_bits, M_WARN);
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
static char *
string_substitute(const char *src, int from, int to, struct gc_arena *gc)
{
@ -9900,6 +9905,10 @@ err:
gc_free(&gc);
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
bool
has_udp_in_local_list(const struct options *options)
{

9
src/openvpn/options_util.c
View file

@ -162,6 +162,11 @@ atoi_warn(const char *str, msglvl_t msglevel)
return (int)i;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
bool
atoi_constrained(const char *str, int *value, const char *name, int min, int max, msglvl_t msglevel)
{
@ -193,6 +198,10 @@ atoi_constrained(const char *str, int *value, const char *name, int min, int max
return true;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
static const char *updatable_options[] = { "block-ipv6", "block-outside-dns",
"dhcp-option", "dns",
"ifconfig", "ifconfig-ipv6",

9
src/openvpn/otime.c
View file

@ -100,6 +100,11 @@ tv_string_abs(const struct timeval *tv, struct gc_arena *gc)
/* format a time_t as ascii, or use current time if 0 */
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
const char *
time_string(time_t t, long usec, bool show_usec, struct gc_arena *gc)
{
@ -130,6 +135,10 @@ time_string(time_t t, long usec, bool show_usec, struct gc_arena *gc)
return BSTR(&out);
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
/*
* Limit the frequency of an event stream.
*

9
src/openvpn/otime.h
View file

@ -59,6 +59,11 @@ void update_now(const time_t system_time);
extern time_t now_usec;
void update_now_usec(struct timeval *tv);
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
static inline int
openvpn_gettimeofday(struct timeval *tv, void *tz)
{
@ -236,6 +241,10 @@ tv_delta(struct timeval *dest, const struct timeval *t1, const struct timeval *t
dest->tv_usec = usec;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
#define TV_WITHIN_SIGMA_MAX_SEC 600
#define TV_WITHIN_SIGMA_MAX_USEC (TV_WITHIN_SIGMA_MAX_SEC * 1000000)

9
src/openvpn/packet_id.c
View file

@ -71,6 +71,11 @@ packet_id_debug(msglvl_t msglevel, const struct packet_id_rec *p,
#endif
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
static void
packet_id_init_recv(struct packet_id_rec *rec, int seq_backtrack, int time_backtrack,
const char *name, int unit)
@ -663,6 +668,10 @@ packet_id_read_epoch(struct packet_id_net *pin, struct buffer *buf)
return epoch;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
bool
packet_id_write_epoch(struct packet_id_send *p, uint16_t epoch, struct buffer *buf)
{

9
src/openvpn/packet_id.h
View file

@ -280,6 +280,11 @@ packet_id_persist_enabled(const struct packet_id_persist *p)
return p->fd >= 0;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
/* transfer packet_id -> packet_id_persist */
static inline void
packet_id_persist_save_obj(struct packet_id_persist *p, const struct packet_id *pid)
@ -291,6 +296,10 @@ packet_id_persist_save_obj(struct packet_id_persist *p, const struct packet_id *
}
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
/**
* Reset the current send packet id to its initial state.
* Use very carefully (e.g. in the standalone reset packet context) to

9
src/openvpn/pkcs11.c
View file

@ -53,6 +53,11 @@ __mygettimeofday(struct timeval *tv)
}
#endif
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
static void
__mysleep(const unsigned long usec)
{
@ -558,6 +563,10 @@ cleanup:
return success;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
int
tls_ctx_use_pkcs11(struct tls_root_ctx *const ssl_ctx, bool pkcs11_id_management,
const char *const pkcs11_id)

10
src/openvpn/pkcs11_openssl.c
View file

@ -428,6 +428,11 @@ cleanup:
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)
{
@ -468,4 +473,9 @@ cleanup:
return ret;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
#endif /* defined(ENABLE_PKCS11) && defined(ENABLE_OPENSSL) */

9
src/openvpn/proxy.c
View file

@ -54,6 +54,11 @@ init_http_proxy_options_once(struct http_proxy_options **hpo, struct gc_arena *g
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
/* cached proxy username/password */
static struct user_pass static_proxy_user_pass;
@ -1063,3 +1068,7 @@ error:
gc_free(&gc);
return ret;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif

9
src/openvpn/ps.c
View file

@ -475,6 +475,11 @@ proxy_entry_new(struct proxy_connection **list, struct event_set *es,
return true;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
/*
* This function runs in the context of the background proxy process.
* Receive a control message from the parent (sent by the port_share_sendmsg
@ -792,6 +797,10 @@ done:
msg(M_INFO, "PORT SHARE PROXY: proxy exiting");
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
/*
* Called from the main OpenVPN process to enable the port
* share proxy.

8
src/openvpn/push.c
View file

@ -429,6 +429,10 @@ send_auth_failed(struct context *c, const char *client_reason)
gc_free(&gc);
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
bool
send_auth_pending_messages(struct tls_multi *tls_multi, struct tls_session *session,
@ -1086,6 +1090,10 @@ process_incoming_push_reply(struct context *c, unsigned int permission_mask,
return ret;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
int
process_incoming_push_msg(struct context *c, const struct buffer *buffer,
bool honor_received_options, unsigned int permission_mask,

9
src/openvpn/push_util.c
View file

@ -9,6 +9,11 @@
#include "multi.h"
#endif
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
int
process_incoming_push_update(struct context *c, unsigned int permission_mask,
unsigned int *option_types_found, struct buffer *buf,
@ -306,3 +311,7 @@ management_callback_send_push_update_by_cid(void *arg, unsigned long cid, const
RETURN_UPDATE_STATUS(n_sent);
}
#endif /* ifdef ENABLE_MANAGEMENT */
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif

9
src/openvpn/reliable.c
View file

@ -687,6 +687,11 @@ reliable_schedule_now(struct reliable *rel)
}
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
/* in how many seconds should we wake up to check for timeout */
/* if we return BIG_TIMEOUT, nothing to wait for */
interval_t
@ -719,6 +724,10 @@ reliable_send_timeout(const struct reliable *rel)
return ret;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
/*
* Enable an incoming buffer previously returned by a get function as active.
*/

17
src/openvpn/route.c
View file

@ -1760,6 +1760,10 @@ done:
return (status != RTA_ERROR);
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
void
route_ipv6_clear_host_bits(struct route_ipv6 *r6)
@ -2364,6 +2368,10 @@ delete_route_ipv6(const struct route_ipv6 *r6, const struct tuntap *tt, const st
net_ctx_reset(ctx);
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
/*
* The --redirect-gateway option requires OS-specific code below
* to get the current default gateway.
@ -3360,6 +3368,11 @@ struct rtmsg
#define max(a, b) ((a) > (b) ? (a) : (b))
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
void
get_default_gateway(struct route_gateway_info *rgi, in_addr_t dest, openvpn_net_ctx_t *ctx)
{
@ -3733,6 +3746,10 @@ done:
}
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
#undef max
#elif defined(TARGET_HAIKU)

9
src/openvpn/schedule.c
View file

@ -65,6 +65,11 @@ schedule_entry_debug_info(const char *caller, const struct schedule_entry *e)
}
#endif
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
static inline void
schedule_set_pri(struct schedule_entry *e)
{
@ -75,6 +80,10 @@ schedule_set_pri(struct schedule_entry *e)
}
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
/* This is the master key comparison routine. A key is
* simply a struct timeval containing the absolute time for
* an event. The unique treap priority (pri) is used to ensure

9
src/openvpn/socket.c
View file

@ -72,6 +72,11 @@ sf2gaf(const unsigned int getaddr_flags, const unsigned int sockflags)
}
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
/*
* Functions related to the translation of DNS names to IP addresses.
*/
@ -2449,6 +2454,10 @@ link_socket_write_tcp(struct link_socket *sock, struct buffer *buf, struct link_
#endif
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
#if ENABLE_IP_PKTINFO
ssize_t

9
src/openvpn/socks.c
View file

@ -80,6 +80,11 @@ socks_proxy_close(struct socks_proxy_info *sp)
free(sp);
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
static bool
socks_proxy_recv_char(char *c, const char *name, socket_descriptor_t sd,
struct event_timeout *server_poll_timeout,
@ -438,6 +443,10 @@ error:
return;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
void
establish_socks_proxy_udpassoc(struct socks_proxy_info *p,
socket_descriptor_t ctrl_sd, /* already open to proxy */

18
src/openvpn/ssl.c
View file

@ -180,6 +180,11 @@ tls_init_control_channel_frame_parameters(struct frame *frame, int tls_mtu)
frame->tun_mtu = max_int(frame->tun_mtu, TLS_CHANNEL_MTU_MIN);
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
/**
* calculate the maximum overhead that control channel frames have
* This includes header, op code and everything apart from the
@ -222,6 +227,10 @@ calc_control_channel_frame_overhead(const struct tls_session *session)
return overhead;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
void
init_ssl_lib(void)
{
@ -1120,6 +1129,11 @@ compute_earliest_wakeup(interval_t *earliest, interval_t seconds_from_now)
}
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
/*
* Return true if "lame duck" or retiring key has expired and can
* no longer be used.
@ -3979,6 +3993,10 @@ tls_prepend_opcode_v1(const struct tls_multi *multi, struct buffer *buf)
ASSERT(buf_write_prepend(buf, &op, 1));
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
void
tls_prepend_opcode_v2(const struct tls_multi *multi, struct buffer *buf)
{

9
src/openvpn/ssl_mbedtls.c
View file

@ -585,6 +585,11 @@ tls_ctx_load_priv_file(struct tls_root_ctx *ctx, const char *priv_key_file, bool
return 0;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
/**
* external_pkcs1_sign implements a mbed TLS rsa_sign_func callback, that uses
* the management interface to request an RSA signature for the supplied hash.
@ -1004,6 +1009,10 @@ tls_ctx_personalise_random(struct tls_root_ctx *ctx)
}
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
int
tls_version_max(void)
{

9
src/openvpn/ssl_ncp.c
View file

@ -534,6 +534,11 @@ check_session_cipher(struct tls_session *session, struct options *options)
}
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
/**
* Replaces the string DEFAULT with the string \c replace.
*
@ -566,6 +571,10 @@ replace_default_in_ncp_ciphers_option(struct options *o, const char *replace)
o->ncp_ciphers = (char *)ncp_ciphers;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
/**
* Checks for availibility of Chacha20-Poly1305 and sets
* the ncp_cipher to either AES-256-GCM:AES-128-GCM or

18
src/openvpn/ssl_openssl.c
View file

@ -272,6 +272,11 @@ openssl_tls_version(int ver)
return 0;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
static bool
tls_ctx_set_tls_versions(struct tls_root_ctx *ctx, unsigned int ssl_flags)
{
@ -424,6 +429,10 @@ convert_tls_list_to_openssl(char *openssl_ciphers, size_t len, const char *ciphe
}
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
void
tls_ctx_restrict_ciphers(struct tls_root_ctx *ctx, const char *ciphers)
{
@ -2513,6 +2522,11 @@ print_details(struct key_state_ssl *ks_ssl, const char *prefix)
msg(D_HANDSHAKE, "%s%s%s%s%s", s1, s2, s3, s4, s5);
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
void
show_available_tls_ciphers_list(const char *cipher_list, const char *tls_cert_profile, bool tls13)
{
@ -2580,6 +2594,10 @@ show_available_tls_ciphers_list(const char *cipher_list, const char *tls_cert_pr
SSL_CTX_free(tls_ctx.ctx);
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
/*
* Show the Elliptic curves that are available for us to use
* in the OpenSSL library.

9
src/openvpn/ssl_pkt.c
View file

@ -160,6 +160,11 @@ tls_wrap_control(struct tls_wrap_ctx *ctx, uint8_t header, struct buffer *buf,
}
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
void
write_control_auth(struct tls_session *session, struct key_state *ks, struct buffer *buf,
struct link_socket_actual **to_link_addr, int opcode, int max_ack,
@ -495,6 +500,10 @@ calculate_session_id_hmac(struct session_id client_sid, const struct openvpn_soc
return result.sid;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
bool
check_session_hmac_and_pkt_id(struct tls_pre_decrypt_state *state,
const struct openvpn_sockaddr *from,

9
src/openvpn/ssl_util.c
View file

@ -290,6 +290,11 @@ tls_get_cipher_name_pair(const char *cipher_name, size_t len)
return NULL;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
int
get_num_elements(const char *string, char delimiter)
{
@ -309,3 +314,7 @@ get_num_elements(const char *string, char delimiter)
return element_count;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif

8
src/openvpn/ssl_verify.c
View file

@ -874,6 +874,11 @@ check_auth_pending_method(const char *peer_info, const char *method)
return supported;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
/**
* Checks if the deferred state should also send auth pending
* request to the client. Also removes the auth_pending control file
@ -945,6 +950,9 @@ key_state_check_auth_pending_file(struct auth_deferred_status *ads, struct tls_m
return ret;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
/**
* Removes auth_pending and auth_control files from file system

9
src/openvpn/ssl_verify_mbedtls.c
View file

@ -250,6 +250,11 @@ err:
return FAILURE;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
static struct buffer
x509_get_fingerprint(const mbedtls_md_info_t *md_info, mbedtls_x509_crt *cert, struct gc_arena *gc)
{
@ -260,6 +265,10 @@ x509_get_fingerprint(const mbedtls_md_info_t *md_info, mbedtls_x509_crt *cert, s
return fingerprint;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
struct buffer
x509_get_sha1_fingerprint(mbedtls_x509_crt *cert, struct gc_arena *gc)
{

9
src/openvpn/ssl_verify_openssl.c
View file

@ -667,6 +667,11 @@ x509_verify_ns_cert_type(openvpn_x509_cert_t *peer_cert, const int usage)
return FAILURE;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
result_t
x509_verify_cert_ku(X509 *x509, const unsigned *const expected_ku, int expected_len)
{
@ -726,6 +731,10 @@ x509_verify_cert_ku(X509 *x509, const unsigned *const expected_ku, int expected_
return fFound;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
result_t
x509_verify_cert_eku(X509 *x509, const char *const expected_oid)
{

9
src/openvpn/status.c
View file

@ -207,6 +207,11 @@ status_close(struct status_output *so)
return ret;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
#define STATUS_PRINTF_MAXLEN 512
void
@ -303,3 +308,7 @@ status_read(struct status_output *so, struct buffer *buf)
return ret;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif

9
src/openvpn/tls_crypt.c
View file

@ -205,6 +205,11 @@ err:
return false;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
bool
tls_crypt_unwrap(const struct buffer *src, struct buffer *dst, struct crypto_options *opt)
{
@ -413,6 +418,10 @@ tls_crypt_v2_wrap_client_key(struct buffer *wkc, const struct key2 *src_key,
return buf_copy(wkc, &work);
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
static bool
tls_crypt_v2_unwrap_client_key(struct key2 *client_key, struct buffer *metadata,
struct buffer wrapped_client_key, struct key_ctx *server_key)

46
src/openvpn/tun.c
View file

@ -1720,6 +1720,11 @@ header_modify_read_write_return(int len)
}
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
static int
write_tun_header(struct tuntap *tt, uint8_t *buf, int len)
{
@ -1773,6 +1778,11 @@ read_tun_header(struct tuntap *tt, uint8_t *buf, int len)
return read(tt->fd, buf, len);
}
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
#endif /* if defined (TARGET_OPENBSD) || defined(TARGET_DARWIN) */
bool
@ -2244,6 +2254,11 @@ close_tun(struct tuntap *tt, openvpn_net_ctx_t *ctx)
free(tt);
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
int
write_tun(struct tuntap *tt, uint8_t *buf, int len)
{
@ -2256,6 +2271,10 @@ read_tun(struct tuntap *tt, uint8_t *buf, int len)
return read(tt->fd, buf, len);
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
#elif defined(TARGET_SOLARIS)
#ifndef TUNNEWPPA
@ -2935,6 +2954,11 @@ close_tun(struct tuntap *tt, openvpn_net_ctx_t *ctx)
argv_free(&argv);
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
int
write_tun(struct tuntap *tt, uint8_t *buf, int len)
{
@ -2989,6 +3013,10 @@ read_tun(struct tuntap *tt, uint8_t *buf, int len)
}
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
#elif defined(TARGET_DRAGONFLY)
static inline int
@ -3277,6 +3305,11 @@ open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tun
}
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
void
close_tun(struct tuntap *tt, openvpn_net_ctx_t *ctx)
{
@ -3326,6 +3359,10 @@ read_tun(struct tuntap *tt, uint8_t *buf, int len)
}
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
#elif defined(TARGET_AIX)
void
@ -5517,6 +5554,11 @@ tun_standby(struct tuntap *tt)
return ret;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
/*
* Convert DHCP options from the command line / config file
* into a raw DHCP-format options string.
@ -5656,6 +5698,10 @@ write_dhcp_search_str(struct buffer *buf, const int type, const char *const *str
buf_write(buf, tmp_buf, len);
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
static bool
build_dhcp_options_string(struct buffer *buf, const struct tuntap_options *o)
{

9
src/openvpn/vlan.c
View file

@ -43,6 +43,11 @@ vlanhdr_get_vid(const struct openvpn_8021qhdr *hdr)
return ntohs(hdr->pcp_cfi_vid & OPENVPN_8021Q_MASK_VID);
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
/*
* Set the VLAN Identifier (VID) in an IEEE 802.1Q header.
*
@ -56,6 +61,10 @@ vlanhdr_set_vid(struct openvpn_8021qhdr *hdr, const uint16_t vid)
(hdr->pcp_cfi_vid & ~OPENVPN_8021Q_MASK_VID) | (htons(vid) & OPENVPN_8021Q_MASK_VID);
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
/*
* vlan_decapsulate - remove 802.1q header and return VID
*

9
src/openvpn/win32.c
View file

@ -1418,6 +1418,11 @@ win32_version_string(struct gc_arena *gc)
return (const char *)out.data;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
bool
send_msg_iservice(HANDLE pipe, const void *data, size_t size, ack_message_t *ack,
const char *context)
@ -1632,4 +1637,8 @@ unprotect_buffer_win32(char *buf, size_t len)
return ret;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
#endif /* ifdef _WIN32 */

9
src/openvpnserv/interactive.c
View file

@ -1383,6 +1383,11 @@ InitialSearchListExists(HKEY key)
return TRUE;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
/**
* Prepare DNS domain "SearchList" registry value, so additional
* VPN domains can be added and its original state can be restored
@ -2614,6 +2619,10 @@ SetNrptRules(HKEY nrpt_key, const nrpt_address_t *addresses, const char *domains
return err;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
/**
* Return the registry key where NRPT rules are stored
*

9
tests/unit_tests/openvpn/test_crypto.c
View file

@ -674,6 +674,11 @@ struct epoch_test_state
struct crypto_options co;
};
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
static int
crypto_test_epoch_setup(void **state)
{
@ -694,6 +699,10 @@ crypto_test_epoch_setup(void **state)
return 0;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
static int
crypto_test_epoch_teardown(void **state)
{

2
tests/unit_tests/openvpn/test_pkcs11.c
View file

@ -378,7 +378,7 @@ test_pkcs11_ids(void **state)
/* decode the base64 data and convert to X509 and get its sha1 fingerprint */
unsigned char *der = malloc(strlen(base64));
assert_non_null(der);
int derlen = openvpn_base64_decode(base64, der, strlen(base64));
int derlen = openvpn_base64_decode(base64, der, (int)strlen(base64));
free(base64);
assert_true(derlen > 0);

9
tests/unit_tests/openvpn/test_ssl.c
View file

@ -133,6 +133,11 @@ static struct
const char *keyfile;
} global_state;
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
static int
init(void **state)
{
@ -154,6 +159,10 @@ init(void **state)
return 0;
}
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
static int
cleanup(void **state)
{