October 2019 - tor-commits - lists.torproject.org

[tor/master] conftesting.h: when COCCI is defined, disable unhandled macros
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit 04a74d4aa7d990b03ea07182e86263ed1651db43 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 12:42:09 2019 -0400 conftesting.h: when COCCI is defined, disable unhandled macros --- src/lib/conf/conftesting.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/lib/conf/conftesting.h b/src/lib/conf/conftesting.h index a40c9bc97..8f82b5bf1 100644 --- a/src/lib/conf/conftesting.h +++ b/src/lib/conf/conftesting.h @@ -12,7 +12,9 @@ #ifndef TOR_LIB_CONF_CONFTESTING_H #define TOR_LIB_CONF_CONFTESTING_H +#ifndef COCCI #ifdef TOR_UNIT_TESTS +#define USE_CONF_TESTING /** * Union used when building in test mode typechecking the members of a type * used with confparse.c. See CONF_CHECK_VAR_TYPE for a description of how @@ -41,12 +43,10 @@ typedef union { // XXXX this doesn't belong at this level of abstraction. struct routerset_t **ROUTERSET; } confparse_dummy_values_t; -#endif /* defined(TOR_UNIT_TESTS) */ /* Macros to define extra members inside config_var_t fields, and at the * end of a list of them. */ -#ifdef TOR_UNIT_TESTS /* This is a somewhat magic type-checking macro for users of confparse.c. * It initializes a union member "confparse_dummy_values_t.conftype" with * the address of a static member "tp_dummy.member". This @@ -72,9 +72,10 @@ typedef union { #define DUMMY_CONF_TEST_MEMBERS , .var_ptr_dummy={ .INT=NULL } #define DUMMY_TYPECHECK_INSTANCE(tp) \ static tp tp ## _dummy +#endif +#endif -#else /* !(defined(TOR_UNIT_TESTS)) */ - +#ifndef USE_CONF_TESTING #define CONF_TEST_MEMBERS(tp, conftype, member) /* Repeatedly declarable incomplete struct to absorb redundant semicolons */ #define DUMMY_TYPECHECK_INSTANCE(tp) \

1 0

[tor/master] tor-coccinelle.h: add HANDLE_{DECL, IMPL}
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit 6696a5bbae4bd21f84a5b0730273fd847b8f0e45 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 10:54:11 2019 -0400 tor-coccinelle.h: add HANDLE_{DECL,IMPL} --- scripts/coccinelle/tor-coccinelle.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/coccinelle/tor-coccinelle.h b/scripts/coccinelle/tor-coccinelle.h index a064c7980..0727caa4d 100644 --- a/scripts/coccinelle/tor-coccinelle.h +++ b/scripts/coccinelle/tor-coccinelle.h @@ -37,6 +37,8 @@ #define DISABLE_GCC_WARNING(x) #define ENABLE_GCC_WARNING(x) +#define HANDLE_DECL(a,b,c) +#define HANDLE_IMPL(a,b,c) #define HT_ENTRY(x) void * #define HT_HEAD(a,b) struct ht_head #define HT_INITIALIZER() { }

1 0

[tor/master] tor-coccinelle.h: add EAT_SEMICOLON
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit d129b503c0ef64547d6a875752d8ce530bbfd1bf Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 10:49:47 2019 -0400 tor-coccinelle.h: add EAT_SEMICOLON --- scripts/coccinelle/tor-coccinelle.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/coccinelle/tor-coccinelle.h b/scripts/coccinelle/tor-coccinelle.h index cbb9220a4..a064c7980 100644 --- a/scripts/coccinelle/tor-coccinelle.h +++ b/scripts/coccinelle/tor-coccinelle.h @@ -53,3 +53,5 @@ #define NS_DECL(a, b, c) a b c #define NS(a) a + +#define EAT_SEMICOLON extern int dummy__;

1 0

[tor/master] tor-coccinelle.h: add CHECK_SCANF
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit 2e64dfea95c95499291661256ce97e6ae3d8bc88 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 10:38:22 2019 -0400 tor-coccinelle.h: add CHECK_SCANF --- scripts/coccinelle/tor-coccinelle.h | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/coccinelle/tor-coccinelle.h b/scripts/coccinelle/tor-coccinelle.h index 97935c2dd..cbb9220a4 100644 --- a/scripts/coccinelle/tor-coccinelle.h +++ b/scripts/coccinelle/tor-coccinelle.h @@ -20,6 +20,7 @@ #define MOCK_DECL(a, b, c) a b c #define MOCK_IMPL(a, b, c) a b c #define CHECK_PRINTF(a, b) +#define CHECK_SCANF(a, b) #define STATIC static #define STMT_BEGIN do {

1 0

[tor/master] test: Hide some test-declaration macro definitions to COCCI.
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit 4fad456148738712e48582b22496e6baf0dfc1f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 10:58:03 2019 -0400 test: Hide some test-declaration macro definitions to COCCI. (These ones cause parsing failures.) --- src/test/test_addr.c | 2 ++ src/test/test_confparse.c | 2 ++ src/test/test_connection.c | 2 ++ src/test/test_controller.c | 4 ++++ src/test/test_crypto.c | 2 ++ src/test/test_crypto_slow.c | 2 ++ src/test/test_dir.c | 2 ++ src/test/test_entrynodes.c | 2 ++ src/test/test_link_handshake.c | 2 ++ src/test/test_options.c | 2 ++ src/test/test_util.c | 4 ++++ 11 files changed, 26 insertions(+) diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 0f50a4361..50543293c 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -1662,8 +1662,10 @@ test_addr_rfc6598(void *arg) ; } +#ifndef COCCI #define ADDR_LEGACY(name) \ { #name, test_addr_ ## name , 0, NULL, NULL } +#endif struct testcase_t addr_tests[] = { ADDR_LEGACY(basic), diff --git a/src/test/test_confparse.c b/src/test/test_confparse.c index bd2b5cdf1..454b38c64 100644 --- a/src/test/test_confparse.c +++ b/src/test/test_confparse.c @@ -1027,12 +1027,14 @@ test_confparse_find_option_name(void *arg) config_mgr_free(mgr); } +#ifndef COCCI #define CONFPARSE_TEST(name, flags) \ { #name, test_confparse_ ## name, flags, NULL, NULL } #define BADVAL_TEST(name) \ { "badval_" #name, test_confparse_assign_badval, 0, \ &passthrough_setup, (void*)&bv_ ## name } +#endif struct testcase_t confparse_tests[] = { CONFPARSE_TEST(init, 0), diff --git a/src/test/test_connection.c b/src/test/test_connection.c index ebe7c6d36..3148c1af6 100644 --- a/src/test/test_connection.c +++ b/src/test/test_connection.c @@ -881,12 +881,14 @@ test_failed_orconn_tracker(void *arg) ; } +#ifndef COCCI #define CONNECTION_TESTCASE(name, fork, setup) \ { #name, test_conn_##name, fork, &setup, NULL } /* where arg is an expression (constant, variable, compound expression) */ #define CONNECTION_TESTCASE_ARG(name, fork, setup, arg) \ { #name "_" #arg, test_conn_##name, fork, &setup, (void *)arg } +#endif struct testcase_t connection_tests[] = { CONNECTION_TESTCASE(get_basic, TT_FORK, test_conn_get_basic_st), diff --git a/src/test/test_controller.c b/src/test/test_controller.c index b9cbe0a14..df595055f 100644 --- a/src/test/test_controller.c +++ b/src/test/test_controller.c @@ -119,6 +119,7 @@ test_controller_parse_cmd(void *arg) control_cmd_args_free(result); } +#ifndef COCCI #define OK(inp, out) \ { inp "\r\n", out, NULL } #define ERR(inp, err) \ @@ -128,6 +129,7 @@ test_controller_parse_cmd(void *arg) { &syntax, \ ARRAY_LENGTH(array), \ array } +#endif static const parser_testcase_t one_to_three_tests[] = { ERR("", "Need at least 1 argument(s)"), @@ -1818,9 +1820,11 @@ test_getinfo_md_all(void *arg) return; } +#ifndef COCCI #define PARSER_TEST(type) \ { "parse/" #type, test_controller_parse_cmd, 0, &passthrough_setup, \ (void*)&parse_ ## type ## _params } +#endif struct testcase_t controller_tests[] = { PARSER_TEST(one_to_three), diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 178a9a509..7288e6ee8 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -2971,6 +2971,7 @@ test_crypto_failure_modes(void *arg) ; } +#ifndef COCCI #define CRYPTO_LEGACY(name) \ { #name, test_crypto_ ## name , 0, NULL, NULL } @@ -2981,6 +2982,7 @@ test_crypto_failure_modes(void *arg) #define ED25519_TEST(name, fl) \ ED25519_TEST_ONE(name, (fl), "donna"), \ ED25519_TEST_ONE(name, (fl), "ref10") +#endif struct testcase_t crypto_tests[] = { CRYPTO_LEGACY(formats), diff --git a/src/test/test_crypto_slow.c b/src/test/test_crypto_slow.c index 3b20dfa58..4f0cfbc64 100644 --- a/src/test/test_crypto_slow.c +++ b/src/test/test_crypto_slow.c @@ -584,6 +584,7 @@ test_crypto_ed25519_fuzz_donna(void *arg) ; } +#ifndef COCCI #define CRYPTO_LEGACY(name) \ { #name, test_crypto_ ## name , 0, NULL, NULL } @@ -594,6 +595,7 @@ test_crypto_ed25519_fuzz_donna(void *arg) #define ED25519_TEST(name, fl) \ ED25519_TEST_ONE(name, (fl), "donna"), \ ED25519_TEST_ONE(name, (fl), "ref10") +#endif struct testcase_t slow_crypto_tests[] = { CRYPTO_LEGACY(s2k_rfc2440), diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 17d6db1e4..bdcd78545 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -7210,6 +7210,7 @@ test_dir_format_versions_list(void *arg) teardown_capture_of_logs(); } +#ifndef COCCI #define DIR_LEGACY(name) \ { #name, test_dir_ ## name , TT_FORK, NULL, NULL } @@ -7219,6 +7220,7 @@ test_dir_format_versions_list(void *arg) /* where arg is a string constant */ #define DIR_ARG(name,flags,arg) \ { #name "_" arg, test_dir_##name, (flags), &passthrough_setup, (void*) arg } +#endif struct testcase_t dir_tests[] = { DIR_LEGACY(nicknames), diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index c8dd4b03e..81d9eb9ab 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -3038,6 +3038,7 @@ static const struct testcase_setup_t upgrade_circuits = { upgrade_circuits_setup, upgrade_circuits_cleanup }; +#ifndef COCCI #define NO_PREFIX_TEST(name) \ { #name, test_ ## name, 0, NULL, NULL } @@ -3060,6 +3061,7 @@ static const struct testcase_setup_t upgrade_circuits = { &upgrade_circuits, (void*)(arg REASONABLY_FUTURE) }, \ { #name "_reasonably_past", test_entry_guard_ ## name, TT_FORK, \ &upgrade_circuits, (void*)(arg REASONABLY_PAST) } +#endif struct testcase_t entrynodes_tests[] = { NO_PREFIX_TEST(node_preferred_orport), diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c index 5e78e1ce4..1371e1ef7 100644 --- a/src/test/test_link_handshake.c +++ b/src/test/test_link_handshake.c @@ -1492,6 +1492,7 @@ AUTHENTICATE_FAIL(missing_ed_auth, "authentication certificate"; }) +#ifndef COCCI #define TEST_RSA(name, flags) \ { #name , test_link_handshake_ ## name, (flags), \ &passthrough_setup, (void*)"RSA" } @@ -1527,6 +1528,7 @@ AUTHENTICATE_FAIL(missing_ed_auth, #define TEST_AUTHENTICATE_ED(name) \ { "authenticate/" #name "_ed25519" , test_link_handshake_auth_ ## name, \ TT_FORK, &setup_authenticate, (void*)3 } +#endif struct testcase_t link_handshake_tests[] = { TEST_RSA(certs_ok, TT_FORK), diff --git a/src/test/test_options.c b/src/test/test_options.c index a6bccdc52..62d477a63 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -4163,8 +4163,10 @@ test_options_validate__accel(void *ignored) tor_free(msg); } +#ifndef COCCI #define LOCAL_VALIDATE_TEST(name) \ { "validate__" #name, test_options_validate__ ## name, TT_FORK, NULL, NULL } +#endif struct testcase_t options_tests[] = { { "validate", test_options_validate, TT_FORK, NULL, NULL }, diff --git a/src/test/test_util.c b/src/test/test_util.c index c56d3488b..b34a9e0ab 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -304,6 +304,7 @@ test_util_write_chunks_to_file(void *arg) tor_free(temp_str); } +#ifndef COCCI #define _TFE(a, b, f) tt_int_op((a).f, OP_EQ, (b).f) /** test the minimum set of struct tm fields needed for a unique epoch value * this is also the set we use to test tor_timegm */ @@ -316,6 +317,7 @@ test_util_write_chunks_to_file(void *arg) _TFE(a, b, tm_min ); \ _TFE(a, b, tm_sec ); \ TT_STMT_END +#endif static void test_util_time(void *arg) @@ -6256,6 +6258,7 @@ test_util_map_anon_nofork(void *arg) #endif /* defined(_WIN32) */ } +#ifndef COCCI #define UTIL_LEGACY(name) \ { #name, test_util_ ## name , 0, NULL, NULL } @@ -6280,6 +6283,7 @@ test_util_map_anon_nofork(void *arg) { "compress_dos/" #name, test_util_decompress_dos, 0, \ &compress_setup, \ (char*)(identifier) } +#endif #ifdef _WIN32 #define UTIL_TEST_NO_WIN(n, f) { #n, NULL, TT_SKIP, NULL, NULL }

1 0

[tor/master] consdiff disable a macro when running with COCCI
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit ef5d1e6b656e752c79bb5df26f64aef51550594f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 11:12:41 2019 -0400 consdiff disable a macro when running with COCCI --- src/feature/dircommon/consdiff.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/feature/dircommon/consdiff.c b/src/feature/dircommon/consdiff.c index 8e93953f7..f75ec848b 100644 --- a/src/feature/dircommon/consdiff.c +++ b/src/feature/dircommon/consdiff.c @@ -530,10 +530,12 @@ typedef struct router_id_iterator_t { cdline_t hash; } router_id_iterator_t; +#ifndef COCCI /** * Initializer for a router_id_iterator_t. */ #define ROUTER_ID_ITERATOR_INIT { { NULL, 0 }, { NULL, 0 } } +#endif /** Given an index *idxp into the consensus at cons, advance * the index to the next router line ("r ...") in the consensus, or to

1 0

[tor/master] confmacros.h: fix coccinelle parsing.
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit 3e41459dff9e62cabe2636eac61d19b32dd0a4e1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 12:39:31 2019 -0400 confmacros.h: fix coccinelle parsing. --- scripts/coccinelle/tor-coccinelle.h | 3 +++ src/lib/conf/confmacros.h | 2 ++ 2 files changed, 5 insertions(+) diff --git a/scripts/coccinelle/tor-coccinelle.h b/scripts/coccinelle/tor-coccinelle.h index c83dce3c5..44d79325e 100644 --- a/scripts/coccinelle/tor-coccinelle.h +++ b/scripts/coccinelle/tor-coccinelle.h @@ -57,4 +57,7 @@ #define NS_DECL(a, b, c) a b c #define NS(a) a +#define CONF_TEST_MEMBERS(a,b,c) +#define DUMMY_CONF_TEST_MEMBERS + #define EAT_SEMICOLON extern int dummy__; diff --git a/src/lib/conf/confmacros.h b/src/lib/conf/confmacros.h index 68121891f..6449458a1 100644 --- a/src/lib/conf/confmacros.h +++ b/src/lib/conf/confmacros.h @@ -15,11 +15,13 @@ #include "orconfig.h" #include "lib/conf/conftesting.h" +#ifndef COCCI /** * Used to indicate the end of an array of configuration variables. **/ #define END_OF_CONFIG_VARS \ { .member = { .name = NULL } DUMMY_CONF_TEST_MEMBERS } +#endif /** * Declare a config_var_t as a member named membername of the structure

1 0

[tor/master] Apparently coccinelle can't handle multiline #errors.
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit c1e8e5bb3223b950f79bce5bd3540566fc1fdc7b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 10:47:05 2019 -0400 Apparently coccinelle can't handle multiline #errors. --- src/lib/crypt_ops/crypto_openssl_mgt.c | 6 ++++-- src/lib/log/log.h | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/lib/crypt_ops/crypto_openssl_mgt.c b/src/lib/crypt_ops/crypto_openssl_mgt.c index 9ec59e7c8..917ef4597 100644 --- a/src/lib/crypt_ops/crypto_openssl_mgt.c +++ b/src/lib/crypt_ops/crypto_openssl_mgt.c @@ -121,9 +121,11 @@ crypto_openssl_get_header_version_str(void) return crypto_openssl_header_version_str; } +#ifndef COCCI #ifndef OPENSSL_THREADS -#error OpenSSL has been built without thread support. Tor requires an \ - OpenSSL library with thread support enabled. +#error "OpenSSL has been built without thread support. Tor requires an \ + OpenSSL library with thread support enabled." +#endif #endif #ifndef NEW_THREAD_API diff --git a/src/lib/log/log.h b/src/lib/log/log.h index c4a27782c..c2b20fc22 100644 --- a/src/lib/log/log.h +++ b/src/lib/log/log.h @@ -23,9 +23,11 @@ #include <syslog.h> #define LOG_WARN LOG_WARNING #if LOG_DEBUG < LOG_ERR +#ifndef COCCI #error "Your syslog.h thinks high numbers are more important. " \ "We aren't prepared to deal with that." #endif +#endif #else /* !(defined(HAVE_SYSLOG_H)) */ /* Note: Syslog's logging code refers to priorities, with 0 being the most * important. Thus, all our comparisons needed to be reversed when we added

1 0

[tor/master] timers.c: define TIMEOUT_PUBLIC to no tokens when using COCCI.
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit 0abe89519b5f9d4710b06c6ec77b69879c76e18b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 12:48:56 2019 -0400 timers.c: define TIMEOUT_PUBLIC to no tokens when using COCCI. --- src/lib/evloop/timers.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/evloop/timers.c b/src/lib/evloop/timers.c index 4b2a96ef7..23562971c 100644 --- a/src/lib/evloop/timers.c +++ b/src/lib/evloop/timers.c @@ -56,7 +56,9 @@ struct timeout_cb { /* * These definitions are for timeouts.c and timeouts.h. */ -#ifdef __GNUC__ +#ifdef COCCI +#define TIMEOUT_PUBLIC +#elif defined(__GNUC__) /* We're not exposing any of the functions outside this file. */ #define TIMEOUT_PUBLIC __attribute__((__unused__)) static #else

1 0

[tor/master] test.h: Use COCCI to suppress macros Coccinelle does not understand.
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit 0da349aa5ebc6d33c92a4f979002c2b0282afc41 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 13:22:34 2019 -0400 test.h: Use COCCI to suppress macros Coccinelle does not understand. --- src/test/test.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/test/test.h b/src/test/test.h index d6a1d19ea..59c4bc797 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -37,6 +37,7 @@ #define test_memeq_hex(expr1, hex) test_mem_op_hex(expr1, OP_EQ, hex) +#ifndef COCCI #define tt_double_op(a,op,b) \ tt_assert_test_type(a,b,#a" "#op" "#b,double,(val1_ op val2_),"%g", \ TT_EXIT_TEST_FUNCTION) @@ -64,6 +65,7 @@ tt_assert_test_fmt_type(a,b,#a" "#op" "#b,int64_t,(val1_ op val2_), \ int64_t, "%"PRId64, \ {print_ = (int64_t) value_;}, {}, TT_EXIT_TEST_FUNCTION) +#endif /** * Declare that the test is done, even though no tt___op() calls were made. @@ -145,6 +147,7 @@ void free_pregenerated_keys(void); #define NAME_TEST_(name) #name #define NAME_TEST(name) NAME_TEST_(name) #define ASPECT(test_module, test_name) US2_CONCAT_2__(test_module, test_name) +#ifndef COCCI #define TEST_CASE(function) \ { \ NAME_TEST(function), \ @@ -161,15 +164,18 @@ void free_pregenerated_keys(void); NULL, \ NULL, \ } +#endif #define NS(name) US_CONCAT_3_(NS_MODULE, NS_SUBMODULE, name) #define NS_FULL(module, submodule, name) US_CONCAT_3_(module, submodule, name) #define CALLED(mock_name) US_CONCAT_2_(NS(mock_name), called) +#ifndef COCCI #define NS_DECL(retval, mock_fn, args) \ extern int CALLED(mock_fn); \ static retval NS(mock_fn) args; int CALLED(mock_fn) = 0 #define NS_MOCK(name) MOCK(name, NS(name)) +#endif #define NS_UNMOCK(name) UNMOCK(name) extern const struct testcase_setup_t passthrough_setup;

1 0