January 2020 - tor-commits - lists.torproject.org

[tor/master] Add NSF support acknowledgment to circpad dev doc.
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit b7dbb4a554e7f41d88371103065b55517d58b5d0 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Dec 17 14:02:23 2019 -0600 Add NSF support acknowledgment to circpad dev doc. --- doc/HACKING/CircuitPaddingDevelopment.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/HACKING/CircuitPaddingDevelopment.md b/doc/HACKING/CircuitPaddingDevelopment.md index a0dee68e9..a4e65697b 100644 --- a/doc/HACKING/CircuitPaddingDevelopment.md +++ b/doc/HACKING/CircuitPaddingDevelopment.md @@ -1228,3 +1228,7 @@ open-world case, to be more akin to an optimization problem, where a WTF-PAD-like defense must be tuned through an optimizer to produce results comparable to provably optimal but practically unrealizable defenses, through rigorous adversarial evaluation. + +## A. Acknowledgments + +This research was supported in part by NSF grants CNS-1619454 and CNS-1526306.

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1615'
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit 9276c07a916e4dc3b159c95c578e43be102f26e6 Merge: e08d07692 b7dbb4a55 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 6 13:32:33 2020 -0500 Merge remote-tracking branch 'tor-github/pr/1615' doc/HACKING/CircuitPaddingDevelopment.md | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tor/master] Add documentation about building a TAGS file.
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit e08d07692fa7f2dd0cd139cb0c7e359be4264d8a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 6 13:31:30 2020 -0500 Add documentation about building a TAGS file. Patch from opara. Closes ticket 32779. --- changes/ticket32779 | 3 +++ doc/HACKING/HelpfulTools.md | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/changes/ticket32779 b/changes/ticket32779 new file mode 100644 index 000000000..1b7ccaa7e --- /dev/null +++ b/changes/ticket32779 @@ -0,0 +1,3 @@ + o Documentation: + - Add documentation in 'HelpfulTools.md' to describe how to build a tag + file. Closes ticket 32779. diff --git a/doc/HACKING/HelpfulTools.md b/doc/HACKING/HelpfulTools.md index cba57e875..866b32128 100644 --- a/doc/HACKING/HelpfulTools.md +++ b/doc/HACKING/HelpfulTools.md @@ -315,6 +315,30 @@ If you use emacs for editing Tor and nothing else, you could always just say: There is probably a better way to do this. No, we are probably not going to clutter the files with emacs stuff. +Building a tag file (code index) +-------------------------------- + +Many functions in tor use `MOCK_IMPL` wrappers for unit tests. Your +tag-building program must be told how to handle this syntax. + +If you're using emacs, you can generate an emacs-compatible tag file using +`make tags`. This will run your system's `etags`. Tor's build system assumes +that you're using the emacs-specific version of `etags` (bundled under the +`xemacs21-bin` package on Debian). This is incompatible with other versions of +`etags` such as the version provided by Exuberant Ctags. + +If you're using vim or emacs, you can also use Universal Ctags to build a tag +file using the syntax: + + ctags -R -D 'MOCK_IMPL(r,h,a)=r h a' . + +If you're using an older version of Universal Ctags, you can use the following +instead: + + ctags -R --mline-regex-c='/MOCK_IMPL\([^,]+,\W*([a-zA-Z0-9_]+)\W*,/\1/f/{mgroup=1}' . + +A vim-compatible tag file will be generated by default. If you use emacs, add +the `-e` flag to generate an emacs-compatible tag file. Doxygen -------

1 0

[tor/master] Mark TestingEstimatedDescriptorPropagationTime as obsolete.
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit 42e31b5c45b5387d1c81067386373636bb8fd5c2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 19 11:04:48 2019 -0500 Mark TestingEstimatedDescriptorPropagationTime as obsolete. We stopped looking at this option in 85cf6dcba3693b, back when we implemented the minimal pieces of prop275. Since then, we've had code to validate and adjust this option, and to give it a different value in testing networks, but the option hasn't actually done anything. We can safely mark it as OBSOLETE, since doing so does not make any old configuration get rejected. Closes ticket 32807. --- changes/ticket32807 | 4 ++++ doc/tor.1.txt | 6 ------ src/app/config/config.c | 9 +-------- src/app/config/or_options_st.h | 5 ----- src/app/config/testnet.inc | 1 - src/test/test_options.c | 7 ------- 6 files changed, 5 insertions(+), 27 deletions(-) diff --git a/changes/ticket32807 b/changes/ticket32807 new file mode 100644 index 000000000..07f8716e1 --- /dev/null +++ b/changes/ticket32807 @@ -0,0 +1,4 @@ + o Removed features: + - The option "TestingEstimatedDescriptorPropagationTime" is now marked as + obsolete. It has had no effect since 0.3.0.7, when clients stopped + rejecting consensuses "from the future". Closes ticket 32807. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index aad37204c..85369dfce 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -3256,7 +3256,6 @@ The following options are used for running a testing Tor network. TestingV3AuthInitialVoteDelay 20 seconds TestingV3AuthInitialDistDelay 20 seconds TestingAuthDirTimeToLearnReachability 0 minutes - TestingEstimatedDescriptorPropagationTime 0 minutes TestingServerDownloadInitialDelay 0 TestingClientDownloadInitialDelay 0 TestingServerConsensusDownloadInitialDelay 0 @@ -3292,11 +3291,6 @@ The following options are used for running a testing Tor network. are Running until this much time has passed. Changing this requires that **TestingTorNetwork** is set. (Default: 30 minutes) -[[TestingEstimatedDescriptorPropagationTime]] **TestingEstimatedDescriptorPropagationTime** __N__ **minutes**|**hours**:: - Clients try downloading server descriptors from directory caches after this - time. Changing this requires that **TestingTorNetwork** is set. (Default: - 10 minutes) - [[TestingMinFastFlagThreshold]] **TestingMinFastFlagThreshold** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**:: Minimum value for the Fast flag. Overrides the ordinary minimum taken from the consensus when TestingTorNetwork is set. (Default: 0.) diff --git a/src/app/config/config.c b/src/app/config/config.c index 680a7eeef..72ab065fb 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -451,7 +451,7 @@ static const config_var_t option_vars_[] = { V(EnforceDistinctSubnets, BOOL, "1"), V_D(EntryNodes, ROUTERSET, NULL), V(EntryStatistics, BOOL, "0"), - V(TestingEstimatedDescriptorPropagationTime, INTERVAL, "10 minutes"), + OBSOLETE("TestingEstimatedDescriptorPropagationTime"), V_D(ExcludeNodes, ROUTERSET, NULL), V_D(ExcludeExitNodes, ROUTERSET, NULL), OBSOLETE("ExcludeSingleHopRelays"), @@ -4123,7 +4123,6 @@ options_validate_cb(const void *old_options_, void *options_, char **msg) CHECK_DEFAULT(TestingV3AuthInitialDistDelay); CHECK_DEFAULT(TestingV3AuthVotingStartOffset); CHECK_DEFAULT(TestingAuthDirTimeToLearnReachability); - CHECK_DEFAULT(TestingEstimatedDescriptorPropagationTime); CHECK_DEFAULT(TestingServerDownloadInitialDelay); CHECK_DEFAULT(TestingClientDownloadInitialDelay); CHECK_DEFAULT(TestingServerConsensusDownloadInitialDelay); @@ -4151,12 +4150,6 @@ options_validate_cb(const void *old_options_, void *options_, char **msg) if (options_validate_dirauth_testing(old_options, options, msg) < 0) return -1; - if (options->TestingEstimatedDescriptorPropagationTime < 0) { - REJECT("TestingEstimatedDescriptorPropagationTime must be non-negative."); - } else if (options->TestingEstimatedDescriptorPropagationTime > 60*60) { - COMPLAIN("TestingEstimatedDescriptorPropagationTime is insanely high."); - } - if (options->TestingClientMaxIntervalWithoutRequest < 1) { REJECT("TestingClientMaxIntervalWithoutRequest is way too low."); } else if (options->TestingClientMaxIntervalWithoutRequest > 3600) { diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index e63ae2510..4915be187 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -723,11 +723,6 @@ struct or_options_t { * altered on testing networks. */ int TestingAuthDirTimeToLearnReachability; - /** Clients don't download any descriptor this recent, since it will - * probably not have propagated to enough caches. Only altered on testing - * networks. */ - int TestingEstimatedDescriptorPropagationTime; - /** Schedule for when servers should download things in general. Only * altered on testing networks. */ int TestingServerDownloadInitialDelay; diff --git a/src/app/config/testnet.inc b/src/app/config/testnet.inc index 0ed3c3862..f146a03cd 100644 --- a/src/app/config/testnet.inc +++ b/src/app/config/testnet.inc @@ -17,7 +17,6 @@ { "TestingV3AuthInitialVoteDelay", "20 seconds" }, { "TestingV3AuthInitialDistDelay", "20 seconds" }, { "TestingAuthDirTimeToLearnReachability", "0 minutes" }, -{ "TestingEstimatedDescriptorPropagationTime", "0 minutes" }, { "MinUptimeHidServDirectoryV2", "0 minutes" }, { "TestingServerDownloadInitialDelay", "0" }, { "TestingClientDownloadInitialDelay", "0" }, diff --git a/src/test/test_options.c b/src/test/test_options.c index e3b86c81a..b99ae7893 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -2001,7 +2001,6 @@ test_options_validate__testing(void *ignored) ENSURE_DEFAULT(TestingV3AuthInitialDistDelay, 3000); ENSURE_DEFAULT(TestingV3AuthVotingStartOffset, 3000); ENSURE_DEFAULT(TestingAuthDirTimeToLearnReachability, 3000); - ENSURE_DEFAULT(TestingEstimatedDescriptorPropagationTime, 3000); ENSURE_DEFAULT(TestingServerDownloadInitialDelay, 3000); ENSURE_DEFAULT(TestingClientDownloadInitialDelay, 3000); ENSURE_DEFAULT(TestingServerConsensusDownloadInitialDelay, 3000); @@ -3872,22 +3871,16 @@ test_options_validate__testing_options(void *ignored) TEST_TESTING_OPTION(TestingAuthDirTimeToLearnReachability, -1, 8000, "must be non-negative.", ENABLE_AUTHORITY_BRIDGE); - TEST_TESTING_OPTION(TestingEstimatedDescriptorPropagationTime, -1, 3601, - "must be non-negative.", ""); TEST_TESTING_OPTION(TestingClientMaxIntervalWithoutRequest, -1, 3601, "is way too low.", ""); TEST_TESTING_OPTION(TestingDirConnectionMaxStall, 1, 3601, "is way too low.", ""); - TEST_TESTING_OPTION(TestingEstimatedDescriptorPropagationTime, -1, 3601, - "must be non-negative.", ENABLE_AUTHORITY_V3); TEST_TESTING_OPTION(TestingClientMaxIntervalWithoutRequest, -1, 3601, "is way too low.", ENABLE_AUTHORITY_V3); TEST_TESTING_OPTION(TestingDirConnectionMaxStall, 1, 3601, "is way too low.", ENABLE_AUTHORITY_V3); - TEST_TESTING_OPTION(TestingEstimatedDescriptorPropagationTime, -1, 3601, - "must be non-negative.", ENABLE_AUTHORITY_BRIDGE); TEST_TESTING_OPTION(TestingClientMaxIntervalWithoutRequest, -1, 3601, "is way too low.", ENABLE_AUTHORITY_BRIDGE); TEST_TESTING_OPTION(TestingDirConnectionMaxStall, 1, 3601,

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1620'
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit 1f498220bda87e44d8a3ab12825270fde6eec7dc Merge: 48f734178 42e31b5c4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 6 13:28:10 2020 -0500 Merge remote-tracking branch 'tor-github/pr/1620' changes/ticket32807 | 4 ++++ doc/tor.1.txt | 6 ------ src/app/config/config.c | 9 +-------- src/app/config/or_options_st.h | 5 ----- src/app/config/testnet.inc | 1 - src/test/test_options.c | 7 ------- 6 files changed, 5 insertions(+), 27 deletions(-)

1 0

[tor/maint-0.4.2] Use CHECK_PRINTF() for printf-like functions in util_bug.h
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit 1b619a627ca1ee11d1680dc56e90e9fc1af2ddb5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 16 15:14:13 2019 -0500 Use CHECK_PRINTF() for printf-like functions in util_bug.h --- changes/ticket32765 | 4 ++++ src/lib/log/util_bug.h | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/ticket32765 b/changes/ticket32765 new file mode 100644 index 000000000..a9663a5df --- /dev/null +++ b/changes/ticket32765 @@ -0,0 +1,4 @@ + o Minor bugfixes (correctness checks): + - Use GCC/Clang's printf-checking feature to make sure that + tor_assertf() arguments are correctly typed. Fixes bug 32765; + bugfix on 0.4.1.1-alpha. diff --git a/src/lib/log/util_bug.h b/src/lib/log/util_bug.h index 546ae1e3e..993a4e3ab 100644 --- a/src/lib/log/util_bug.h +++ b/src/lib/log/util_bug.h @@ -242,10 +242,12 @@ void tor_assertion_failed_(const char *fname, unsigned int line, const char *func, const char *expr, - const char *fmt, ...); + const char *fmt, ...) + CHECK_PRINTF(5,6); void tor_bug_occurred_(const char *fname, unsigned int line, const char *func, const char *expr, - int once, const char *fmt, ...); + int once, const char *fmt, ...) + CHECK_PRINTF(6,7); void tor_abort_(void) ATTR_NORETURN;

1 0

[tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1612' into maint-0.4.2
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit 6da989cfe8323418ee1f888287d0d65b21b60c1d Merge: 2d8d6d1eb b4977d1aa Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 6 13:20:57 2020 -0500 Merge remote-tracking branch 'tor-github/pr/1612' into maint-0.4.2 changes/bug32771 | 4 ++++ changes/ticket32765 | 4 ++++ src/lib/confmgt/structvar.c | 4 ++-- src/lib/log/util_bug.h | 6 ++++-- 4 files changed, 14 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.4.2] Merge branch 'bug32765_041' into bug32771_042
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit df5c81fec0f25a684f1f7e68e80abcde5402d3ef Merge: bd11fb109 1b619a627 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 16 15:27:18 2019 -0500 Merge branch 'bug32765_041' into bug32771_042 changes/ticket32765 | 4 ++++ src/lib/log/util_bug.h | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.2] Fix formatting in tor_assertf() message in struct_check_magic().
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit b4977d1aa9366cdb1475664bcf1486fbfdf5a166 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 16 15:31:23 2019 -0500 Fix formatting in tor_assertf() message in struct_check_magic(). Closes 32771; bugfix on 0.4.2.1-alpha. --- changes/bug32771 | 4 ++++ src/lib/confmgt/structvar.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug32771 b/changes/bug32771 new file mode 100644 index 000000000..606bcf4be --- /dev/null +++ b/changes/bug32771 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging, crash): + - Avoid a possible crash when trying to log a (fatal) assertion failure + about mismatched magic numbers in configuration objects. Fixes bug 32771; + bugfix on 0.4.2.1-alpha. diff --git a/src/lib/confmgt/structvar.c b/src/lib/confmgt/structvar.c index de678d18c..7a3b8c7df 100644 --- a/src/lib/confmgt/structvar.c +++ b/src/lib/confmgt/structvar.c @@ -53,8 +53,8 @@ struct_check_magic(const void *object, const struct_magic_decl_t *decl) const uint32_t *ptr = STRUCT_VAR_P(object, decl->magic_offset); tor_assertf(*ptr == decl->magic_val, "Bad magic number on purported %s object. " - "Expected %"PRIu32"x but got "PRIu32"x.", - decl->magic_val, *ptr); + "Expected %"PRIu32"x but got %"PRIu32"x.", + decl->typename, decl->magic_val, *ptr); } /**

1 0

[tor/master] Use CHECK_PRINTF() for printf-like functions in util_bug.h
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit 1b619a627ca1ee11d1680dc56e90e9fc1af2ddb5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 16 15:14:13 2019 -0500 Use CHECK_PRINTF() for printf-like functions in util_bug.h --- changes/ticket32765 | 4 ++++ src/lib/log/util_bug.h | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/ticket32765 b/changes/ticket32765 new file mode 100644 index 000000000..a9663a5df --- /dev/null +++ b/changes/ticket32765 @@ -0,0 +1,4 @@ + o Minor bugfixes (correctness checks): + - Use GCC/Clang's printf-checking feature to make sure that + tor_assertf() arguments are correctly typed. Fixes bug 32765; + bugfix on 0.4.1.1-alpha. diff --git a/src/lib/log/util_bug.h b/src/lib/log/util_bug.h index 546ae1e3e..993a4e3ab 100644 --- a/src/lib/log/util_bug.h +++ b/src/lib/log/util_bug.h @@ -242,10 +242,12 @@ void tor_assertion_failed_(const char *fname, unsigned int line, const char *func, const char *expr, - const char *fmt, ...); + const char *fmt, ...) + CHECK_PRINTF(5,6); void tor_bug_occurred_(const char *fname, unsigned int line, const char *func, const char *expr, - int once, const char *fmt, ...); + int once, const char *fmt, ...) + CHECK_PRINTF(6,7); void tor_abort_(void) ATTR_NORETURN;

1 0