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

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/50'
by nickm＠torproject.org 14 Jul '20

14 Jul '20

commit a7226ca06e20356abb057c29416a9ad969c8d29d Merge: aba0ff4cb5 623af0155e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 14 14:50:30 2020 -0400 Merge remote-tracking branch 'tor-gitlab/mr/50' changes/bug33781 | 7 +++++++ src/lib/fs/files.c | 8 +++++--- src/test/test_util.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/merge-requests/48'
by ahf＠torproject.org 14 Jul '20

14 Jul '20

commit aba0ff4cb587e8771f360b516e2029aa6efcd547 Merge: c53c0e82b4 456be93956 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jul 14 16:07:36 2020 +0000 Merge remote-tracking branch 'tor-gitlab/merge-requests/48' .gitignore | 50 +++++++++++++-------------- changes/ticket40044 | 2 ++ configure.ac | 2 +- doc/include.am | 44 +++++++++++------------ doc/{ => man}/tor-gencert.1.txt | 0 doc/{ => man}/tor-print-ed-signing-cert.1.txt | 0 doc/{ => man}/tor-resolve.1.txt | 0 doc/{ => man}/tor.1.txt | 0 doc/{ => man}/torify.1.txt | 0 scripts/maint/checkOptionDocs.pl.in | 2 +- src/app/config/config.c | 2 +- src/app/config/testnet.inc | 2 +- src/lib/log/log.c | 2 +- 13 files changed, 54 insertions(+), 52 deletions(-)

1 0

[tor/master] doc: Move manpages into doc/man/
by ahf＠torproject.org 14 Jul '20

14 Jul '20

commit 456be93956d1f0acfa50dc3bc19ac6e2b9d2d77a Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jul 14 09:02:03 2020 -0400 doc: Move manpages into doc/man/ Closes #40044 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- .gitignore | 50 +++++++++++++-------------- changes/ticket40044 | 2 ++ configure.ac | 2 +- doc/include.am | 44 +++++++++++------------ doc/{ => man}/tor-gencert.1.txt | 0 doc/{ => man}/tor-print-ed-signing-cert.1.txt | 0 doc/{ => man}/tor-resolve.1.txt | 0 doc/{ => man}/tor.1.txt | 0 doc/{ => man}/torify.1.txt | 0 scripts/maint/checkOptionDocs.pl.in | 2 +- src/app/config/config.c | 2 +- src/app/config/testnet.inc | 2 +- src/lib/log/log.c | 2 +- 13 files changed, 54 insertions(+), 52 deletions(-) diff --git a/.gitignore b/.gitignore index 97b145590e..aa39162cad 100644 --- a/.gitignore +++ b/.gitignore @@ -97,31 +97,31 @@ uptime-*.json /doc/Makefile /doc/Makefile.in /doc/doxygen -/doc/tor.1 -/doc/tor.1.in -/doc/tor.html -/doc/tor.html.in -/doc/tor.1.xml -/doc/tor-gencert.1 -/doc/tor-gencert.1.in -/doc/tor-gencert.html -/doc/tor-gencert.html.in -/doc/tor-gencert.1.xml -/doc/tor-resolve.1 -/doc/tor-resolve.1.in -/doc/tor-resolve.html -/doc/tor-resolve.html.in -/doc/tor-resolve.1.xml -/doc/torify.1 -/doc/torify.1.in -/doc/torify.html -/doc/torify.html.in -/doc/torify.1.xml -/doc/tor-print-ed-signing-cert.1 -/doc/tor-print-ed-signing-cert.1.in -/doc/tor-print-ed-signing-cert.html -/doc/tor-print-ed-signing-cert.html.in -/doc/tor-print-ed-signing-cert.1.xml +/doc/man/tor.1 +/doc/man/tor.1.in +/doc/man/tor.html +/doc/man/tor.html.in +/doc/man/tor.1.xml +/doc/man/tor-gencert.1 +/doc/man/tor-gencert.1.in +/doc/man/tor-gencert.html +/doc/man/tor-gencert.html.in +/doc/man/tor-gencert.1.xml +/doc/man/tor-resolve.1 +/doc/man/tor-resolve.1.in +/doc/man/tor-resolve.html +/doc/man/tor-resolve.html.in +/doc/man/tor-resolve.1.xml +/doc/man/torify.1 +/doc/man/torify.1.in +/doc/man/torify.html +/doc/man/torify.html.in +/doc/man/torify.1.xml +/doc/man/tor-print-ed-signing-cert.1 +/doc/man/tor-print-ed-signing-cert.1.in +/doc/man/tor-print-ed-signing-cert.html +/doc/man/tor-print-ed-signing-cert.html.in +/doc/man/tor-print-ed-signing-cert.1.xml # /doc/spec/ /doc/spec/Makefile diff --git a/changes/ticket40044 b/changes/ticket40044 new file mode 100644 index 0000000000..8bd6d04e0a --- /dev/null +++ b/changes/ticket40044 @@ -0,0 +1,2 @@ + o Documentation (manpages): + - Move them from doc/ to doc/man/. Closes ticket 40044. diff --git a/configure.ac b/configure.ac index 75fd709f9b..3076f2f1ff 100644 --- a/configure.ac +++ b/configure.ac @@ -2611,7 +2611,7 @@ AC_CONFIG_FILES([ ]) if test "x$asciidoc" = "xtrue" && test "$ASCIIDOC" = "none"; then - regular_mans="doc/tor doc/tor-gencert doc/tor-resolve doc/torify" + regular_mans="doc/man/tor doc/man/tor-gencert doc/man/tor-resolve doc/man/torify" for file in $regular_mans ; do if ! [[ -f "$srcdir/$file.1.in" ]] || ! [[ -f "$srcdir/$file.html.in" ]] ; then echo "=================================="; diff --git a/doc/include.am b/doc/include.am index 5e0c90b0cd..d3e757f3bb 100644 --- a/doc/include.am +++ b/doc/include.am @@ -12,7 +12,7 @@ # part of the source distribution, so that people without asciidoc can # just use the .1 and .html files. -all_mans = doc/tor doc/tor-gencert doc/tor-resolve doc/torify doc/tor-print-ed-signing-cert +all_mans = doc/man/tor doc/man/tor-gencert doc/man/tor-resolve doc/man/torify doc/man/tor-print-ed-signing-cert if USE_ASCIIDOC txt_in = $(all_mans:=.1.txt) @@ -76,17 +76,17 @@ $(html_in) : $(man_in) : $(AM_V_GEN)$(top_srcdir)/doc/asciidoc-helper.sh man @A2X@ $(top_srcdir)/$@ -doc/tor.1.in: doc/tor.1.txt -doc/torify.1.in: doc/torify.1.txt -doc/tor-gencert.1.in: doc/tor-gencert.1.txt -doc/tor-resolve.1.in: doc/tor-resolve.1.txt -doc/tor-print-ed-signing-cert.1.in: doc/tor-print-ed-signing-cert.1.txt +doc/man/tor.1.in: doc/man/tor.1.txt +doc/man/torify.1.in: doc/man/torify.1.txt +doc/man/tor-gencert.1.in: doc/man/tor-gencert.1.txt +doc/man/tor-resolve.1.in: doc/man/tor-resolve.1.txt +doc/man/tor-print-ed-signing-cert.1.in: doc/man/tor-print-ed-signing-cert.1.txt -doc/tor.html.in: doc/tor.1.txt -doc/torify.html.in: doc/torify.1.txt -doc/tor-gencert.html.in: doc/tor-gencert.1.txt -doc/tor-resolve.html.in: doc/tor-resolve.1.txt -doc/tor-print-ed-signing-cert.html.in: doc/tor-print-ed-signing-cert.1.txt +doc/man/tor.html.in: doc/man/tor.1.txt +doc/man/torify.html.in: doc/man/torify.1.txt +doc/man/tor-gencert.html.in: doc/man/tor-gencert.1.txt +doc/man/tor-resolve.html.in: doc/man/tor-resolve.1.txt +doc/man/tor-print-ed-signing-cert.html.in: doc/man/tor-print-ed-signing-cert.1.txt # use config.status to swap all machine-specific magic strings # in the asciidoc with their replacements. @@ -97,17 +97,17 @@ $(asciidoc_product) : fi $(AM_V_at)$(top_builddir)/config.status -q --file=$@; -doc/tor.html: doc/tor.html.in -doc/tor-gencert.html: doc/tor-gencert.html.in -doc/tor-resolve.html: doc/tor-resolve.html.in -doc/tor-print-ed-signing-cert.html: doc/tor-print-ed-signing-cert.html.in -doc/torify.html: doc/torify.html.in - -doc/tor.1: doc/tor.1.in -doc/tor-gencert.1: doc/tor-gencert.1.in -doc/tor-resolve.1: doc/tor-resolve.1.in -doc/tor-print-ed-signing-cert.1: doc/tor-print-ed-signing-cert.1.in -doc/torify.1: doc/torify.1.in +doc/man/tor.html: doc/man/tor.html.in +doc/man/tor-gencert.html: doc/man/tor-gencert.html.in +doc/man/tor-resolve.html: doc/man/tor-resolve.html.in +doc/man/tor-print-ed-signing-cert.html: doc/man/tor-print-ed-signing-cert.html.in +doc/man/torify.html: doc/man/torify.html.in + +doc/man/tor.1: doc/man/tor.1.in +doc/man/tor-gencert.1: doc/man/tor-gencert.1.in +doc/man/tor-resolve.1: doc/man/tor-resolve.1.in +doc/man/tor-print-ed-signing-cert.1: doc/man/tor-print-ed-signing-cert.1.in +doc/man/torify.1: doc/man/torify.1.in CLEANFILES+= $(asciidoc_product) DISTCLEANFILES+= $(html_in) $(man_in) diff --git a/doc/tor-gencert.1.txt b/doc/man/tor-gencert.1.txt similarity index 100% rename from doc/tor-gencert.1.txt rename to doc/man/tor-gencert.1.txt diff --git a/doc/tor-print-ed-signing-cert.1.txt b/doc/man/tor-print-ed-signing-cert.1.txt similarity index 100% rename from doc/tor-print-ed-signing-cert.1.txt rename to doc/man/tor-print-ed-signing-cert.1.txt diff --git a/doc/tor-resolve.1.txt b/doc/man/tor-resolve.1.txt similarity index 100% rename from doc/tor-resolve.1.txt rename to doc/man/tor-resolve.1.txt diff --git a/doc/tor.1.txt b/doc/man/tor.1.txt similarity index 100% rename from doc/tor.1.txt rename to doc/man/tor.1.txt diff --git a/doc/torify.1.txt b/doc/man/torify.1.txt similarity index 100% rename from doc/torify.1.txt rename to doc/man/torify.1.txt diff --git a/scripts/maint/checkOptionDocs.pl.in b/scripts/maint/checkOptionDocs.pl.in index 6533c762c5..bb8008c2e8 100644 --- a/scripts/maint/checkOptionDocs.pl.in +++ b/scripts/maint/checkOptionDocs.pl.in @@ -39,7 +39,7 @@ loadTorrc("@abs_top_srcdir@/src/config/torrc.sample.in", \%torrcSampleOptions); # Try to figure out what's in the man page. my $considerNextLine = 0; -open(F, "@abs_top_srcdir@/doc/tor.1.txt") or die; +open(F, "@abs_top_srcdir@/doc/man/tor.1.txt") or die; while (<F>) { if (m!^(?:\[\[([A-za-z0-9_]+)\]\] *)?\*\*([A-Za-z0-9_]+)\*\*!) { $manPageOptions{$2} = 1; diff --git a/src/app/config/config.c b/src/app/config/config.c index 10f09d7d98..f4172bd84e 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -27,7 +27,7 @@ * <li>The option_vars_ array below in this module, which configures * the names of the torrc options, their types, their multiplicities, * and their mappings to fields in or_options_t. - * <li>The manual in doc/tor.1.txt, to document what the new option + * <li>The manual in doc/man/tor.1.txt, to document what the new option * is, and how it works. * </ul> * diff --git a/src/app/config/testnet.inc b/src/app/config/testnet.inc index 605943d80b..00b307782b 100644 --- a/src/app/config/testnet.inc +++ b/src/app/config/testnet.inc @@ -1,5 +1,5 @@ // When modifying, don't forget to update the defaults -// for 'TestingTorNetwork' in 'doc/tor.1.txt' +// for 'TestingTorNetwork' in 'doc/man/tor.1.txt' { "DirAllowPrivateAddresses", "1" }, { "EnforceDistinctSubnets", "0" }, { "AuthDirMaxServersPerAddr", "0" }, diff --git a/src/lib/log/log.c b/src/lib/log/log.c index 9ee87c0668..cd848fdd73 100644 --- a/src/lib/log/log.c +++ b/src/lib/log/log.c @@ -1308,7 +1308,7 @@ log_level_to_string(int level) /** NULL-terminated array of names for log domains such that domain_list[dom] * is a description of dom. * - * Remember to update doc/tor.1.txt if you modify this list. + * Remember to update doc/man/tor.1.txt if you modify this list. * */ static const char *domain_list[] = { "GENERAL", "CRYPTO", "NET", "CONFIG", "FS", "PROTOCOL", "MM",

1 0

[tor/master] node: Standardize interface of format_node_description()
by dgoulet＠torproject.org 14 Jul '20

14 Jul '20

commit 06ccf12258b4ed480cf387f0291e26d41ff4450a Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jul 14 10:43:49 2020 -0400 node: Standardize interface of format_node_description() Pass the IPv4 before the IPv6 like all our other interfaces. Changes unreleased code related to #40043. Closes #40045 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/feature/nodelist/describe.c | 20 ++++++++++---------- src/feature/nodelist/describe.h | 4 ++-- src/test/test_nodelist.c | 16 ++++++++-------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/feature/nodelist/describe.c b/src/feature/nodelist/describe.c index 81a6ef2323..96604800e9 100644 --- a/src/feature/nodelist/describe.c +++ b/src/feature/nodelist/describe.c @@ -36,8 +36,8 @@ STATIC const char * format_node_description(char *buf, const char *id_digest, const char *nickname, - const tor_addr_t *ipv6_addr, - const tor_addr_t *ipv4_addr) + const tor_addr_t *ipv4_addr, + const tor_addr_t *ipv6_addr) { size_t rv = 0; bool has_ipv6 = ipv6_addr && !tor_addr_is_null(ipv6_addr); @@ -129,8 +129,8 @@ router_describe(const routerinfo_t *ri) return format_node_description(buf, ri->cache_info.identity_digest, ri->nickname, - &ri->ipv6_addr, - &ri->ipv4_addr); + &ri->ipv4_addr, + &ri->ipv6_addr); } /** Return a human-readable description of the node_t node. @@ -169,8 +169,8 @@ node_describe(const node_t *node) return format_node_description(buf, node->identity, nickname, - ipv6_addr, - ipv4_addr); + ipv4_addr, + ipv6_addr); } /** Return a human-readable description of the routerstatus_t rs. @@ -189,8 +189,8 @@ routerstatus_describe(const routerstatus_t *rs) return format_node_description(buf, rs->identity_digest, rs->nickname, - &rs->ipv6_addr, - &rs->ipv4_addr); + &rs->ipv4_addr, + &rs->ipv6_addr); } /** Return a human-readable description of the extend_info_t ei. @@ -214,8 +214,8 @@ extend_info_describe(const extend_info_t *ei) return format_node_description(buf, ei->identity_digest, ei->nickname, - addr6, - addr4); + addr4, + addr6); } /** Set buf (which must have MAX_VERBOSE_NICKNAME_LEN+1 bytes) to the diff --git a/src/feature/nodelist/describe.h b/src/feature/nodelist/describe.h index 1a2b757943..62f6c693e2 100644 --- a/src/feature/nodelist/describe.h +++ b/src/feature/nodelist/describe.h @@ -49,8 +49,8 @@ void router_get_verbose_nickname(char *buf, const routerinfo_t *router); STATIC const char *format_node_description(char *buf, const char *id_digest, const char *nickname, - const tor_addr_t *ipv6_addr, - const tor_addr_t *ipv4_addr); + const tor_addr_t *ipv4_addr, + const tor_addr_t *ipv6_addr); #endif /* defined(TOR_UNIT_TESTS) */ diff --git a/src/test/test_nodelist.c b/src/test/test_nodelist.c index ab7bc030a6..c165eebb63 100644 --- a/src/test/test_nodelist.c +++ b/src/test/test_nodelist.c @@ -703,8 +703,8 @@ test_nodelist_format_node_description(void *arg) rv = format_node_description(ndesc, mock_digest, mock_nickname, - &mock_null_ip, - NULL); + NULL, + &mock_null_ip); tt_ptr_op(rv, OP_EQ, ndesc); tt_str_op(ndesc, OP_EQ, "$AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA~TestOR7890123456789"); @@ -722,8 +722,8 @@ test_nodelist_format_node_description(void *arg) rv = format_node_description(ndesc, mock_digest, mock_nickname, - &mock_ipv6, - NULL); + NULL, + &mock_ipv6); tt_ptr_op(rv, OP_EQ, ndesc); tt_str_op(ndesc, OP_EQ, "$AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA~TestOR7890123456789 at " @@ -732,18 +732,18 @@ test_nodelist_format_node_description(void *arg) rv = format_node_description(ndesc, mock_digest, mock_nickname, - &mock_ipv6, - &mock_ipv4); + &mock_ipv4, + &mock_ipv6); tt_ptr_op(rv, OP_EQ, ndesc); tt_str_op(ndesc, OP_EQ, "$AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA~TestOR7890123456789 at " "111.222.233.244 and [1111:2222:3333:4444:5555:6666:7777:8888]"); /* test NULL handling */ - rv = format_node_description(NULL, NULL, NULL, NULL, 0); + rv = format_node_description(NULL, NULL, NULL, NULL, NULL); tt_str_op(rv, OP_EQ, "<NULL BUFFER>"); - rv = format_node_description(ndesc, NULL, NULL, NULL, 0); + rv = format_node_description(ndesc, NULL, NULL, NULL, NULL); tt_ptr_op(rv, OP_EQ, ndesc); tt_str_op(rv, OP_EQ, "<NULL ID DIGEST>");

1 0

[tor/master] Merge branch 'tor-gitlab/mr/49'
by dgoulet＠torproject.org 14 Jul '20

14 Jul '20

commit c53c0e82b4d2ff1df895f16f37a06d1c391fdaeb Merge: 2b33e8037e 06ccf12258 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jul 14 11:35:05 2020 -0400 Merge branch 'tor-gitlab/mr/49' src/feature/nodelist/describe.c | 20 ++++++++++---------- src/feature/nodelist/describe.h | 4 ++-- src/test/test_nodelist.c | 16 ++++++++-------- 3 files changed, 20 insertions(+), 20 deletions(-)

1 0

[tor/master] Rename blacklist and whitelist wording
by nickm＠torproject.org 14 Jul '20

14 Jul '20

commit 268d01ada5f4a11c5d8e63215288eb593dbfb9ed Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Jul 10 10:03:06 2020 -0400 Rename blacklist and whitelist wording Closes #40033 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/app/config/fallback_dirs.inc | 6 +++--- src/core/or/circuitbuild.c | 22 +++++++++++----------- src/core/or/connection_or.c | 2 +- src/feature/client/entrynodes.c | 4 ++-- src/feature/dirparse/ns_parse.c | 4 ++-- src/feature/hs/hs_service.c | 2 +- src/feature/nodelist/authcert.c | 2 +- src/feature/nodelist/authcert.h | 2 +- src/feature/nodelist/networkstatus.c | 4 ++-- src/lib/sandbox/sandbox.c | 2 +- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/app/config/fallback_dirs.inc b/src/app/config/fallback_dirs.inc index 793f65ce88..ba7e848715 100644 --- a/src/app/config/fallback_dirs.inc +++ b/src/app/config/fallback_dirs.inc @@ -3,10 +3,10 @@ /* timestamp=20190625114911 */ /* timestamp0=20190625114911 */ /* timestamp1=20190628085927 */ -/* source=whitelist */ +/* source=allowlist */ /* ===== */ -/* 0: Whitelist excluded 1550 of 1711 candidates. */ -/* 1: Whitelist excluded 1601 of 1765 candidates. */ +/* 0: Allowlist excluded 1550 of 1711 candidates. */ +/* 1: Allowlist excluded 1601 of 1765 candidates. */ /* Checked IPv4 DirPorts served a consensus within 15.0s. */ /* 0: diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c index cef70e3e76..db8c5b3113 100644 --- a/src/core/or/circuitbuild.c +++ b/src/core/or/circuitbuild.c @@ -1771,7 +1771,7 @@ pick_restricted_middle_node(router_crn_flags_t flags, { const node_t *middle_node = NULL; - smartlist_t *whitelisted_live_middles = smartlist_new(); + smartlist_t *allowlisted_live_middles = smartlist_new(); smartlist_t *all_live_nodes = smartlist_new(); tor_assert(pick_from); @@ -1779,21 +1779,21 @@ pick_restricted_middle_node(router_crn_flags_t flags, /* Add all running nodes to all_live_nodes */ router_add_running_nodes_to_smartlist(all_live_nodes, flags); - /* Filter all_live_nodes to only add live *and* whitelisted middles - * to the list whitelisted_live_middles. */ + /* Filter all_live_nodes to only add live *and* allowlisted middles + * to the list allowlisted_live_middles. */ SMARTLIST_FOREACH_BEGIN(all_live_nodes, node_t *, live_node) { if (routerset_contains_node(pick_from, live_node)) { - smartlist_add(whitelisted_live_middles, live_node); + smartlist_add(allowlisted_live_middles, live_node); } } SMARTLIST_FOREACH_END(live_node); /* Honor ExcludeNodes */ if (exclude_set) { - routerset_subtract_nodes(whitelisted_live_middles, exclude_set); + routerset_subtract_nodes(allowlisted_live_middles, exclude_set); } if (exclude_list) { - smartlist_subtract(whitelisted_live_middles, exclude_list); + smartlist_subtract(allowlisted_live_middles, exclude_list); } /** @@ -1809,9 +1809,9 @@ pick_restricted_middle_node(router_crn_flags_t flags, * If there are a lot of nodes in here, assume they did not load balance * and do it for them, but also warn them that they may be Doing It Wrong. */ - if (smartlist_len(whitelisted_live_middles) <= + if (smartlist_len(allowlisted_live_middles) <= MAX_SANE_RESTRICTED_NODES) { - middle_node = smartlist_choose(whitelisted_live_middles); + middle_node = smartlist_choose(allowlisted_live_middles); } else { static ratelim_t pinned_notice_limit = RATELIM_INIT(24*3600); log_fn_ratelim(&pinned_notice_limit, LOG_NOTICE, LD_CIRC, @@ -1819,17 +1819,17 @@ pick_restricted_middle_node(router_crn_flags_t flags, "in %d total nodes. This is a lot of nodes. " "You may want to consider using a Tor controller " "to select and update a smaller set of nodes instead.", - position_hint, smartlist_len(whitelisted_live_middles)); + position_hint, smartlist_len(allowlisted_live_middles)); /* NO_WEIGHTING here just means don't take node flags into account * (ie: use consensus measurement only). This is done so that * we don't further surprise the user by not using Exits that they * specified at all */ - middle_node = node_sl_choose_by_bandwidth(whitelisted_live_middles, + middle_node = node_sl_choose_by_bandwidth(allowlisted_live_middles, NO_WEIGHTING); } - smartlist_free(whitelisted_live_middles); + smartlist_free(allowlisted_live_middles); smartlist_free(all_live_nodes); return middle_node; diff --git a/src/core/or/connection_or.c b/src/core/or/connection_or.c index b88d1b6afb..8865f7246c 100644 --- a/src/core/or/connection_or.c +++ b/src/core/or/connection_or.c @@ -1160,7 +1160,7 @@ static time_t or_connect_failure_map_next_cleanup_ts = 0; * port. * * We need to identify a connection failure with these three values because we - * want to avoid to wrongfully blacklist a relay if someone is trying to + * want to avoid to wrongfully block a relay if someone is trying to * extend to a known identity digest but with the wrong IP/port. For instance, * it can happen if a relay changed its port but the client still has an old * descriptor with the old port. We want to stop connecting to that diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c index 6e8259142d..9b20684bf7 100644 --- a/src/feature/client/entrynodes.c +++ b/src/feature/client/entrynodes.c @@ -1576,12 +1576,12 @@ guard_create_exit_restriction(const uint8_t *exit_id) } /** If we have fewer than this many possible usable guards, don't set - * MD-availability-based restrictions: we might blacklist all of them. */ + * MD-availability-based restrictions: we might denylist all of them. */ #define MIN_GUARDS_FOR_MD_RESTRICTION 10 /** Return true if we should set md dirserver restrictions. We might not want * to set those if our guard options are too restricted, since we don't want - * to blacklist all of them. */ + * to denylist all of them. */ static int should_set_md_dirserver_restriction(void) { diff --git a/src/feature/dirparse/ns_parse.c b/src/feature/dirparse/ns_parse.c index ac9325a608..f89c1b91cf 100644 --- a/src/feature/dirparse/ns_parse.c +++ b/src/feature/dirparse/ns_parse.c @@ -1354,8 +1354,8 @@ networkstatus_parse_vote_from_string(const char *s, goto err; } if (ns->type != NS_TYPE_CONSENSUS) { - if (authority_cert_is_blacklisted(ns->cert)) { - log_warn(LD_DIR, "Rejecting vote signature made with blacklisted " + if (authority_cert_is_denylisted(ns->cert)) { + log_warn(LD_DIR, "Rejecting vote signature made with denylisted " "signing key %s", hex_str(ns->cert->signing_key_digest, DIGEST_LEN)); goto err; diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c index 995c1ca78b..b56b7f4368 100644 --- a/src/feature/hs/hs_service.c +++ b/src/feature/hs/hs_service.c @@ -3904,7 +3904,7 @@ hs_service_exports_circuit_id(const ed25519_public_key_t *pk) /** Add to file_list every filename used by a configured hidden service, and to * dir_list every directory path used by a configured hidden service. This is - * used by the sandbox subsystem to whitelist those. */ + * used by the sandbox subsystem to allowlist those. */ void hs_service_lists_fnames_for_sandbox(smartlist_t *file_list, smartlist_t *dir_list) diff --git a/src/feature/nodelist/authcert.c b/src/feature/nodelist/authcert.c index 97e44d53e3..8ca22f818e 100644 --- a/src/feature/nodelist/authcert.c +++ b/src/feature/nodelist/authcert.c @@ -745,7 +745,7 @@ static const char *BAD_SIGNING_KEYS[] = { * which, because of the old openssl heartbleed vulnerability, should * never be trusted. */ int -authority_cert_is_blacklisted(const authority_cert_t *cert) +authority_cert_is_denylisted(const authority_cert_t *cert) { char hex_digest[HEX_DIGEST_LEN+1]; int i; diff --git a/src/feature/nodelist/authcert.h b/src/feature/nodelist/authcert.h index 33065589ba..4c3d79ceed 100644 --- a/src/feature/nodelist/authcert.h +++ b/src/feature/nodelist/authcert.h @@ -41,7 +41,7 @@ void authority_cert_dl_failed(const char *id_digest, void authority_certs_fetch_missing(networkstatus_t *status, time_t now, const char *dir_hint); int authority_cert_dl_looks_uncertain(const char *id_digest); -int authority_cert_is_blacklisted(const authority_cert_t *cert); +int authority_cert_is_denylisted(const authority_cert_t *cert); void authority_cert_free_(authority_cert_t *cert); #define authority_cert_free(cert) \ diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index f63d598ef7..dfff1f704b 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -471,8 +471,8 @@ networkstatus_check_document_signature(const networkstatus_t *consensus, DIGEST_LEN)) return -1; - if (authority_cert_is_blacklisted(cert)) { - /* We implement blacklisting for authority signing keys by treating + if (authority_cert_is_denylisted(cert)) { + /* We implement denylisting for authority signing keys by treating * all their signatures as always bad. That way we don't get into * crazy loops of dropping and re-fetching signatures. */ log_warn(LD_DIR, "Ignoring a consensus signature made with deprecated" diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c index 2b4181e7f8..820e4fd1a5 100644 --- a/src/lib/sandbox/sandbox.c +++ b/src/lib/sandbox/sandbox.c @@ -935,7 +935,7 @@ sb_epoll_ctl(scmp_filter_ctx ctx, sandbox_cfg_t *filter) * the seccomp filter sandbox. * * NOTE: if multiple filters need to be added, the PR_SECCOMP parameter needs - * to be whitelisted in this function. + * to be allowlisted in this function. */ static int sb_prctl(scmp_filter_ctx ctx, sandbox_cfg_t *filter)

1 0

[tor/master] Merge branch 'ticket40033_045_01_squashed'
by nickm＠torproject.org 14 Jul '20

14 Jul '20

commit 2b33e8037e7ae5e947ce3186a06c90478de6c7e2 Merge: 1d554e4baf 268d01ada5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 14 10:59:30 2020 -0400 Merge branch 'ticket40033_045_01_squashed' src/app/config/fallback_dirs.inc | 6 +++--- src/core/or/circuitbuild.c | 22 +++++++++++----------- src/core/or/connection_or.c | 2 +- src/feature/client/entrynodes.c | 4 ++-- src/feature/dirparse/ns_parse.c | 4 ++-- src/feature/hs/hs_service.c | 2 +- src/feature/nodelist/authcert.c | 2 +- src/feature/nodelist/authcert.h | 2 +- src/feature/nodelist/networkstatus.c | 4 ++-- src/lib/sandbox/sandbox.c | 2 +- 10 files changed, 25 insertions(+), 25 deletions(-)

1 0

[tor/maint-0.4.4] Merge remote-tracking branch 'tor-gitlab/merge-requests/43' into maint-0.4.4
by ahf＠torproject.org 14 Jul '20

14 Jul '20

commit 07f3345e11530b14c719f8a776f15b943d2fef91 Merge: 515d4f1e93 40eb6b19a3 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jul 14 14:47:48 2020 +0000 Merge remote-tracking branch 'tor-gitlab/merge-requests/43' into maint-0.4.4 changes/ticket40035 | 5 +++++ src/lib/tls/tortls_nss.c | 10 ++++++++++ 2 files changed, 15 insertions(+)

1 0

[tor/master] NSS: Tell NSS that our SSL sockets are nonblocking.
by ahf＠torproject.org 14 Jul '20

14 Jul '20

commit 40eb6b19a33f1261168e5d64ba162d6f7d80e5a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 10 13:14:33 2020 -0400 NSS: Tell NSS that our SSL sockets are nonblocking. Closes ticket 40035. --- changes/ticket40035 | 5 +++++ src/lib/tls/tortls_nss.c | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/changes/ticket40035 b/changes/ticket40035 new file mode 100644 index 0000000000..8cdd447199 --- /dev/null +++ b/changes/ticket40035 @@ -0,0 +1,5 @@ + o Major bugfixes (NSS): + - When running with NSS enabled, make sure that NSS knows to expect + nonblocking sockets. Previously, we set our TCP sockets as blocking, + but did not tell NSS about the fact, which in turn could lead to + unexpected blocking behavior. Fixes bug 40035; bugfix on 0.3.5.1-alpha. diff --git a/src/lib/tls/tortls_nss.c b/src/lib/tls/tortls_nss.c index 1436442e1c..6f6c47674e 100644 --- a/src/lib/tls/tortls_nss.c +++ b/src/lib/tls/tortls_nss.c @@ -418,6 +418,16 @@ tor_tls_new(tor_socket_t sock, int is_server) return NULL; } + /* even if though the socket is already nonblocking, we need to tell NSS + * about the fact, so that it knows what to do when it says EAGAIN. */ + PRSocketOptionData data; + data.option = PR_SockOpt_Nonblocking; + data.value.non_blocking = 1; + if (PR_SetSocketOption(ssl, &data) != PR_SUCCESS) { + PR_Close(ssl); + return NULL; + } + tor_tls_t *tls = tor_malloc_zero(sizeof(tor_tls_t)); tls->magic = TOR_TLS_MAGIC; tls->context = ctx;

1 0

[tor/maint-0.4.4] NSS: Tell NSS that our SSL sockets are nonblocking.
by ahf＠torproject.org 14 Jul '20

14 Jul '20

commit 40eb6b19a33f1261168e5d64ba162d6f7d80e5a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 10 13:14:33 2020 -0400 NSS: Tell NSS that our SSL sockets are nonblocking. Closes ticket 40035. --- changes/ticket40035 | 5 +++++ src/lib/tls/tortls_nss.c | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/changes/ticket40035 b/changes/ticket40035 new file mode 100644 index 0000000000..8cdd447199 --- /dev/null +++ b/changes/ticket40035 @@ -0,0 +1,5 @@ + o Major bugfixes (NSS): + - When running with NSS enabled, make sure that NSS knows to expect + nonblocking sockets. Previously, we set our TCP sockets as blocking, + but did not tell NSS about the fact, which in turn could lead to + unexpected blocking behavior. Fixes bug 40035; bugfix on 0.3.5.1-alpha. diff --git a/src/lib/tls/tortls_nss.c b/src/lib/tls/tortls_nss.c index 1436442e1c..6f6c47674e 100644 --- a/src/lib/tls/tortls_nss.c +++ b/src/lib/tls/tortls_nss.c @@ -418,6 +418,16 @@ tor_tls_new(tor_socket_t sock, int is_server) return NULL; } + /* even if though the socket is already nonblocking, we need to tell NSS + * about the fact, so that it knows what to do when it says EAGAIN. */ + PRSocketOptionData data; + data.option = PR_SockOpt_Nonblocking; + data.value.non_blocking = 1; + if (PR_SetSocketOption(ssl, &data) != PR_SUCCESS) { + PR_Close(ssl); + return NULL; + } + tor_tls_t *tls = tor_malloc_zero(sizeof(tor_tls_t)); tls->magic = TOR_TLS_MAGIC; tls->context = ctx;

1 0