From patchwork Thu Jun 20 13:37:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 3743 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:a501:b0:57d:b2cb:6cf with SMTP id hh1csp818332mab; Thu, 20 Jun 2024 06:37:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWSu1k3kcZXp6xSn6uCjQi8y8T1Uo+GZ0i/XM7zs2tAm3D0wXbPYFljRdM8rDWJjk/OIxpKVsDCC6u/xpReTsTyrsCJVEU= X-Google-Smtp-Source: AGHT+IF0EwYLLij8f05HRb86krNv1Un4WI2Xm3fIlm1RhKLYgd3/p3+TbPTqb0HAvivw118XOx2t X-Received: by 2002:a17:902:fb4c:b0:1f9:b35f:65dc with SMTP id d9443c01a7336-1f9b35f66f0mr43079465ad.6.1718890656635; Thu, 20 Jun 2024 06:37:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718890656; cv=none; d=google.com; s=arc-20160816; b=u1j/FLeuK+YymlAmiQ4rzEc6RT1WbGfGnq2LymrEC3bz25E4oHTAIs+BIvrolC0yF9 L4ymuFbCQ/PQrZ7f9e8+42q8PcT9xkiNRoa1ap1SL/NJr/lHQdh1gNY9ZXoZsAf7MjBr KuPW4NMaNsTeQgfM/XQ8eYE0WVZx4uKcnAUMS//WWRaxLbTndhn/njTNTR2/lLrgnNS/ ql1Nwub7FodZOEKLyyJaCjk1wSiowivK9TsQdQg/GBD/wb3fw6GqBAoT+4jtCbCmJQ1G 0FMu1m+C3nE7YobNg2d3IotCS9588C9E8h4xnWQg5hX8L+jyaZ8g4gnBchkvk+B0FJl2 E9uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature; bh=DeHY2laGH4su4XqK/JUFw7HlU6mCRBNTth1K8OWhfP0=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=opQQ5uD+2eeeMiNI4yBNPfI22lY9/GEsdu3t9RARcarfXgXYLIDq+ilqm9jZgBxZdg a4a5AORWSjqgIgCNOL/A3ShYrSU+Jtb80iwrZVFAKtQcaRnLErZQT3bFeuwpVesnUEu+ HX6XCkpL9aFY5rZBGNC4AJEJ1jD6tZn7eiz1bKVuD9oTl/qDSM7qv5J8bOKt3AGNCSXf jYFz9wHqx/po8JayyNRBiDzJEdb22BMl+sxOngT6uYVR9IgvIVZxb0fDVgeZgyIvxm60 br+5J/sOoSOybJKG9INYAT+ZU3nYlMUmozdThKxiHziR5HTkvagNiAVHNZlyk03YckiY clOA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=iTSx93GR; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=blrmpSm+; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id d9443c01a7336-1f855ee2efcsi143753605ad.396.2024.06.20.06.37.36 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jun 2024 06:37:36 -0700 (PDT) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=iTSx93GR; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=blrmpSm+; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de Received: from [127.0.0.1] (helo=sfs-ml-3.v29.lw.sourceforge.com) by sfs-ml-3.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1sKHyb-0006iK-CL; Thu, 20 Jun 2024 13:37:20 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-3.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1sKHya-0006iD-6c for openvpn-devel@lists.sourceforge.net; Thu, 20 Jun 2024 13:37:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=tnOgp3FO7m2FUNnLGcy0vzchAvNwi5bxBojtU8hjKJ4=; b=iTSx93GRDy85JcLkUtaP1ylrVN fRsdJNJtCRO6vxdp6WZRm8JrTXqA8kqIi2IM3TAwnXwm17xM/wPcLDvB8t76Xx3xWZzwYBFn90Y00 d6W4imD20t9O3Mbu8l8QDDXvEX17Mb/xxsg3ZDjENe+BycARQrUu0OyCzc9qI8DOfOms=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=tnOgp3FO7m2FUNnLGcy0vzchAvNwi5bxBojtU8hjKJ4=; b=blrmpSm+lSXBw1UzmMSkXccC9c fgMncHl4uDgukzViMmwUAbumw0uloLefyeb4MS61WQF/aBlZ8x2Xj0hD8+K7Rthpm+JPq1R2d+6X3 qbhzKt9aE5+aD28/pHhAsSF7a9RGHR3XsUaimex0+jYbee0+w6Uunlq8OPAeVvS+QFU8=; Received: from dhcp-174.greenie.muc.de ([193.149.48.174] helo=blue.greenie.muc.de) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1sKHyY-00072L-Mi for openvpn-devel@lists.sourceforge.net; Thu, 20 Jun 2024 13:37:19 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.17.1.9/8.17.1.9) with ESMTP id 45KDbB5O013955 for ; Thu, 20 Jun 2024 15:37:11 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.17.1.9/8.17.1.9/Submit) id 45KDbB9g013954 for openvpn-devel@lists.sourceforge.net; Thu, 20 Jun 2024 15:37:11 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Thu, 20 Jun 2024 15:37:03 +0200 Message-ID: <20240620133703.13906-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.44.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: -5.0 (-----) X-Spam-Report: Spam detection software, running on the system "util-spamd-2.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Frank Lichtenheld 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 --- Content analysis details: (-5.0 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: configure.ac] 0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [193.149.48.174 listed in sa-trusted.bondedsender.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [193.149.48.174 listed in bl.score.senderscore.com] -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [193.149.48.174 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Headers-End: 1sKHyY-00072L-Mi Subject: [Openvpn-devel] [PATCH v2] configure: Add -Wstrict-prototypes and -Wold-style-definition X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1802387489115938626?= X-GMAIL-MSGID: =?utf-8?q?1802387489115938626?= From: Frank Lichtenheld 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 --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/667 This mail reflects revision 2 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering diff --git a/configure.ac b/configure.ac index 2e5ab6a..c01ad09 100644 --- a/configure.ac +++ b/configure.ac @@ -1408,6 +1408,8 @@ ) 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 50ebb35..035474f 100644 --- a/src/openvpn/dco.h +++ b/src/openvpn/dco.h @@ -247,7 +247,7 @@ * * @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 @@ } 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 7c8b29c..9a90f5c 100644 --- a/src/openvpn/dco_freebsd.c +++ b/src/openvpn/dco_freebsd.c @@ -773,7 +773,7 @@ } 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 b2584b9..277cd64 100644 --- a/src/openvpn/dco_linux.c +++ b/src/openvpn/dco_linux.c @@ -1053,7 +1053,7 @@ } 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/sig.c b/src/openvpn/sig.c index cfbd942..8323f0d 100644 --- a/src/openvpn/sig.c +++ b/src/openvpn/sig.c @@ -448,7 +448,7 @@ } 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 2054eb4..17078c9 100644 --- a/src/openvpn/ssl.c +++ b/src/openvpn/ssl.c @@ -277,7 +277,7 @@ #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 98e59e8..0e2a43f 100644 --- a/src/openvpn/ssl.h +++ b/src/openvpn/ssl.h @@ -381,7 +381,7 @@ 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 283c95d..b68fb43 100644 --- a/src/openvpn/xkey_helper.c +++ b/src/openvpn/xkey_helper.c @@ -49,7 +49,7 @@ 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 f5fc956..964d2eb 100644 --- a/src/openvpn/xkey_provider.c +++ b/src/openvpn/xkey_provider.c @@ -155,7 +155,7 @@ 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 f219e93..52503c6 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_provider.c b/tests/unit_tests/openvpn/test_provider.c index 934b2d3..cfe9ac3 100644 --- a/tests/unit_tests/openvpn/test_provider.c +++ b/tests/unit_tests/openvpn/test_provider.c @@ -119,7 +119,7 @@ } static void -init_test() +init_test(void) { openvpn_unit_test_setup(); prov[0] = OSSL_PROVIDER_load(NULL, "default"); @@ -135,7 +135,7 @@ } 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 a9a3137..5da5b1c 100644 --- a/tests/unit_tests/openvpn/test_ssl.c +++ b/tests/unit_tests/openvpn/test_ssl.c @@ -81,7 +81,7 @@ "-----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 ee7a151..d40467f 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 @@ } static void -pass_any_empty_string__returns_null() +pass_any_empty_string__returns_null(void **state) { char DUMMY[] = "DUMMY"; @@ -32,7 +32,7 @@ } 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 @@ } 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 @@ } 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 @@ } static void -pattern_not_found__returns_original() +pattern_not_found__returns_original(void **state) { char *replaced = searchandreplace("abc", "X", "Y");