From 56355924b4945ec808500b18c714c111387697f9 Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Thu, 20 Jun 2024 16:42:30 +0200 Subject: [PATCH] configure: Add -Wstrict-prototypes and -Wold-style-definition These are not covered by -Wall (nor -Wextra) but we want to enforce them. Change-Id: I6e08920e4cf4762b9f14a7461a29fa77df15255c Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Message-Id: <20240620144230.19586-1-gert@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28823.html Signed-off-by: Gert Doering --- configure.ac | 2 ++ src/openvpn/dco.h | 4 ++-- src/openvpn/dco_freebsd.c | 2 +- src/openvpn/dco_linux.c | 2 +- src/openvpn/pkcs11.h | 6 +++--- src/openvpn/sig.c | 2 +- src/openvpn/ssl.c | 2 +- src/openvpn/ssl.h | 2 +- src/openvpn/xkey_helper.c | 2 +- src/openvpn/xkey_provider.c | 2 +- tests/unit_tests/openvpn/test_common.h | 2 +- tests/unit_tests/openvpn/test_pkcs11.c | 2 +- tests/unit_tests/openvpn/test_provider.c | 4 ++-- tests/unit_tests/openvpn/test_ssl.c | 2 +- .../plugins/auth-pam/test_search_and_replace.c | 12 ++++++------ 15 files changed, 25 insertions(+), 23 deletions(-) diff --git a/configure.ac b/configure.ac index 2e5ab6a6..c01ad093 100644 --- a/configure.ac +++ b/configure.ac @@ -1408,6 +1408,8 @@ 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([-Wall]) if test "${enable_pedantic}" = "yes"; then diff --git a/src/openvpn/dco.h b/src/openvpn/dco.h index 50ebb359..035474fc 100644 --- a/src/openvpn/dco.h +++ b/src/openvpn/dco.h @@ -247,7 +247,7 @@ int dco_get_peer_stats(struct context *c); * * @return list of colon-separated ciphers */ -const char *dco_get_supported_ciphers(); +const char *dco_get_supported_ciphers(void); #else /* if defined(ENABLE_DCO) */ @@ -375,7 +375,7 @@ dco_get_peer_stats(struct context *c) } static inline const char * -dco_get_supported_ciphers() +dco_get_supported_ciphers(void) { return ""; } diff --git a/src/openvpn/dco_freebsd.c b/src/openvpn/dco_freebsd.c index 7c8b29c9..9a90f5c0 100644 --- a/src/openvpn/dco_freebsd.c +++ b/src/openvpn/dco_freebsd.c @@ -773,7 +773,7 @@ dco_get_peer_stats(struct context *c) } const char * -dco_get_supported_ciphers() +dco_get_supported_ciphers(void) { return "none:AES-256-GCM:AES-192-GCM:AES-128-GCM:CHACHA20-POLY1305"; } diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c index b2584b97..277cd644 100644 --- a/src/openvpn/dco_linux.c +++ b/src/openvpn/dco_linux.c @@ -1053,7 +1053,7 @@ dco_event_set(dco_context_t *dco, struct event_set *es, void *arg) } const char * -dco_get_supported_ciphers() +dco_get_supported_ciphers(void) { return "AES-128-GCM:AES-256-GCM:AES-192-GCM:CHACHA20-POLY1305"; } diff --git a/src/openvpn/pkcs11.h b/src/openvpn/pkcs11.h index 3caedc00..772fa4ed 100644 --- a/src/openvpn/pkcs11.h +++ b/src/openvpn/pkcs11.h @@ -35,7 +35,7 @@ pkcs11_initialize( ); void -pkcs11_terminate(); +pkcs11_terminate(void); bool pkcs11_addProvider( @@ -46,10 +46,10 @@ pkcs11_addProvider( ); int -pkcs11_logout(); +pkcs11_logout(void); int -pkcs11_management_id_count(); +pkcs11_management_id_count(void); bool pkcs11_management_id_get( diff --git a/src/openvpn/sig.c b/src/openvpn/sig.c index cfbd942b..8323f0d9 100644 --- a/src/openvpn/sig.c +++ b/src/openvpn/sig.c @@ -448,7 +448,7 @@ post_init_signal_catch(void) } void -halt_low_priority_signals() +halt_low_priority_signals(void) { #ifndef _WIN32 struct sigaction sa; diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c index 2054eb47..17078c99 100644 --- a/src/openvpn/ssl.c +++ b/src/openvpn/ssl.c @@ -277,7 +277,7 @@ static char *auth_challenge; /* GLOBAL */ #endif void -enable_auth_user_pass() +enable_auth_user_pass(void) { auth_user_pass_enabled = true; } diff --git a/src/openvpn/ssl.h b/src/openvpn/ssl.h index 98e59e88..0e2a43f8 100644 --- a/src/openvpn/ssl.h +++ b/src/openvpn/ssl.h @@ -381,7 +381,7 @@ void tls_post_encrypt(struct tls_multi *multi, struct buffer *buf); void pem_password_setup(const char *auth_file); /* Enables the use of user/password authentication */ -void enable_auth_user_pass(); +void enable_auth_user_pass(void); /* * Setup authentication username and password. If auth_file is given, use the diff --git a/src/openvpn/xkey_helper.c b/src/openvpn/xkey_helper.c index 283c95db..b68fb434 100644 --- a/src/openvpn/xkey_helper.c +++ b/src/openvpn/xkey_helper.c @@ -49,7 +49,7 @@ static const char *const props = XKEY_PROV_PROPS; XKEY_EXTERNAL_SIGN_fn xkey_management_sign; static void -print_openssl_errors() +print_openssl_errors(void) { unsigned long e; while ((e = ERR_get_error())) diff --git a/src/openvpn/xkey_provider.c b/src/openvpn/xkey_provider.c index f5fc9568..964d2eb1 100644 --- a/src/openvpn/xkey_provider.c +++ b/src/openvpn/xkey_provider.c @@ -155,7 +155,7 @@ static int keymgmt_import_helper(XKEY_KEYDATA *key, const OSSL_PARAM params[]); static XKEY_KEYDATA * -keydata_new() +keydata_new(void) { xkey_dmsg(D_XKEY, "entry"); diff --git a/tests/unit_tests/openvpn/test_common.h b/tests/unit_tests/openvpn/test_common.h index f219e93e..52503c66 100644 --- a/tests/unit_tests/openvpn/test_common.h +++ b/tests/unit_tests/openvpn/test_common.h @@ -33,7 +33,7 @@ * methods */ static inline void -openvpn_unit_test_setup() +openvpn_unit_test_setup(void) { assert_int_equal(setvbuf(stdout, NULL, _IONBF, BUFSIZ), 0); assert_int_equal(setvbuf(stderr, NULL, _IONBF, BUFSIZ), 0); diff --git a/tests/unit_tests/openvpn/test_pkcs11.c b/tests/unit_tests/openvpn/test_pkcs11.c index 84ebb292..6d283a20 100644 --- a/tests/unit_tests/openvpn/test_pkcs11.c +++ b/tests/unit_tests/openvpn/test_pkcs11.c @@ -134,7 +134,7 @@ struct env_set *es; /* Fill-in certs[] array */ void -init_cert_data() +init_cert_data(void) { struct test_cert certs_local[] = { {cert1, key1, cname1, "OVPN TEST CA1", "OVPN Test Cert 1", {0}, NULL}, diff --git a/tests/unit_tests/openvpn/test_provider.c b/tests/unit_tests/openvpn/test_provider.c index 934b2d3b..cfe9ac32 100644 --- a/tests/unit_tests/openvpn/test_provider.c +++ b/tests/unit_tests/openvpn/test_provider.c @@ -119,7 +119,7 @@ load_pubkey(const char *pem) } static void -init_test() +init_test(void) { openvpn_unit_test_setup(); prov[0] = OSSL_PROVIDER_load(NULL, "default"); @@ -135,7 +135,7 @@ init_test() } static void -uninit_test() +uninit_test(void) { for (size_t i = 0; i < _countof(prov); i++) { diff --git a/tests/unit_tests/openvpn/test_ssl.c b/tests/unit_tests/openvpn/test_ssl.c index a9a31379..5da5b1c2 100644 --- a/tests/unit_tests/openvpn/test_ssl.c +++ b/tests/unit_tests/openvpn/test_ssl.c @@ -81,7 +81,7 @@ const char *unittest_cert = "-----BEGIN CERTIFICATE-----\n" "-----END CERTIFICATE-----\n"; static const char * -get_tmp_dir() +get_tmp_dir(void) { const char *ret; #ifdef _WIN32 diff --git a/tests/unit_tests/plugins/auth-pam/test_search_and_replace.c b/tests/unit_tests/plugins/auth-pam/test_search_and_replace.c index ee7a1518..d40467f2 100644 --- a/tests/unit_tests/plugins/auth-pam/test_search_and_replace.c +++ b/tests/unit_tests/plugins/auth-pam/test_search_and_replace.c @@ -9,7 +9,7 @@ #include "utils.h" static void -pass_any_null_param__returns_null() +pass_any_null_param__returns_null(void **state) { char DUMMY[] = "DUMMY"; @@ -20,7 +20,7 @@ pass_any_null_param__returns_null() } static void -pass_any_empty_string__returns_null() +pass_any_empty_string__returns_null(void **state) { char DUMMY[] = "DUMMY"; @@ -32,7 +32,7 @@ pass_any_empty_string__returns_null() } static void -replace_single_char__one_time__match_is_replaced() +replace_single_char__one_time__match_is_replaced(void **state) { char *replaced = searchandreplace("X", "X", "Y"); @@ -43,7 +43,7 @@ replace_single_char__one_time__match_is_replaced() } static void -replace_single_char__multiple_times__match_all_matches_are_replaced() +replace_single_char__multiple_times__match_all_matches_are_replaced(void **state) { char *replaced = searchandreplace("XaX", "X", "Y"); @@ -54,7 +54,7 @@ replace_single_char__multiple_times__match_all_matches_are_replaced() } static void -replace_longer_text__multiple_times__match_all_matches_are_replaced() +replace_longer_text__multiple_times__match_all_matches_are_replaced(void **state) { char *replaced = searchandreplace("XXaXX", "XX", "YY"); @@ -65,7 +65,7 @@ replace_longer_text__multiple_times__match_all_matches_are_replaced() } static void -pattern_not_found__returns_original() +pattern_not_found__returns_original(void **state) { char *replaced = searchandreplace("abc", "X", "Y");