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

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 19 May '12

19 May '12

commit 6784ec5bb883f7a4ef56efbbc1c8d1715650a185 Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 19 05:45:26 2012 +0000 Update translations for https_everywhere --- zh_TW/ssl-observatory.dtd | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_TW/ssl-observatory.dtd b/zh_TW/ssl-observatory.dtd index 5bf9d4a..c894e7d 100644 --- a/zh_TW/ssl-observatory.dtd +++ b/zh_TW/ssl-observatory.dtd @@ -44,7 +44,7 @@ to turn it on?">--> <!ENTITY ssl-observatory.prefs.done "完成"> <!ENTITY ssl-observatory.prefs.explanation -""> +"HTTPS Everywhere 可以使用 EFF 的 SSL 觀測站。這麼做有兩個效果：(1) 將 HTTPS 憑證的副本傳送到觀測站，協助我們偵測「中間人」攻擊並增進網路安全性；(2) 當您遇到不安全的連線或瀏覽器遭到攻擊時，我們能夠提出警告。">  <!ENTITY ssl-observatory.prefs.explanation2 -""> +"例如當您開啟 https://www.something.com（範例網址）時，觀測站所收到的憑證會顯示有人瀏覽 www.something.com，但不會指出瀏覽者身分或者觀看的是哪些特定頁面。將游標移至選項上可得到詳細說明:"> <!ENTITY ssl-observatory.prefs.hide "隱藏進階選項"> <!ENTITY ssl-observatory.prefs.nonanon -"在 Tor 無法使用時仍檢測憑證"> +"在 Tor 無法使用時仍檢查憑證"> <!ENTITY ssl-observatory.prefs.nonanon_tooltip "我們仍會試圖維持資料的匿名性，但這個選項的安全性較低"> @@ -67,7 +67,7 @@ Mouseover the options for further details:">--> "送出並檢查非公共域名系統（non-public DNS）名稱的憑證"> <!ENTITY ssl-observatory.prefs.priv_dns_tooltip -""> +"觀測站不會記錄名稱未經 DNS 系統解析的憑證，除非您有勾選這個選項。"> <!ENTITY ssl-observatory.prefs.show "顯示進階選項">

1 0

[tor/master] Fix the unittest breakage introduced by a8a862c.
by arma＠torproject.org 18 May '12

18 May '12

commit ec7fd08ccfa878c35170bdab648bb7506da7df7d Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri May 18 20:52:24 2012 +0300 Fix the unittest breakage introduced by a8a862c. --- src/test/test_pt.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/src/test/test_pt.c b/src/test/test_pt.c index 201f78e..fde64ab 100644 --- a/src/test/test_pt.c +++ b/src/test/test_pt.c @@ -99,12 +99,6 @@ test_pt_protocol(void) /* various wrong protocol runs: */ - strcpy(line, "TEST TEST"); - handle_proxy_line(line, mp); - test_assert(mp->conf_state == PT_PROTO_BROKEN); - - reset_mp(mp); - strcpy(line,"VERSION 1"); handle_proxy_line(line, mp); test_assert(mp->conf_state == PT_PROTO_ACCEPTING_METHODS);

1 0

[tor/release-0.2.2] fold in further changes files
by arma＠torproject.org 18 May '12

18 May '12

commit 736fb31d97dc46454de4fcea16f4948c4afaed34 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri May 18 16:59:23 2012 -0400 fold in further changes files --- ChangeLog | 16 +++++++++++++++- changes/bug5259 | 3 --- changes/bug5346 | 8 -------- changes/bug5796 | 4 ---- changes/geoip-may2012 | 3 --- changes/routerlist_ins_replace | 5 ----- 6 files changed, 15 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 43ce239..e981880 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,8 @@ Changes in version 0.2.2.36 - 2012-04-?? bugfix on 0.2.2.29-beta. Bug found by wanoskarnet. o Minor bugfixes: + - Reject out-of-range times like 23:59:61 in parse_rfc1123_time(). + Fixes bug 5346; bugfix on 0.0.8pre3. - Make our number-parsing functions always treat too-large values as an error, even when those values exceed the width of the underlying type. Previously, if the caller provided these @@ -75,6 +77,10 @@ Changes in version 0.2.2.36 - 2012-04-?? no such remote address to learn, and our method for trying to learn it was incorrect. Fixes bugs 1240, 4745, and 4747. Bugfix on 0.1.0.3-rc. Reported and diagnosed by "r1eo". + - Correct parsing of certain date types in parse_http_time(). + Without this patch, If-Modified-Since would behave + incorrectly. Fixes bug 5346; bugfix on 0.2.0.2-alpha. Patch from + Esteban Manchado VelÃ¡zques. - Change the BridgePassword feature (part of the "bridge community" design, which is not yet implemented) to use a time-independent comparison. The old behavior might have allowed an adversary @@ -95,6 +101,12 @@ Changes in version 0.2.2.36 - 2012-04-?? CFLAGS. clang doesn't support them yet. - When sending an HTTP/1.1 proxy request, include a Host header. Fixes bug 5593; bugfix on 0.2.2.1-alpha. + - Fix a NULL-pointer dereference on a badly formed SETCIRCUITPURPOSE + command. Found by mikeyc. Fixes bug 5796; bugfix on 0.2.2.9-alpha. + - If we hit the error case where routerlist_insert() replaces an + existing (old) server descriptor, make sure to remove that + server descriptor from the old_routers list. Fix related to bug + 1776. Bugfix on 0.2.2.18-alpha. o Minor bugfixes (documentation and log messages): - Fix a typo in a log message in rend_service_rendezvous_has_opened(). @@ -109,6 +121,8 @@ Changes in version 0.2.2.36 - 2012-04-?? bug 5067; bugfix on 0.2.0.10-alpha. - Correctly spell "connect" in a log message on failure to create a controlsocket. Fixes bug 4803; bugfix on 0.2.2.26-beta. + - Clarify the behavior of MaxCircuitDirtiness with hidden service + circuits. Fixes issue 5259. o Minor features: - Directory authorities now reject versions of Tor older than @@ -116,7 +130,7 @@ Changes in version 0.2.2.36 - 2012-04-?? inclusive. These versions accounted for only a small fraction of the Tor network, and have numerous known security issues. Resolves issue 4788. - - Update to the April 3 2012 Maxmind GeoLite Country database. + - Update to the May 1 2012 Maxmind GeoLite Country database. - Feature removal: - When sending or relaying a RELAY_EARLY cell, we used to convert diff --git a/changes/bug5259 b/changes/bug5259 deleted file mode 100644 index bdada58..0000000 --- a/changes/bug5259 +++ /dev/null @@ -1,3 +0,0 @@ - o Documentation fixes: - - Clarify the behavior of MaxCircuitDirtiness with hidden service - circuits. Fix for issue 5259. diff --git a/changes/bug5346 b/changes/bug5346 deleted file mode 100644 index 3d21f90..0000000 --- a/changes/bug5346 +++ /dev/null @@ -1,8 +0,0 @@ - o Minor bugfixes: - - Correct parsing of certain date types in parse_http_time(). - Without this patch, If-Modified-Since would behave - incorrectly. Fix for bug 5346; bugfix on 0.2.0.2-alpha. Patch from - Esteban Manchado Velázques. - - Reject out-of-range times like 23:59:61. Fix for bug 5346; - bugfix on 0.0.8pre3. - diff --git a/changes/bug5796 b/changes/bug5796 deleted file mode 100644 index b92659f..0000000 --- a/changes/bug5796 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (controller): - - Fix a NULL-pointer derefernce on a badly formed - SETCIRCUITPURPOSE command. Found by mikeyc. Fixes bug 5796; - bugfix on 0.2.2.9-alpha. diff --git a/changes/geoip-may2012 b/changes/geoip-may2012 deleted file mode 100644 index 1575ece..0000000 --- a/changes/geoip-may2012 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update to the May 1 2012 Maxmind GeoLite Country database. - diff --git a/changes/routerlist_ins_replace b/changes/routerlist_ins_replace deleted file mode 100644 index 7b442a2..0000000 --- a/changes/routerlist_ins_replace +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - If we hit the error case where routerlist_insert() replaces an - existing (old) server descriptor, make sure to remove that - server descriptor from the old_routers list. Fix related to bug - 1776. Bugfix on 0.2.2.18-alpha.

1 0

[tor/release-0.2.2] Merge remote-tracking branch 'karsten/geoip-may2012' into maint-0.2.2
by arma＠torproject.org 18 May '12

18 May '12

commit 0be946c6936265616e92d8c1b3350ece2501c0dc Merge: 436654e 24731ce Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 15 10:00:51 2012 -0400 Merge remote-tracking branch 'karsten/geoip-may2012' into maint-0.2.2 changes/geoip-may2012 | 3 + src/config/geoip | 748 ++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 647 insertions(+), 104 deletions(-)

1 0

[tor/release-0.2.2] Clarify MaxCircuitDirtiness behavior with hidden services. Bug 5259.
by arma＠torproject.org 18 May '12

18 May '12

commit 8e07798284faba6cc2492ca98e50f2e8bcb70934 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 15 11:22:06 2012 -0400 Clarify MaxCircuitDirtiness behavior with hidden services. Bug 5259. --- changes/bug5259 | 3 +++ doc/tor.1.txt | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug5259 b/changes/bug5259 new file mode 100644 index 0000000..bdada58 --- /dev/null +++ b/changes/bug5259 @@ -0,0 +1,3 @@ + o Documentation fixes: + - Clarify the behavior of MaxCircuitDirtiness with hidden service + circuits. Fix for issue 5259. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 25a440d..5f10f68 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -651,8 +651,9 @@ The following options are useful only for clients (that is, if **MaxCircuitDirtiness** __NUM__:: Feel free to reuse a circuit that was first used at most NUM seconds ago, - but never attach a new stream to a circuit that is too old. (Default: 10 - minutes) + but never attach a new stream to a circuit that is too old. For hidden + services, this applies to the __last__ time a circuit was used, not the + first. (Default: 10 minutes) **NodeFamily** __node__,__node__,__...__:: The Tor servers, defined by their identity fingerprints or nicknames,

1 0

[tor/release-0.2.2] Fix a crash bug on SETCIRCUITPURPOSE.
by arma＠torproject.org 18 May '12

18 May '12

commit f2a6eedded9d4dc3c854c1e3091d1f6278ac6e7f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 7 15:22:17 2012 -0400 Fix a crash bug on SETCIRCUITPURPOSE. --- changes/bug5796 | 4 ++++ src/or/control.c | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/changes/bug5796 b/changes/bug5796 new file mode 100644 index 0000000..b92659f --- /dev/null +++ b/changes/bug5796 @@ -0,0 +1,4 @@ + o Minor bugfixes (controller): + - Fix a NULL-pointer derefernce on a badly formed + SETCIRCUITPURPOSE command. Found by mikeyc. Fixes bug 5796; + bugfix on 0.2.2.9-alpha. diff --git a/src/or/control.c b/src/or/control.c index ddfc80e..b41b291 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2389,6 +2389,10 @@ handle_control_setcircuitpurpose(control_connection_t *conn, { const char *purp = find_element_starting_with(args,1,"PURPOSE="); + if (!purp) { + connection_write_str_to_buf("552 No purpose given\r\n", conn); + goto done; + } new_purpose = circuit_purpose_from_string(purp); if (new_purpose == CIRCUIT_PURPOSE_UNKNOWN) { connection_printf_to_buf(conn, "552 Unknown purpose \"%s\"\r\n", purp);

1 0

[tor/release-0.2.2] Merge branch 'bug5796_022_squashed' into maint-0.2.2
by arma＠torproject.org 18 May '12

18 May '12

commit 5905a0b2dbcff8bd07e179750f53a8f010b4a5e0 Merge: 0be946c f2a6eed Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 15 10:04:49 2012 -0400 Merge branch 'bug5796_022_squashed' into maint-0.2.2 changes/bug5796 | 4 ++++ src/or/control.c | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-)

1 0

[tor/release-0.2.2] Reject an additional type of bad date in parse_http_time
by arma＠torproject.org 18 May '12

18 May '12

commit 1abe533b3304619bd8c59f170097ab469af99dc9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 8 21:09:34 2012 -0500 Reject an additional type of bad date in parse_http_time --- src/common/util.c | 5 ++++- src/test/test_util.c | 1 + 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 391b02f..c44fe60 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1416,7 +1416,10 @@ parse_http_time(const char *date, struct tm *tm) /* First, try RFC1123 or RFC850 format: skip the weekday. */ if ((cp = strchr(date, ','))) { - cp += 2; + ++cp; + if (*cp != ' ') + return -1; + ++cp; if (tor_sscanf(cp, "%2u %3s %4u %2u:%2u:%2u GMT", &tm_mday, month, &tm_year, &tm_hour, &tm_min, &tm_sec) == 6) { diff --git a/src/test/test_util.c b/src/test/test_util.c index 5845d77..e239326 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -101,6 +101,7 @@ test_util_parse_http_time(void *arg) test_eq(-1, parse_http_time("Sunday, 32-Aug-94 00:48:22 GMT", &a_time)); test_eq(-1, parse_http_time("Sunday, 3-Ago-04 00:48:22", &a_time)); test_eq(-1, parse_http_time("Sunday, August the third", &a_time)); + test_eq(-1, parse_http_time("Wednesday,,04 Aug 1994 00:48:22 GMT", &a_time)); test_eq(0, parse_http_time("Wednesday, 04 Aug 1994 00:48:22 GMT", &a_time)); test_eq((time_t)775961302UL, tor_timegm(&a_time));

1 0

[tor/release-0.2.2] Correct the bulletproofing of routerlist_insert()
by arma＠torproject.org 18 May '12

18 May '12

commit 3ed4c5dc05a1954a8c68d0f7e9fb802f3155d308 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 10:51:02 2012 -0400 Correct the bulletproofing of routerlist_insert() The original code updated some variables, but forgot to remove a replaced old-routerdesc from rl->old_routers. Related to bug 1776. --- changes/routerlist_ins_replace | 5 +++++ src/or/routerlist.c | 7 +++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/changes/routerlist_ins_replace b/changes/routerlist_ins_replace new file mode 100644 index 0000000..7b442a2 --- /dev/null +++ b/changes/routerlist_ins_replace @@ -0,0 +1,5 @@ + o Minor bugfixes: + - If we hit the error case where routerlist_insert() replaces an + existing (old) server descriptor, make sure to remove that + server descriptor from the old_routers list. Fix related to bug + 1776. Bugfix on 0.2.2.18-alpha. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 86cdb83..d21b40c 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2815,6 +2815,13 @@ routerlist_insert(routerlist_t *rl, routerinfo_t *ri) ri->cache_info.signed_descriptor_digest, &(ri->cache_info)); if (sd_old) { + int idx = sd_old->routerlist_index; + sd_old->routerlist_index = -1; + smartlist_del(rl->old_routers, idx); + if (idx < smartlist_len(rl->old_routers)) { + signed_descriptor_t *d = smartlist_get(rl->old_routers, idx); + d->routerlist_index = idx; + } rl->desc_store.bytes_dropped += sd_old->signed_descriptor_len; sdmap_remove(rl->desc_by_eid_map, sd_old->extra_info_digest); signed_descriptor_free(sd_old);

1 0

[tor/release-0.2.2] Remove more dubiosity in struct tm handling. related to bug5346
by arma＠torproject.org 18 May '12

18 May '12

commit 801923ac2112d1a54eaf4126800724bea90055eb Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 9 10:24:40 2012 -0500 Remove more dubiosity in struct tm handling. related to bug5346 --- changes/bug5346 | 2 ++ src/common/util.c | 15 ++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/changes/bug5346 b/changes/bug5346 index 490eb35..3d21f90 100644 --- a/changes/bug5346 +++ b/changes/bug5346 @@ -3,4 +3,6 @@ Without this patch, If-Modified-Since would behave incorrectly. Fix for bug 5346; bugfix on 0.2.0.2-alpha. Patch from Esteban Manchado Velázques. + - Reject out-of-range times like 23:59:61. Fix for bug 5346; + bugfix on 0.0.8pre3. diff --git a/src/common/util.c b/src/common/util.c index c44fe60..5fa0896 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1268,7 +1268,7 @@ format_rfc1123_time(char *buf, time_t t) tor_assert(tm.tm_wday >= 0); tor_assert(tm.tm_wday <= 6); memcpy(buf, WEEKDAY_NAMES[tm.tm_wday], 3); - tor_assert(tm.tm_wday >= 0); + tor_assert(tm.tm_mon >= 0); tor_assert(tm.tm_mon <= 11); memcpy(buf+8, MONTH_NAMES[tm.tm_mon], 3); } @@ -1298,7 +1298,8 @@ parse_rfc1123_time(const char *buf, time_t *t) tor_free(esc); return -1; } - if (tm_mday > 31 || tm_hour > 23 || tm_min > 59 || tm_sec > 61) { + if (tm_mday < 1 || tm_mday > 31 || tm_hour > 23 || tm_min > 59 || + tm_sec > 60) { char *esc = esc_for_log(buf); log_warn(LD_GENERAL, "Got invalid RFC1123 time %s", esc); tor_free(esc); @@ -1368,7 +1369,7 @@ int parse_iso_time(const char *cp, time_t *t) { struct tm st_tm; - unsigned int year=0, month=0, day=0, hour=100, minute=100, second=100; + unsigned int year=0, month=0, day=0, hour=0, minute=0, second=0; if (tor_sscanf(cp, "%u-%2u-%2u %2u:%2u:%2u", &year, &month, &day, &hour, &minute, &second) < 6) { char *esc = esc_for_log(cp); @@ -1377,7 +1378,7 @@ parse_iso_time(const char *cp, time_t *t) return -1; } if (year < 1970 || month < 1 || month > 12 || day < 1 || day > 31 || - hour > 23 || minute > 59 || second > 61) { + hour > 23 || minute > 59 || second > 60) { char *esc = esc_for_log(cp); log_warn(LD_GENERAL, "ISO time %s was nonsensical", esc); tor_free(esc); @@ -1457,11 +1458,11 @@ parse_http_time(const char *date, struct tm *tm) } if (tm->tm_year < 0 || - tm->tm_mon < 1 || tm->tm_mon > 12 || - tm->tm_mday < 0 || tm->tm_mday > 31 || + tm->tm_mon < 0 || tm->tm_mon > 11 || + tm->tm_mday < 1 || tm->tm_mday > 31 || tm->tm_hour < 0 || tm->tm_hour > 23 || tm->tm_min < 0 || tm->tm_min > 59 || - tm->tm_sec < 0 || tm->tm_sec > 61) + tm->tm_sec < 0 || tm->tm_sec > 60) return -1; /* Out of range, or bad month. */ return 0;

1 0