Skip to content

Commit

Permalink
configure: Add -Wstrict-prototypes and -Wold-style-definition
Browse files Browse the repository at this point in the history
These are not covered by -Wall (nor -Wextra) but we want
to enforce them.

Change-Id: I6e08920e4cf4762b9f14a7461a29fa77df15255c
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20240620133703.13906-1-gert@greenie.muc.de>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28820.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
  • Loading branch information
flichtenheld authored and cron2 committed Jun 20, 2024
1 parent c9f29e3 commit 02dd713
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 19 deletions.
2 changes: 2 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/openvpn/dco.h
Original file line number Diff line number Diff line change
Expand Up @@ -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) */

Expand Down Expand Up @@ -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 "";
}
Expand Down
2 changes: 1 addition & 1 deletion src/openvpn/dco_freebsd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
Expand Down
2 changes: 1 addition & 1 deletion src/openvpn/dco_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
Expand Down
2 changes: 1 addition & 1 deletion src/openvpn/sig.c
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ post_init_signal_catch(void)
}

void
halt_low_priority_signals()
halt_low_priority_signals(void)
{
#ifndef _WIN32
struct sigaction sa;
Expand Down
2 changes: 1 addition & 1 deletion src/openvpn/ssl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/openvpn/ssl.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/openvpn/xkey_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -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()))
Expand Down
2 changes: 1 addition & 1 deletion src/openvpn/xkey_provider.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down
2 changes: 1 addition & 1 deletion tests/unit_tests/openvpn/test_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions tests/unit_tests/openvpn/test_provider.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -135,7 +135,7 @@ init_test()
}

static void
uninit_test()
uninit_test(void)
{
for (size_t i = 0; i < _countof(prov); i++)
{
Expand Down
2 changes: 1 addition & 1 deletion tests/unit_tests/openvpn/test_ssl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions tests/unit_tests/plugins/auth-pam/test_search_and_replace.c
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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";
Expand All @@ -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");

Expand All @@ -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");

Expand All @@ -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");

Expand All @@ -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");

Expand Down

0 comments on commit 02dd713

Please sign in to comment.