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

[tor/master] Stop ed25519 8-bit signed left shift overflowing
by nickm＠torproject.org 29 Sep '14

29 Sep '14

commit b7eab94a9078b18593a0d0d378d0ccdc07798178 Author: teor <teor2345(a)gmail.com> Date: Sun Sep 28 20:44:00 2014 -0400 Stop ed25519 8-bit signed left shift overflowing Standardise usage in ge_scalarmult_base.c for 1 new fix. --- src/ext/ed25519/ref10/ge_scalarmult_base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ext/ed25519/ref10/ge_scalarmult_base.c b/src/ext/ed25519/ref10/ge_scalarmult_base.c index 3ede0ad..5292f83 100644 --- a/src/ext/ed25519/ref10/ge_scalarmult_base.c +++ b/src/ext/ed25519/ref10/ge_scalarmult_base.c @@ -39,7 +39,7 @@ static void select(ge_precomp *t,int pos,signed char b) { ge_precomp minust; unsigned char bnegative = negative(b); - unsigned char babs = b - (((-bnegative) & b) << 1); + unsigned char babs = b - SHL8( (-bnegative) & (unsigned char)b, 1); ge_precomp_0(t); cmov(t,&base[pos][0],equal(babs,1));

1 0

[tor/master] Merge branch 'bug13280'
by nickm＠torproject.org 29 Sep '14

29 Sep '14

commit 47fab50cbaf3a41e8af9c63f645ad6075b43e565 Merge: ff8fe38 b7eab94 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Sep 28 21:01:14 2014 -0400 Merge branch 'bug13280' src/ext/ed25519/ref10/crypto_int32.h | 22 ++++ src/ext/ed25519/ref10/crypto_int64.h | 20 ++++ src/ext/ed25519/ref10/fe_frombytes.c | 20 ++-- src/ext/ed25519/ref10/fe_mul.c | 24 ++--- src/ext/ed25519/ref10/fe_sq.c | 24 ++--- src/ext/ed25519/ref10/fe_sq2.c | 24 ++--- src/ext/ed25519/ref10/fe_tobytes.c | 36 +++---- src/ext/ed25519/ref10/ge_scalarmult_base.c | 4 +- src/ext/ed25519/ref10/sc_muladd.c | 158 ++++++++++++++-------------- src/ext/ed25519/ref10/sc_reduce.c | 112 ++++++++++---------- 10 files changed, 243 insertions(+), 201 deletions(-)

1 0

[tor/master] Stop spurious clang shallow analysis null pointer errors
by nickm＠torproject.org 29 Sep '14

29 Sep '14

commit ff8fe38a2fac97d34bba4d46edabb4dd1bbe6d90 Author: teor <teor2345(a)gmail.com> Date: Mon Sep 29 10:08:37 2014 +1000 Stop spurious clang shallow analysis null pointer errors Avoid 4 null pointer errors under clang shallow analysis (the default when building under Xcode) by using tor_assert() to prove that the pointers aren't null. Resolves issue 13284 via minor code refactoring. --- changes/issue13284-spurious-clang-shallow-analyze-errors | 3 +++ src/or/dirserv.c | 2 ++ src/or/dirvote.c | 2 ++ src/or/routerlist.c | 2 ++ 4 files changed, 9 insertions(+) diff --git a/changes/issue13284-spurious-clang-shallow-analyze-errors b/changes/issue13284-spurious-clang-shallow-analyze-errors new file mode 100644 index 0000000..c08fa1f --- /dev/null +++ b/changes/issue13284-spurious-clang-shallow-analyze-errors @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Avoid 4 null pointer errors under clang shallow analysis by using + tor_assert() to prove that the pointers aren't null. Fixes bug 13284. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 9131440..374cfa6 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1395,6 +1395,8 @@ dirserv_compute_performance_thresholds(routerlist_t *rl, routerinfo_t *ri = node->ri; const char *id = node->identity; uint32_t bw_kb; + /* resolve spurious clang shallow analysis null pointer errors */ + tor_assert(ri); node->is_exit = (!router_exit_policy_rejects_all(ri) && exit_policy_is_general_exit(ri->exit_policy)); uptimes[n_active] = (uint32_t)real_uptime(ri, now); diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 9ad92ca..8a0fdf6 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -647,6 +647,8 @@ dirvote_compute_params(smartlist_t *votes, int method, int total_authorities) next_param = NULL; else next_param = smartlist_get(param_list, param_sl_idx+1); + /* resolve spurious clang shallow analysis null pointer errors */ + tor_assert(param); if (!next_param || strncmp(next_param, param, cur_param_len)) { /* We've reached the end of a series. */ /* Make sure enough authorities voted on this param, unless the diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 1faa05f..22489a4 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -475,6 +475,8 @@ trusted_dirs_remove_old_certs(void) time_t cert_published; if (newest == cert) continue; + /* resolve spurious clang shallow analysis null pointer errors */ + tor_assert(cert); expired = now > cert->expires; cert_published = cert->cache_info.published_on; /* Store expired certs for 48 hours after a newer arrives;

1 0

[doctor/master] Respecting ignored authorities in 'missing authority signature' check
by atagar＠torproject.org 28 Sep '14

28 Sep '14

commit 074ea434f5393d4c0b246e095ccbe1e09ae2c8a5 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 27 21:37:45 2014 -0700 Respecting ignored authorities in 'missing authority signature' check When turtles goes down we still get... NOTICE: Consensus fetched from maatuska was missing the following authority signatures: turtles NOTICE: Consensus fetched from tor26 was missing the following authority signatures: turtles NOTICE: Consensus fetched from urras was missing the following authority signatures: turtles NOTICE: Consensus fetched from dizum was missing the following authority signatures: turtles NOTICE: Consensus fetched from gabelmoo was missing the following authority signatures: turtles NOTICE: Consensus fetched from moria1 was missing the following authority signatures: turtles NOTICE: Consensus fetched from dannenberg was missing the following authority signatures: turtles NOTICE: Consensus fetched from Faravahar was missing the following authority signatures: turtles Properly suppressing this. --- consensus_health_checker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/consensus_health_checker.py b/consensus_health_checker.py index 9ae9f8d..30693d5 100755 --- a/consensus_health_checker.py +++ b/consensus_health_checker.py @@ -442,7 +442,7 @@ def has_all_signatures(latest_consensus, consensuses, votes): missing_authority = missing_signature - for authority in DIRECTORY_AUTHORITIES.values(): + for authority in directory_authorities().values(): if authority.v3ident == missing_signature: missing_authority = authority.nickname break

1 0

[doctor/master] Properly suppress staggered messages
by atagar＠torproject.org 28 Sep '14

28 Sep '14

commit 1bfdf45380ef0232bd563e18ccaaaeda9fd2b178 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 28 12:14:28 2014 -0700 Properly suppress staggered messages We updated suppression times if and only if its duration had expired. Take the following scenario with the suppression time of six hours per message... 2:00 - issue A comes up 4:00 - issue B comes up At 4:00 an email is sent having both issue A and B, so the proper thing would be to suppress both until 10:00. However, message A's suppression time wasn't being updated so we'd email at both 8:00 and 10:00 instead. This should greatly cut down on the amount of noise since all messages have a default suppression time. --- consensus_health_checker.py | 95 ++++++++++++++++++++++++++----------------- 1 file changed, 58 insertions(+), 37 deletions(-) diff --git a/consensus_health_checker.py b/consensus_health_checker.py index 30693d5..54c50da 100755 --- a/consensus_health_checker.py +++ b/consensus_health_checker.py @@ -85,6 +85,27 @@ class Issue(object): return self._runlevel @lru_cache() + def get_suppression_key(self): + """ + Provides the key used for issue suppression. + + :returns: **str** used for the configuration key of this issue in the + suppressions file + """ + + if self._template == 'TOO_MANY_UNMEASURED_RELAYS': + # Hack because this message has too much dynamic data to be effectively + # suppressed. Hate doing this here, so better would be to make this a + # config property. + + attr = dict(self._attr) + attr.update({'unmeasured': 0, 'total': 0, 'percentage': 0}) + + return CONFIG['msg'][self._template].format(**attr).replace(' ', '_') + else: + return self.get_message().replace(' ', '_') + + @lru_cache() def get_suppression_duration(self): """ Provides the number of hours we should suppress this message after it has @@ -115,42 +136,49 @@ class Issue(object): return "%s: %s" % (self.get_runlevel(), self.get_message()) -def rate_limit_notice(key, hours = 0, days = 0): +def is_rate_limited(issue): """ Check if we have sent a notice with this key within a given period of time. - If we have then this returns **False**, otherwise this records the fact that - we're sending the message now and returns **True**. - :param str key: unique identifier for this notification - :param int hours: number of hours to suppress this message for after being sent - :param int days: number of days to suppress this message for after being sent + :param Issue issue: issue to check the suppression status for """ - if hours == 0 and days == 0: - return True - - config = stem.util.conf.get_config('last_notified') - config_path = util.get_path('data', 'last_notified.cfg') + key = issue.get_suppression_key() + hours = issue.get_suppression_duration() - try: - config.clear() - config.load(config_path) - except: - pass + if hours == 0: + return True current_time = int(time.time()) - last_seen = config.get(key, 0) - suppression_time = (3600 * hours) + (86400 * days) + last_seen = stem.util.conf.get_config('last_notified').get(key, 0) + suppression_time = 3600 * hours suppression_time += 1800 # adding a half hour so timing doesn't coinside with our hourly cron suppression_time_remaining = suppression_time - (current_time - last_seen) if suppression_time_remaining <= 0: - config.set(key, str(current_time), overwrite = True) - config.save(config_path) - return True + return False else: log.info("Suppressing %s, time remaining is %i hours" % (key, (suppression_time_remaining / 3600) + 1)) - return False + return True + + +def rate_limit_notice(issue): + """ + Record that this notice is being sent, so further runs will take this into + account for rate limitation. + + :param Issue issue: issue to update the suppression status for + """ + + key = issue.get_suppression_key() + hours = issue.get_suppression_duration() + + if hours == 0: + return + + config = stem.util.conf.get_config('last_notified') + config.set(key, str(int(time.time())), overwrite = True) + config.save() @lru_cache() @@ -166,6 +194,9 @@ def main(): config = stem.util.conf.get_config("consensus_health") config.load(util.get_path('data', 'consensus_health.cfg')) + config = stem.util.conf.get_config('last_notified') + config.load(util.get_path('data', 'last_notified.cfg')) + consensuses, consensus_fetching_issues = get_consensuses() votes, vote_fetching_issues = get_votes() issues = consensus_fetching_issues + vote_fetching_issues @@ -178,26 +209,16 @@ def main(): is_all_suppressed = True # either no issues or they're all already suppressed for issue in issues: - if issue._template == 'TOO_MANY_UNMEASURED_RELAYS': - # Hack because this message has too much dynamic data to be effectively - # suppressed. Hate doing this here, so better would be to make this a - # config property. - - attr = dict(issue._attr) - attr.update({'unmeasured': 0, 'total': 0, 'percentage': 0}) - - key = CONFIG['msg'][issue._template].format(**attr).replace(' ', '_') - else: - key = issue.get_message().replace(' ', '_') - - duration = issue.get_suppression_duration() - - if rate_limit_notice(key, duration): + if not is_rate_limited(issue): is_all_suppressed = False + break if not is_all_suppressed: log.debug("Sending notification for issues") + for issue in issues: + rate_limit_notice(issue) + if TEST_RUN: print '\n'.join(map(str, issues)) else:

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 28 Sep '14

28 Sep '14

commit 2b097beae63b4e835bb9ed6433c4960c129b018c Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 28 17:15:53 2014 +0000 Update translations for tor-launcher-network-settings --- sk/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sk/network-settings.dtd b/sk/network-settings.dtd index 812f4f1..2559233 100644 --- a/sk/network-settings.dtd +++ b/sk/network-settings.dtd @@ -26,7 +26,7 @@  <!ENTITY torsettings.startingTor "Čakám kým sa Tor spustí..."> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Reštartujte Tor"> <!ENTITY torsettings.optional "Voliteľné">

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 28 Sep '14

28 Sep '14

commit 65a11b29d1786e2ac59b90a9ef6683cf169c1f75 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 28 17:15:45 2014 +0000 Update translations for tor-launcher-properties_completed --- sk/torlauncher.properties | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sk/torlauncher.properties b/sk/torlauncher.properties index 4743463..17de31a 100644 --- a/sk/torlauncher.properties +++ b/sk/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Spúšťač Tor -torlauncher.tor_exited=Tor bol neočakávane ukončený. -torlauncher.please_restart_app=Prosím reštartujte túto aplikáciu. +torlauncher.tor_exited=Tor bol neočakávane ukončený. Mohlo to byť spôsobené chybou v Tor samotnom, iným programom vo vašom systéme, alebo chybným hardvérom. Kým nereštartujete Tor, Tor Browser nebude schopný otvoriť akékoľvek webové stránky. Ak problém pretrváva, prosím pošlite kópiu Tor logu tímu podpory. +torlauncher.tor_exited2=Reštartovanie Tor nezatvorí Vaše záložky prehliadača. torlauncher.tor_controlconn_failed=Nepodarilo sa pripojiť ku kontrolnému portu Tor. torlauncher.tor_failed_to_start=Tor sa nepodarilo spustiť. torlauncher.tor_control_failed=Nepodarilo sa prevziať kontrolu nad Torom. @@ -30,12 +30,15 @@ torlauncher.error_bridge_bad_default_type=Žiadne poskytnuté mosty nemajú dost torlauncher.recommended_bridge=(odporúčané) torlauncher.connect=Pripojiť +torlauncher.restart_tor=Reštartujte Tor torlauncher.quit=Ukončiť torlauncher.quit_win=Ukončiť torlauncher.done=Hotovo torlauncher.forAssistance=Pre podporu kontaktujte %S +torlauncher.copiedNLogMessages=Kopirovanie ukončené. %S Tor log správy je pripravené na prilepenie do textového editora alebo emailovej správy. + torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection torlauncher.bootstrapStatus.requesting_status=Retrieving network status

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 28 Sep '14

28 Sep '14

commit 5dd836386d1dce57522d10c2071072fb3d64f91d Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 28 17:15:41 2014 +0000 Update translations for tor-launcher-properties --- sk/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sk/torlauncher.properties b/sk/torlauncher.properties index b438ed4..17de31a 100644 --- a/sk/torlauncher.properties +++ b/sk/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=Spúšťač Tor torlauncher.tor_exited=Tor bol neočakávane ukončený. Mohlo to byť spôsobené chybou v Tor samotnom, iným programom vo vašom systéme, alebo chybným hardvérom. Kým nereštartujete Tor, Tor Browser nebude schopný otvoriť akékoľvek webové stránky. Ak problém pretrváva, prosím pošlite kópiu Tor logu tímu podpory. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. +torlauncher.tor_exited2=Reštartovanie Tor nezatvorí Vaše záložky prehliadača. torlauncher.tor_controlconn_failed=Nepodarilo sa pripojiť ku kontrolnému portu Tor. torlauncher.tor_failed_to_start=Tor sa nepodarilo spustiť. torlauncher.tor_control_failed=Nepodarilo sa prevziať kontrolu nad Torom.

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 28 Sep '14

28 Sep '14

commit 1bfc34239d5969176a262d3f369e8ea04cd7d2c3 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 28 16:45:40 2014 +0000 Update translations for tor-launcher-properties --- sk/torlauncher.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sk/torlauncher.properties b/sk/torlauncher.properties index 2280de6..b438ed4 100644 --- a/sk/torlauncher.properties +++ b/sk/torlauncher.properties @@ -3,7 +3,7 @@ torlauncher.error_title=Spúšťač Tor -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. +torlauncher.tor_exited=Tor bol neočakávane ukončený. Mohlo to byť spôsobené chybou v Tor samotnom, iným programom vo vašom systéme, alebo chybným hardvérom. Kým nereštartujete Tor, Tor Browser nebude schopný otvoriť akékoľvek webové stránky. Ak problém pretrváva, prosím pošlite kópiu Tor logu tímu podpory. torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. torlauncher.tor_controlconn_failed=Nepodarilo sa pripojiť ku kontrolnému portu Tor. torlauncher.tor_failed_to_start=Tor sa nepodarilo spustiť. @@ -30,14 +30,14 @@ torlauncher.error_bridge_bad_default_type=Žiadne poskytnuté mosty nemajú dost torlauncher.recommended_bridge=(odporúčané) torlauncher.connect=Pripojiť -torlauncher.restart_tor=Restart Tor +torlauncher.restart_tor=Reštartujte Tor torlauncher.quit=Ukončiť torlauncher.quit_win=Ukončiť torlauncher.done=Hotovo torlauncher.forAssistance=Pre podporu kontaktujte %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Kopirovanie ukončené. %S Tor log správy je pripravené na prilepenie do textového editora alebo emailovej správy. torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection

1 0

r26960: {website} Fix typo spotted by toralf (website/trunk/docs/en)
by Sebastian Hahn 28 Sep '14

28 Sep '14

Author: sebastian Date: 2014-09-28 11:03:27 +0000 (Sun, 28 Sep 2014) New Revision: 26960 Modified: website/trunk/docs/en/bridges.wml Log: Fix typo spotted by toralf Modified: website/trunk/docs/en/bridges.wml =================================================================== --- website/trunk/docs/en/bridges.wml 2014-09-28 03:58:08 UTC (rev 26959) +++ website/trunk/docs/en/bridges.wml 2014-09-28 11:03:27 UTC (rev 26960) @@ -89,7 +89,7 @@ detected they block the traffic flow. - To circumvent such sophisicated censorship Tor introduced + To circumvent such sophisticated censorship Tor introduced obfuscated bridges. These bridges use special plugins called pluggable transports which obfuscate the traffic flow of Tor, making its detection harder.

1 0