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

[tor/master] Stub more functions in dirvote headers to fix more of 31552.
by asn＠torproject.org 16 Sep '19

16 Sep '19

commit fb0e8966f00c4349602594f312dae60cad2ea11d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 29 11:18:42 2019 -0400 Stub more functions in dirvote headers to fix more of 31552. --- src/feature/dirauth/keypin.h | 18 ++++++++-- src/feature/dirauth/process_descs.h | 69 ++++++++++++++++++++++++++++++++----- src/feature/dirauth/reachability.h | 19 +++++++--- 3 files changed, 92 insertions(+), 14 deletions(-) diff --git a/src/feature/dirauth/keypin.h b/src/feature/dirauth/keypin.h index 722b6ca5f..ab2362b3f 100644 --- a/src/feature/dirauth/keypin.h +++ b/src/feature/dirauth/keypin.h @@ -11,10 +11,25 @@ int keypin_check_and_add(const uint8_t *rsa_id_digest, const int replace_existing_entry); int keypin_check(const uint8_t *rsa_id_digest, const uint8_t *ed25519_id_key); +int keypin_close_journal(void); +#ifdef HAVE_MODULE_DIRAUTH int keypin_open_journal(const char *fname); -int keypin_close_journal(void); int keypin_load_journal(const char *fname); +#else +static inline int +keypin_open_journal(const char *fname) +{ + (void)fname; + return 0; +} +static inline int +keypin_load_journal(const char *fname) +{ + (void)fname; + return 0; +} +#endif void keypin_clear(void); int keypin_check_lone_rsa(const uint8_t *rsa_id_digest); @@ -44,4 +59,3 @@ MOCK_DECL(STATIC void, keypin_add_entry_to_map, (keypin_ent_t *ent)); #endif /* defined(KEYPIN_PRIVATE) */ #endif /* !defined(TOR_KEYPIN_H) */ - diff --git a/src/feature/dirauth/process_descs.h b/src/feature/dirauth/process_descs.h index 0da47c96c..a8a1dcca1 100644 --- a/src/feature/dirauth/process_descs.h +++ b/src/feature/dirauth/process_descs.h @@ -12,10 +12,13 @@ #ifndef TOR_RECV_UPLOADS_H #define TOR_RECV_UPLOADS_H -int dirserv_load_fingerprint_file(void); +// for was_router_added_t. +#include "feature/nodelist/routerlist.h" + void dirserv_free_fingerprint_list(void); -int dirserv_add_own_fingerprint(crypto_pk_t *pk); +#ifdef HAVE_MODULE_DIRAUTH +int dirserv_load_fingerprint_file(void); enum was_router_added_t dirserv_add_multiple_descriptors( const char *desc, size_t desclen, uint8_t purpose, @@ -25,19 +28,46 @@ enum was_router_added_t dirserv_add_descriptor(routerinfo_t *ri, const char **msg, const char *source); +int dirserv_would_reject_router(const routerstatus_t *rs); +int authdir_wants_to_reject_router(routerinfo_t *ri, const char **msg, + int complain, + int *valid_out); +int dirserv_add_own_fingerprint(crypto_pk_t *pk); uint32_t dirserv_router_get_status(const routerinfo_t *router, const char **msg, int severity); void dirserv_set_node_flags_from_authoritative_status(node_t *node, uint32_t authstatus); - -#ifdef HAVE_MODULE_DIRAUTH -int dirserv_would_reject_router(const routerstatus_t *rs); -int authdir_wants_to_reject_router(routerinfo_t *ri, const char **msg, - int complain, - int *valid_out); #else static inline int +dirserv_load_fingerprint_file(void) +{ + return 0; +} +static inline enum was_router_added_t +dirserv_add_multiple_descriptors(const char *desc, size_t desclen, + uint8_t purpose, + const char *source, + const char **msg) +{ + (void)desc; + (void)desclen; + (void)purpose; + (void)source; + (void)msg; + return (enum was_router_added_t)0; +} +static inline enum was_router_added_t +dirserv_add_descriptor(routerinfo_t *ri, + const char **msg, + const char *source) +{ + (void)ri; + (void)msg; + (void)source; + return (enum was_router_added_t)0; +} +static inline int dirserv_would_reject_router(const routerstatus_t *rs) { (void)rs; @@ -54,6 +84,29 @@ authdir_wants_to_reject_router(routerinfo_t *ri, const char **msg, (void)valid_out; return 0; } +static inline int +dirserv_add_own_fingerprint(crypto_pk_t *pk) +{ + (void)pk; + return 0; +} +static inline uint32_t +dirserv_router_get_status(const routerinfo_t *router, + const char **msg, + int severity) +{ + (void)router; + (void)msg; + (void)severity; + return 0; +} +static inline void +dirserv_set_node_flags_from_authoritative_status(node_t *node, + uint32_t authstatus) +{ + (void)node; + (void)authstatus; +} #endif #endif /* !defined(TOR_RECV_UPLOADS_H) */ diff --git a/src/feature/dirauth/reachability.h b/src/feature/dirauth/reachability.h index 0018c7f63..8a83f0c49 100644 --- a/src/feature/dirauth/reachability.h +++ b/src/feature/dirauth/reachability.h @@ -24,16 +24,16 @@ #define REACHABILITY_TEST_CYCLE_PERIOD \ (REACHABILITY_TEST_INTERVAL*REACHABILITY_MODULO_PER_TEST) -void dirserv_orconn_tls_done(const tor_addr_t *addr, - uint16_t or_port, - const char *digest_rcvd, - const struct ed25519_public_key_t *ed_id_rcvd); void dirserv_single_reachability_test(time_t now, routerinfo_t *router); void dirserv_test_reachability(time_t now); #ifdef HAVE_MODULE_DIRAUTH int dirserv_should_launch_reachability_test(const routerinfo_t *ri, const routerinfo_t *ri_old); +void dirserv_orconn_tls_done(const tor_addr_t *addr, + uint16_t or_port, + const char *digest_rcvd, + const struct ed25519_public_key_t *ed_id_rcvd); #else static inline int dirserv_should_launch_reachability_test(const routerinfo_t *ri, @@ -43,6 +43,17 @@ dirserv_should_launch_reachability_test(const routerinfo_t *ri, (void)ri_old; return 0; } +static inline void +dirserv_orconn_tls_done(const tor_addr_t *addr, + uint16_t or_port, + const char *digest_rcvd, + const struct ed25519_public_key_t *ed_id_rcvd) +{ + (void)addr; + (void)or_port; + (void)digest_rcvd; + (void)ed_id_rcvd; +} #endif #endif /* !defined(TOR_REACHABILITY_H) */

1 0

[tor/master] Stub out some more functions in dirvote/*.h, fix compilation.
by asn＠torproject.org 16 Sep '19

16 Sep '19

commit 4256ee0d379daf35098c396757ce92b97b025c6e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 29 09:50:38 2019 -0400 Stub out some more functions in dirvote/*.h, fix compilation. This fixes LTO compilation for Android and -O0 compilation in general, when --disable-module-dirauth is provided. Fixes bug 31552; bugfix on 0.4.1.1-alpha. --- changes/bug31552 | 5 +++++ src/feature/dirauth/process_descs.h | 26 +++++++++++++++++++++++--- src/feature/dirauth/reachability.h | 16 ++++++++++++++-- 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/changes/bug31552 b/changes/bug31552 new file mode 100644 index 000000000..fb33e1442 --- /dev/null +++ b/changes/bug31552 @@ -0,0 +1,5 @@ + o Minor bugfixes (compilation): + - Add more stub functions to fix compilation on Android with LTO, when + --disable-module-dirauth is used. Previously, these compilation + settings would make the compiler look for functions that didn't exist. + Fixes bug 31552; bugfix on 0.4.1.1-alpha. diff --git a/src/feature/dirauth/process_descs.h b/src/feature/dirauth/process_descs.h index 001c866eb..0da47c96c 100644 --- a/src/feature/dirauth/process_descs.h +++ b/src/feature/dirauth/process_descs.h @@ -25,15 +25,35 @@ enum was_router_added_t dirserv_add_descriptor(routerinfo_t *ri, const char **msg, const char *source); -int authdir_wants_to_reject_router(routerinfo_t *ri, const char **msg, - int complain, - int *valid_out); uint32_t dirserv_router_get_status(const routerinfo_t *router, const char **msg, int severity); void dirserv_set_node_flags_from_authoritative_status(node_t *node, uint32_t authstatus); +#ifdef HAVE_MODULE_DIRAUTH int dirserv_would_reject_router(const routerstatus_t *rs); +int authdir_wants_to_reject_router(routerinfo_t *ri, const char **msg, + int complain, + int *valid_out); +#else +static inline int +dirserv_would_reject_router(const routerstatus_t *rs) +{ + (void)rs; + return 0; +} +static inline int +authdir_wants_to_reject_router(routerinfo_t *ri, const char **msg, + int complain, + int *valid_out) +{ + (void)ri; + (void)msg; + (void)complain; + (void)valid_out; + return 0; +} +#endif #endif /* !defined(TOR_RECV_UPLOADS_H) */ diff --git a/src/feature/dirauth/reachability.h b/src/feature/dirauth/reachability.h index 873a3f9a2..0018c7f63 100644 --- a/src/feature/dirauth/reachability.h +++ b/src/feature/dirauth/reachability.h @@ -28,9 +28,21 @@ void dirserv_orconn_tls_done(const tor_addr_t *addr, uint16_t or_port, const char *digest_rcvd, const struct ed25519_public_key_t *ed_id_rcvd); -int dirserv_should_launch_reachability_test(const routerinfo_t *ri, - const routerinfo_t *ri_old); void dirserv_single_reachability_test(time_t now, routerinfo_t *router); void dirserv_test_reachability(time_t now); +#ifdef HAVE_MODULE_DIRAUTH +int dirserv_should_launch_reachability_test(const routerinfo_t *ri, + const routerinfo_t *ri_old); +#else +static inline int +dirserv_should_launch_reachability_test(const routerinfo_t *ri, + const routerinfo_t *ri_old) +{ + (void)ri; + (void)ri_old; + return 0; +} +#endif + #endif /* !defined(TOR_REACHABILITY_H) */

1 0

[tor/master] Merge branch 'tor-github/pr/1273'
by asn＠torproject.org 16 Sep '19

16 Sep '19

commit a1192b6b4afd194043e2f80751ada9f6b30662cf Merge: bdd17da9f fb0e8966f Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Sep 16 15:20:25 2019 +0300 Merge branch 'tor-github/pr/1273' changes/bug31552 | 5 +++ src/feature/dirauth/keypin.h | 18 ++++++++- src/feature/dirauth/process_descs.h | 81 +++++++++++++++++++++++++++++++++++-- src/feature/dirauth/reachability.h | 31 ++++++++++++-- 4 files changed, 125 insertions(+), 10 deletions(-) diff --cc src/feature/dirauth/process_descs.h index 1d4085b09,a8a1dcca1..184caa18b --- a/src/feature/dirauth/process_descs.h +++ b/src/feature/dirauth/process_descs.h @@@ -33,11 -38,75 +38,79 @@@ uint32_t dirserv_router_get_status(cons int severity); void dirserv_set_node_flags_from_authoritative_status(node_t *node, uint32_t authstatus); - - int dirserv_would_reject_router(const routerstatus_t *rs); + #else + static inline int + dirserv_load_fingerprint_file(void) + { + return 0; + } + static inline enum was_router_added_t + dirserv_add_multiple_descriptors(const char *desc, size_t desclen, + uint8_t purpose, + const char *source, + const char **msg) + { + (void)desc; + (void)desclen; + (void)purpose; + (void)source; + (void)msg; + return (enum was_router_added_t)0; + } + static inline enum was_router_added_t + dirserv_add_descriptor(routerinfo_t *ri, + const char **msg, + const char *source) + { + (void)ri; + (void)msg; + (void)source; + return (enum was_router_added_t)0; + } + static inline int + dirserv_would_reject_router(const routerstatus_t *rs) + { + (void)rs; + return 0; + } + static inline int + authdir_wants_to_reject_router(routerinfo_t *ri, const char **msg, + int complain, + int *valid_out) + { + (void)ri; + (void)msg; + (void)complain; + (void)valid_out; + return 0; + } + static inline int + dirserv_add_own_fingerprint(crypto_pk_t *pk) + { + (void)pk; + return 0; + } + static inline uint32_t + dirserv_router_get_status(const routerinfo_t *router, + const char **msg, + int severity) + { + (void)router; + (void)msg; + (void)severity; + return 0; + } + static inline void + dirserv_set_node_flags_from_authoritative_status(node_t *node, + uint32_t authstatus) + { + (void)node; + (void)authstatus; + } + #endif +#ifdef TOR_UNIT_TESTS +STATIC int dirserv_router_has_valid_address(routerinfo_t *ri); +#endif /* defined(TOR_UNIT_TESTS) */ + #endif /* !defined(TOR_RECV_UPLOADS_H) */

1 0

[tor/master] madvise: tolerate EINVAL and ENOSYS when minherit fails
by asn＠torproject.org 16 Sep '19

16 Sep '19

commit 0891a31ad32d0567fbc8f73a0598925cb543d699 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 11 09:13:50 2019 -0400 madvise: tolerate EINVAL and ENOSYS when minherit fails These errors can occur if we are built on a system with support for madvise(MADV_NOFORK) but then we are run on a system whose kernel does not support that flag. If the error is something that we don't tolerate at all, we now log it before crashing. Fixes bug 31696. I am calling this a bugfix on 0.4.1.1-alpha, where we actually started using the map_anon code. This is similar to, but not the same as, the fix for #31570. --- changes/bug31696 | 5 +++++ src/lib/malloc/map_anon.c | 24 +++++++++++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/changes/bug31696 b/changes/bug31696 new file mode 100644 index 000000000..b9d6c4130 --- /dev/null +++ b/changes/bug31696 @@ -0,0 +1,5 @@ + o Major bugfixes (crash, Linux): + - Tolerate systems (including some Linux installations) where madvise + and/or MADV_DONTFORK are available at build-time, but not at run time. + Previously, these systems would notice a failed syscall and abort. + Fixes bug 31696; bugfix on 0.4.1.1-alpha. diff --git a/src/lib/malloc/map_anon.c b/src/lib/malloc/map_anon.c index 0f6a4150c..08b754540 100644 --- a/src/lib/malloc/map_anon.c +++ b/src/lib/malloc/map_anon.c @@ -27,6 +27,9 @@ #include <windows.h> #endif +#include <string.h> +#include <errno.h> + /** * Macro to get the high bytes of a size_t, if there are high bytes. * Windows needs this; other operating systems define a size_t that does @@ -136,18 +139,33 @@ noinherit_mem(void *mem, size_t sz, inherit_res_t *inherit_result_out) return 0; } #endif /* defined(FLAG_ZERO) */ + #ifdef FLAG_NOINHERIT int r2 = MINHERIT(mem, sz, FLAG_NOINHERIT); if (r2 == 0) { *inherit_result_out = INHERIT_RES_DROP; + return 0; } - return r2; -#else /* !(defined(FLAG_NOINHERIT)) */ +#endif /* defined(FLAG_NOINHERIT) */ + +#if defined(FLAG_ZERO) || defined(FLAG_NOINHERIT) + /* At least one operation was tried, and neither succeeded. */ + + if (errno == ENOSYS || errno == EINVAL) { + /* Syscall not supported, or flag not supported. */ + return 0; + } else { + tor_log_err_sigsafe("Unexpected error from minherit: ", + strerror(errno), + NULL); + return -1; + } +#else (void)inherit_result_out; (void)mem; (void)sz; return 0; -#endif /* defined(FLAG_NOINHERIT) */ +#endif } /**

1 0

[tor/master] Merge branch 'tor-github/pr/1318'
by asn＠torproject.org 16 Sep '19

16 Sep '19

commit bdd17da9fdfbe9de0547f27c7a78255a56570aa4 Merge: 286b129b0 0891a31ad Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Sep 16 15:19:38 2019 +0300 Merge branch 'tor-github/pr/1318' changes/bug31696 | 5 +++++ src/lib/malloc/map_anon.c | 21 ++++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-)

1 0

[tpo/develop] Add space between IRC and nickname
by hiro＠torproject.org 16 Sep '19

16 Sep '19

commit c0e38968acb4cf2b685e7f1ea1a744e9dccad1a6 Author: Gustavo Gus <gusgustavo(a)users.noreply.github.com> Date: Sun Sep 15 21:19:25 2019 +0000 Add space between IRC and nickname --- templates/macros/people.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/macros/people.html b/templates/macros/people.html index 79afc6f..1a4d7d1 100644 --- a/templates/macros/people.html +++ b/templates/macros/people.html @@ -41,7 +41,7 @@ <h6 class="nick text-primary m-0"><a href="https://pronoun.is/{{ item.pronoun }}">pronoun.is/{{ item.pronoun }}</a></h6> {% endif %} {% if item.nickname %} - <label class="nick text-primary">IRC:{{ item.nickname }}</label> + <label class="nick text-primary">IRC: {{ item.nickname }}</label> {% endif %} {{ item.description }} </div>

1 0

[tpo/develop] fix sajolida's pronoun link
by hiro＠torproject.org 16 Sep '19

16 Sep '19

commit 69e98c95e7f7d0b36902278a25573d667fd1dd7d Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Sep 15 13:41:49 2019 -0400 fix sajolida's pronoun link --- content/about/people/sajolida/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/people/sajolida/contents.lr b/content/about/people/sajolida/contents.lr index 56e6644..cddc3bc 100644 --- a/content/about/people/sajolida/contents.lr +++ b/content/about/people/sajolida/contents.lr @@ -8,7 +8,7 @@ name: sajolida --- nickname: sajolida --- -pronoun: https://pronoun.is/he +pronoun: he --- gpg: /static/keys/sajolida.txt ---

1 0

[tpo/develop] Update digital climate strike banner
by hiro＠torproject.org 16 Sep '19

16 Sep '19

commit 0b0aec730351019c5d9484015db3efa0c00354f6 Author: hiro <hiro(a)torproject.org> Date: Mon Sep 16 14:10:29 2019 +0200 Update digital climate strike banner --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 77fc882..09c5813 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 77fc882c7f54abb72c81d6fcd8c2fcc88e32781c +Subproject commit 09c5813e895e67104dbdcf15bfec66367bd11790

1 0

[lego/master] Fix climate stricke css
by hiro＠torproject.org 16 Sep '19

16 Sep '19

commit 09c5813e895e67104dbdcf15bfec66367bd11790 Author: hiro <hiro(a)torproject.org> Date: Mon Sep 16 14:09:37 2019 +0200 Fix climate stricke css --- assets/static/css/digital-climate-strike/button.css | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/assets/static/css/digital-climate-strike/button.css b/assets/static/css/digital-climate-strike/button.css index 31ef1c1..ad4462e 100644 --- a/assets/static/css/digital-climate-strike/button.css +++ b/assets/static/css/digital-climate-strike/button.css @@ -14,19 +14,19 @@ white-space: nowrap; border: 0; cursor: pointer; +} +.dcs-button:hover, +.dcs-button:focus { + background-color: #fff !important; + box-shadow: 0.3rem 0.3rem 0 #000 !important; + color: #000 !important; +} - &:hover, - &:focus { - background-color: #fff !important; - box-shadow: 0.3rem 0.3rem 0 #000 !important; - color: #000 !important; - } - - &:focus { - outline: 2px dotted #000; - } +.dcs-button:focus { + outline: 2px dotted #000; } + .dcs-button__icon { font-size: 1.5rem; height: 100%;

1 0

[lego/master] Fix climate stricke css
by hiro＠torproject.org 16 Sep '19

16 Sep '19

commit adb67ea6a31f917292f1f4d8688c832336eca1c0 Author: hiro <hiro(a)torproject.org> Date: Mon Sep 16 14:07:18 2019 +0200 Fix climate stricke css --- assets/static/css/digital-climate-strike/button.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/assets/static/css/digital-climate-strike/button.css b/assets/static/css/digital-climate-strike/button.css index 07708e6..31ef1c1 100644 --- a/assets/static/css/digital-climate-strike/button.css +++ b/assets/static/css/digital-climate-strike/button.css @@ -2,8 +2,8 @@ .dcs-button { background-color: var(--grey); - box-shadow: 0.3rem 0.3rem 0 var(--white); - color: var(--white); + box-shadow: 0.3rem 0.3rem 0 #fff; + color: #fff; display: inline-flex; font: 400 1.5rem/1.5rem 'Greve', 'Impact', sans-serif; letter-spacing: calc(0.07rem - 0.01rem); @@ -17,13 +17,13 @@ &:hover, &:focus { - background-color: var(--white); - box-shadow: 0.3rem 0.3rem 0 var(--black); - color: var(--black); + background-color: #fff !important; + box-shadow: 0.3rem 0.3rem 0 #000 !important; + color: #000 !important; } &:focus { - outline: 2px dotted var(--black); + outline: 2px dotted #000; } }

1 0