@@ -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)

@@ -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

@@ -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)

@@ -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

@@ -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)

 {

@@ -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)

 {

@@ -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 */

@@ -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

@@ -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,

@@ -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)

 {

@@ -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)

 {

@@ -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) */

@@ -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)

 {

@@ -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

@@ -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

@@ -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)

 {

@@ -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 */

@@ -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 */

@@ -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.

  */

@@ -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

@@ -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 */

@@ -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)

 {

@@ -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)

 {

@@ -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

  */

@@ -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)

 {

@@ -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)

 {

@@ -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)

 {

@@ -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)

 {

@@ -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.

  */

@@ -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)

 {

@@ -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 */

@@ -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 */

@@ -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)

 {

@@ -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 *