May 2011 - tor-commits - lists.torproject.org

[tor/release-0.2.2] Fix a docstring
by arma＠torproject.org 11 May '11

11 May '11

commit 532c13693e97565fe50a8a788d669d3ec94ad822 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Apr 26 02:16:24 2011 +0200 Fix a docstring --- src/or/control.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 9f7739a..28780d2 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3875,7 +3875,7 @@ static int bootstrap_problems = 0; * information and initial circuits. * * status is the new status, that is, what task we will be doing - * next. percent is zero if we just started this task, else it + * next. progress is zero if we just started this task, else it * represents progress on the task. */ void control_event_bootstrap(bootstrap_status_t status, int progress)

1 0

[tor/release-0.2.2] Fix up some check-spaces issues
by arma＠torproject.org 11 May '11

11 May '11

commit 330116f0343e3b7b6632d3bd1b5c9f6bca87872d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 5 21:53:46 2011 -0400 Fix up some check-spaces issues --- src/common/compat.c | 1 - src/or/rendclient.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 3644bd9..5797374 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2062,7 +2062,6 @@ correct_tm(int islocal, const time_t *timep, struct tm *resultbuf, return r; } - /** @{ */ /** As localtime_r, but defined for platforms that don't have it: * diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 8d024d8..e4a6d09 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -277,7 +277,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc, introcirc->_base.purpose = CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT; return 0; -perm_err: + perm_err: if (!introcirc->_base.marked_for_close) circuit_mark_for_close(TO_CIRCUIT(introcirc), END_CIRC_REASON_INTERNAL); circuit_mark_for_close(TO_CIRCUIT(rendcirc), END_CIRC_REASON_INTERNAL);

1 0

[tor/release-0.2.2] Handle crypto_pk_get_digest failures semi-sensibly
by arma＠torproject.org 11 May '11

11 May '11

commit 66339f74b4affcb02a3160014efe6ce9aca339e1 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed May 4 20:06:24 2011 -0700 Handle crypto_pk_get_digest failures semi-sensibly Fixes bug 3106. --- changes/warn-if-get_digest-fails | 6 ++++++ src/or/dirserv.c | 5 ++++- src/or/dirvote.c | 8 ++++++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/changes/warn-if-get_digest-fails b/changes/warn-if-get_digest-fails new file mode 100644 index 0000000..6cfc108 --- /dev/null +++ b/changes/warn-if-get_digest-fails @@ -0,0 +1,6 @@ + o Minor bugfixes: + - If we fail to compute the identity digest of a v3 legacy + keypair, warn, and don't use a buffer-full of junk instead. + Bugfix on 0.2.1.1-alpha; fixes bug 3106. + + diff --git a/src/or/dirserv.c b/src/or/dirserv.c index c8dda66..860ac1f 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2705,7 +2705,10 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_env_t *private_key, if (options->V3AuthUseLegacyKey) { authority_cert_t *c = get_my_v3_legacy_cert(); if (c) { - crypto_pk_get_digest(c->identity_key, voter->legacy_id_digest); + if (crypto_pk_get_digest(c->identity_key, voter->legacy_id_digest)) { + log_warn(LD_BUG, "Unable to compute digest of legacy v3 identity key"); + memset(voter->legacy_id_digest, 0, DIGEST_LEN); + } } } diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 9273dbc..db2eaf0 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -3129,8 +3129,12 @@ dirvote_compute_consensuses(void) authority_cert_t *cert = get_my_v3_legacy_cert(); legacy_sign = get_my_v3_legacy_signing_key(); if (cert) { - crypto_pk_get_digest(cert->identity_key, legacy_dbuf); - legacy_id_digest = legacy_dbuf; + if (crypto_pk_get_digest(cert->identity_key, legacy_dbuf)) { + log_warn(LD_BUG, + "Unable to compute digest of legacy v3 identity key"); + } else { + legacy_id_digest = legacy_dbuf; + } } }

1 0

[tor/release-0.2.2] Merge remote-tracking branch 'rransom/bug3106' into maint-0.2.2
by arma＠torproject.org 11 May '11

11 May '11

commit 9583a534ac8801211b6c171c399f1ea6bb3cce1c Merge: ab1460f 66339f7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 23:18:47 2011 -0400 Merge remote-tracking branch 'rransom/bug3106' into maint-0.2.2 changes/warn-if-get_digest-fails | 6 ++++++ src/or/dirserv.c | 5 ++++- src/or/dirvote.c | 8 ++++++-- 3 files changed, 16 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.2] Fix compile warning on windows
by arma＠torproject.org 11 May '11

11 May '11

commit 9a490bb53b98efa4cec721a80fe5fec94c554c1f Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu May 5 02:21:09 2011 +0200 Fix compile warning on windows --- src/or/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 462b51e..7bae59c 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1587,6 +1587,7 @@ do_main_loop(void) } } +#ifndef MS_WINDOWS /* Only called when we're willing to use signals */ /** Libevent callback: invoked when we get a signal. */ static void @@ -1598,6 +1599,7 @@ signal_callback(int fd, short events, void *arg) process_signal(sig); } +#endif /** Do the work of acting on a signal received in sig */ void

1 0

[tor/release-0.2.2] Merge remote-tracking branch 'sebastian/win_warning' into maint-0.2.2
by arma＠torproject.org 11 May '11

11 May '11

commit ab1460f3ae00f6caab9feead455eebfb0d03d5e4 Merge: 0ee524b 9a490bb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 20:33:16 2011 -0400 Merge remote-tracking branch 'sebastian/win_warning' into maint-0.2.2 src/or/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)

1 0

[tor/release-0.2.2] Only authorities should automatically download v2 networkstatus documents
by arma＠torproject.org 11 May '11

11 May '11

commit cd42ae71850985ed8dd34ae73dc6265a643fcb13 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 28 10:05:32 2011 -0400 Only authorities should automatically download v2 networkstatus documents Clients and relays haven't used them since early 0.2.0.x. The only remaining use by authorities learning about new relays ahead of scedule; see proposal 147 for what we intend to do about that. We're leaving in an option (FetchV2Networkstatus) to manually fetch v2 networkstatuses, because apparently dnsel and maybe bwauth want them. This fixes bug 3022. --- changes/bug3022 | 6 ++++++ doc/tor.1.txt | 6 ++++++ src/or/config.c | 1 + src/or/directory.c | 1 + src/or/networkstatus.c | 2 +- src/or/or.h | 4 +++- 6 files changed, 18 insertions(+), 2 deletions(-) diff --git a/changes/bug3022 b/changes/bug3022 new file mode 100644 index 0000000..9472e6d --- /dev/null +++ b/changes/bug3022 @@ -0,0 +1,6 @@ + o Removed features + - Caches no longer download and serve v2 networkstatus documents + unless FetchV2Networkstatus flag is set: these documents haven't + haven't been used by clients or relays since 0.2.0.x. Resolves + bug 3022. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 04a0537..c408aa9 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1171,6 +1171,12 @@ if DirPort is non-zero): Set an entrance policy for this server, to limit who can connect to the directory ports. The policies have the same form as exit policies above. +**FetchV2Networkstatus** **0**|**1**:: + If set, we try to fetch the (obsolete, unused) version 2 network status + consensus documents from the directory authorities. No currently + supported Tor version uses them. (Default: 0.) + + DIRECTORY AUTHORITY SERVER OPTIONS ---------------------------------- diff --git a/src/or/config.c b/src/or/config.c index f003e4d..ab9c5db 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -255,6 +255,7 @@ static config_var_t _option_vars[] = { V(FetchServerDescriptors, BOOL, "1"), V(FetchHidServDescriptors, BOOL, "1"), V(FetchUselessDescriptors, BOOL, "0"), + V(FetchV2Networkstatus, BOOL, "0"), #ifdef WIN32 V(GeoIPFile, FILENAME, "<default>"), #else diff --git a/src/or/directory.c b/src/or/directory.c index 0c095fe..68734e6 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -353,6 +353,7 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, break; case DIR_PURPOSE_FETCH_V2_NETWORKSTATUS: type = V2_AUTHORITY; + prefer_authority = 1; /* Only v2 authorities have these anyway. */ break; case DIR_PURPOSE_FETCH_SERVERDESC: type = (router_purpose == ROUTER_PURPOSE_BRIDGE ? BRIDGE_AUTHORITY : diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 4f6fe15..a50d3ca 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1356,7 +1356,7 @@ update_networkstatus_downloads(time_t now) or_options_t *options = get_options(); if (should_delay_dir_fetches(options)) return; - if (directory_fetches_dir_info_early(options)) + if (authdir_mode_any_main(options) || options->FetchV2Networkstatus) update_v2_networkstatus_cache_downloads(now); update_consensus_networkstatus_downloads(now); update_certificate_downloads(now); diff --git a/src/or/or.h b/src/or/or.h index 7d354c8..30179e5 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2489,7 +2489,9 @@ typedef struct { /** Boolean: do we publish hidden service descriptors to the HS auths? */ int PublishHidServDescriptors; int FetchServerDescriptors; /**< Do we fetch server descriptors as normal? */ - int FetchHidServDescriptors; /** and hidden service descriptors? */ + int FetchHidServDescriptors; /**< and hidden service descriptors? */ + int FetchV2Networkstatus; /**< Do we fetch v2 networkstatus documents when + * we don't need to? */ int HidServDirectoryV2; /**< Do we participate in the HS DHT? */ int MinUptimeHidServDirectoryV2; /**< As directory authority, accept hidden

1 0

[tor/release-0.2.2] More notes on how to upload tarballs from erinn
by arma＠torproject.org 11 May '11

11 May '11

commit 29f1ffa0fec58f4588e163006f561e8912a2c942 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 17:21:33 2011 -0400 More notes on how to upload tarballs from erinn --- doc/HACKING | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/doc/HACKING b/doc/HACKING index 86d4a98..e00aeb1 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -474,7 +474,10 @@ in their approved versions list. and push the git tag. (That's either "git tag -u <keyid> tor-0.2.x.y-status", then "git push origin tag tor-0.2.x.y-status". To sign the - tarball, "gpg -ba <the_tarball>") + tarball, "gpg -ba <the_tarball>". Put the files in + /src/www-master.torproject.org/htdocs/dist on vescum, then + sudo -u mirroradm -H /home/mirroradm/bin/trigger-mirrors sudoed + ) 8) Edit include/versions.wmi to note the new version. Rebuild and push the website.

1 0

[tor/release-0.2.2] Merge branch 'bug2379' into maint-0.2.2
by arma＠torproject.org 11 May '11

11 May '11

commit 0ee524b57f35460229725c7a43f28ab73bfaa3fa Merge: 29f1ffa b04dca4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 17:37:56 2011 -0400 Merge branch 'bug2379' into maint-0.2.2 changes/bug2379 | 5 +++++ doc/tor.1.txt | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-)

1 0

[tor/release-0.2.2] Fix circuit_list_path_impl(): internal circuits do not have an "exit". Trivial fix for 3079.
by arma＠torproject.org 11 May '11

11 May '11

commit 4126de6888de54b5fc825d209ff1bfbe73cd9514 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 3 21:53:13 2011 -0400 Fix circuit_list_path_impl(): internal circuits do not have an "exit". Trivial fix for 3079. --- src/or/circuitbuild.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 85765e3..0e033a5 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1506,7 +1506,7 @@ circuit_list_path_impl(origin_circuit_t *circ, int verbose, int verbose_names) circ->build_state->is_internal ? "internal" : "exit", circ->build_state->need_uptime ? " (high-uptime)" : "", circ->build_state->desired_path_len, - circ->_base.state == CIRCUIT_STATE_OPEN ? "" : ", exit ", + circ->_base.state == CIRCUIT_STATE_OPEN ? "" : ", last hop ", circ->_base.state == CIRCUIT_STATE_OPEN ? "" : (nickname?nickname:"*unnamed*")); smartlist_add(elements, cp);

1 0