April 2017 - tor-commits - lists.torproject.org

[tor/master] whitespace fix
by nickm＠torproject.org 27 Apr '17

27 Apr '17

commit 199e61feb560e2368d1eec475dd828118754cf71 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 27 10:55:39 2017 -0400 whitespace fix --- src/test/test_util.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 7013b2f..1f37fc3 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2274,7 +2274,6 @@ test_util_compress_impl(compress_method_t method) "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAAAAAAAAAAAAAAAZ\0", (strlen(buf1)+1)*2); - /* Check whether we can uncompress partial strings */ tor_free(buf1);

1 0

[tor/master] Have a separate entry point for each compresion test
by nickm＠torproject.org 27 Apr '17

27 Apr '17

commit 166aa8d7416989aa0f5e3169a0f08a1d1bea619d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 27 10:25:52 2017 -0400 Have a separate entry point for each compresion test --- src/test/test_buffers.c | 47 +++++++++++++++++++++++++++-------------------- src/test/test_util.c | 42 +++++++++++++++++++++++------------------- 2 files changed, 50 insertions(+), 39 deletions(-) diff --git a/src/test/test_buffers.c b/src/test/test_buffers.c index bb24e7c..ce5ac97 100644 --- a/src/test/test_buffers.c +++ b/src/test/test_buffers.c @@ -689,13 +689,15 @@ test_buffers_compress_impl(compress_method_t method, static void test_buffers_compress(void *arg) { - (void) arg; - compress_method_t methods[] = { - GZIP_METHOD, - ZLIB_METHOD, - LZMA_METHOD, - ZSTD_METHOD - }; + const char *methodname = arg; + tt_assert(methodname); + + compress_method_t method = compression_method_get_by_name(methodname); + tt_int_op(method, OP_NE, UNKNOWN_METHOD); + + if (! tor_compress_supports_method(method)) { + tt_skip(); + } compression_level_t levels[] = { BEST_COMPRESSION, @@ -704,20 +706,16 @@ test_buffers_compress(void *arg) LOW_COMPRESSION }; - for (unsigned m = 0; m < ARRAY_LENGTH(methods); ++m) { - compress_method_t method = methods[m]; - - if (! tor_compress_supports_method(method)) - continue; + for (unsigned l = 0; l < ARRAY_LENGTH(levels); ++l) { + compression_level_t level = levels[l]; - for (unsigned l = 0; l < ARRAY_LENGTH(levels); ++l) { - compression_level_t level = levels[l]; - - test_buffers_compress_impl(method, level, 0); - test_buffers_compress_impl(method, level, 1); - test_buffers_compress_fin_at_chunk_end_impl(method, level); - } + test_buffers_compress_impl(method, level, 0); + test_buffers_compress_impl(method, level, 1); + test_buffers_compress_fin_at_chunk_end_impl(method, level); } + + done: + ; } static const uint8_t *tls_read_ptr; @@ -844,11 +842,20 @@ struct testcase_t buffer_tests[] = { { "allocation_tracking", test_buffer_allocation_tracking, TT_FORK, NULL, NULL }, { "time_tracking", test_buffer_time_tracking, TT_FORK, NULL, NULL }, - { "compress", test_buffers_compress, TT_FORK, NULL, NULL }, { "tls_read_mocked", test_buffers_tls_read_mocked, 0, NULL, NULL }, { "chunk_size", test_buffers_chunk_size, 0, NULL, NULL }, { "find_contentlen", test_buffers_find_contentlen, 0, NULL, NULL }, + + { "compress/zlib", test_buffers_compress, TT_FORK, + &passthrough_setup, (char*)"deflate" }, + { "compress/gzip", test_buffers_compress, TT_FORK, + &passthrough_setup, (char*)"gzip" }, + { "compress/zstd", test_buffers_compress, TT_FORK, + &passthrough_setup, (char*)"x-zstd" }, + { "compress/lzma", test_buffers_compress, TT_FORK, + &passthrough_setup, (char*)"x-lzma" }, + END_OF_TESTCASES }; diff --git a/src/test/test_util.c b/src/test/test_util.c index 920766f..1ac1e29 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2351,13 +2351,15 @@ test_util_compress_stream_impl(compress_method_t method, static void test_util_compress(void *arg) { - (void) arg; - compress_method_t methods[] = { - GZIP_METHOD, - ZLIB_METHOD, - LZMA_METHOD, - ZSTD_METHOD - }; + const char *methodname = arg; + tt_assert(methodname); + + compress_method_t method = compression_method_get_by_name(methodname); + tt_int_op(method, OP_NE, UNKNOWN_METHOD); + + if (! tor_compress_supports_method(method)) { + tt_skip(); + } compression_level_t levels[] = { BEST_COMPRESSION, @@ -2366,19 +2368,14 @@ test_util_compress(void *arg) LOW_COMPRESSION }; - for (unsigned m = 0; m < ARRAY_LENGTH(methods); ++m) { - compress_method_t method = methods[m]; + test_util_compress_impl(method); - if (! tor_compress_supports_method(method)) - continue; - - test_util_compress_impl(method); - - for (unsigned l = 0; l < ARRAY_LENGTH(levels); ++l) { - compression_level_t level = levels[l]; - test_util_compress_stream_impl(method, level); - } + for (unsigned l = 0; l < ARRAY_LENGTH(levels); ++l) { + compression_level_t level = levels[l]; + test_util_compress_stream_impl(method, level); } + done: + ; } static void @@ -5720,6 +5717,10 @@ test_util_htonll(void *arg) #define UTIL_TEST(name, flags) \ { #name, test_util_ ## name, flags, NULL, NULL } +#define COMPRESS(name, identifier) \ + { "compress/" #name, test_util_compress, 0, &passthrough_setup, \ + (char*)(identifier) } + #ifdef _WIN32 #define UTIL_TEST_NO_WIN(n, f) { #n, NULL, TT_SKIP, NULL, NULL } #define UTIL_TEST_WIN_ONLY(n, f) UTIL_TEST(n, (f)) @@ -5744,7 +5745,10 @@ struct testcase_t util_tests[] = { UTIL_LEGACY(strmisc), UTIL_TEST(parse_integer, 0), UTIL_LEGACY(pow2), - UTIL_LEGACY(compress), + COMPRESS(zlib, "deflate"), + COMPRESS(gzip, "gzip"), + COMPRESS(lzma, "x-lzma"), + COMPRESS(zstd, "x-zstd"), UTIL_TEST(gzip_compression_bomb, TT_FORK), UTIL_LEGACY(datadir), UTIL_LEGACY(memarea),

1 0

[tor/master] Fix handling of "final" flag in zstd decompression
by nickm＠torproject.org 27 Apr '17

27 Apr '17

commit 39cfaba9e26d1ca0a9b9db3ed2c2e4ba1ff9d533 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 27 10:42:05 2017 -0400 Fix handling of "final" flag in zstd decompression We were returning "DONE" on truncated input streams, which was not what we wanted. --- src/common/compress_zstd.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/common/compress_zstd.c b/src/common/compress_zstd.c index 9c134fd..99d05c3 100644 --- a/src/common/compress_zstd.c +++ b/src/common/compress_zstd.c @@ -316,7 +316,10 @@ tor_zstd_compress_process(tor_zstd_compress_state_t *state, return TOR_COMPRESS_BUFFER_FULL; } - if (state->compress && finish) { + if (!finish) { + // We're not done with the input, so no need to flush. + return TOR_COMPRESS_OK; + } else if (state->compress && finish) { retval = ZSTD_endStream(state->u.compress_stream, &output); *out = (char *)output.dst + output.pos; @@ -333,9 +336,14 @@ tor_zstd_compress_process(tor_zstd_compress_state_t *state, // epilogue. if (retval > 0) return TOR_COMPRESS_BUFFER_FULL; + + return TOR_COMPRESS_DONE; + } else { + // ZSTD_flushStream returns 0 if the frame is done, or >0 if it + // is incomplete. + return (retval == 0) ? TOR_COMPRESS_DONE : TOR_COMPRESS_OK; } - return finish ? TOR_COMPRESS_DONE : TOR_COMPRESS_OK; #else // HAVE_ZSTD. (void)state; (void)out;

1 0

[tor/master] Re-enable the partial-input test for zstd.
by nickm＠torproject.org 27 Apr '17

27 Apr '17

commit ba9f235e17f24245698de30875653856d2d177d6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 27 10:43:38 2017 -0400 Re-enable the partial-input test for zstd. There were two issues here: first, zstd didn't exhibit the right behavior unless it got a very large input. That's fine. The second issue was a genuine bug, fixed by 39cfaba9e26d1ca0a. --- src/test/test_util.c | 51 +++++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 1ac1e29..7013b2f 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2274,31 +2274,34 @@ test_util_compress_impl(compress_method_t method) "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAAAAAAAAAAAAAAAZ\0", (strlen(buf1)+1)*2); - if (method != ZSTD_METHOD) { - /* Check whether we can uncompress partial strings unless we are Zstandard, - * which doesn't seem to support this. */ - - tor_free(buf1); - tor_free(buf2); - tor_free(buf3); - - buf1 = - tor_strdup("String with low redundancy that won't be compressed much."); - tt_assert(!tor_compress(&buf2, &len1, buf1, strlen(buf1)+1, method)); - tt_int_op(len1, OP_GT, 16); - /* when we allow an incomplete string, we should succeed.*/ - tt_assert(!tor_uncompress(&buf3, &len2, buf2, len1-16, - method, 0, LOG_INFO)); - tt_assert(len2 > 5); - buf3[len2]='\0'; - tt_assert(!strcmpstart(buf1, buf3)); - - /* when we demand a complete string, this must fail. */ - tor_free(buf3); - tt_assert(tor_uncompress(&buf3, &len2, buf2, len1-16, - method, 1, LOG_INFO)); - tt_assert(buf3 == NULL); + + /* Check whether we can uncompress partial strings */ + + tor_free(buf1); + tor_free(buf2); + tor_free(buf3); + + size_t b1len = 1<<10; + if (method == ZSTD_METHOD) { + // zstd needs a big input before it starts generating output that it + // can partially decompress. + b1len = 1<<18; } + buf1 = tor_malloc(b1len); + crypto_rand(buf1, b1len); + tt_assert(!tor_compress(&buf2, &len1, buf1, b1len, method)); + tt_int_op(len1, OP_GT, 16); + /* when we allow an incomplete output we should succeed.*/ + tt_assert(!tor_uncompress(&buf3, &len2, buf2, len1-16, + method, 0, LOG_INFO)); + tt_int_op(len2, OP_GT, 5); + tt_int_op(len2, OP_LE, len1); + tt_assert(fast_memeq(buf1, buf3, len2)); + /* when we demand a complete output, this must fail. */ + tor_free(buf3); + tt_assert(tor_uncompress(&buf3, &len2, buf2, len1-16, + method, 1, LOG_INFO)); + tt_assert(buf3 == NULL); done: tor_free(buf1);

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 27 Apr '17

27 Apr '17

commit 18c032be3133ee4683cd5cbd964198bcaa75b8ea Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 27 14:45:23 2017 +0000 Update translations for https_everywhere --- eo/ssl-observatory.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eo/ssl-observatory.dtd b/eo/ssl-observatory.dtd index 5299986..686e004 100644 --- a/eo/ssl-observatory.dtd +++ b/eo/ssl-observatory.dtd @@ -67,10 +67,10 @@ Mouseover the options for further details:">--> "Kontroli atestilojn ankaŭ se Tor ne uzeblas"> <!ENTITY ssl-observatory.prefs.nonanon_tooltip -"We will still try to keep the data anonymous, but this option is less secure"> +"Ni plue provos anonimigi datumojn, sed ĉi tiu agordo estas malpli sekura"> <!ENTITY ssl-observatory.prefs.priv_dns -"Submit and check certificates for non-public DNS names"> +"Alŝuti kaj kontroli atestilojn de nepublikaj DNS-nomoj"> <!ENTITY ssl-observatory.prefs.priv_dns_tooltip "Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system.">

1 0

[translation/exoneratorproperties_completed] Update translations for exoneratorproperties_completed
by translation＠torproject.org 27 Apr '17

27 Apr '17

commit b4755eba9125010f76873d6aed7ea13132256926 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 27 14:18:31 2017 +0000 Update translations for exoneratorproperties_completed --- de/exonerator.properties | 2 ++ zh_CN/exonerator.properties | 2 ++ 2 files changed, 4 insertions(+) diff --git a/de/exonerator.properties b/de/exonerator.properties index 8fa3d79..9649f81 100644 --- a/de/exonerator.properties +++ b/de/exonerator.properties @@ -49,4 +49,6 @@ footer.aboutexonerator.heading=Über ExoneraTor footer.aboutexonerator.body=Der ExoneraTor-Dienst basiert auf einer Datenbank von IP-Adressen, die Teil des Tor-Netzwerks sind oder waren. Dieser Dienst beantwortet die Frage, ob es an einem bestimmten Tag einen Tor-Server mit einer bestimmten IP-Adresse gegeben hat. ExoneraTor kann in einigen Fällen mehr als nur eine IP-Adresse pro Tor-Server speichern, falls ein Tor-Server eine andere IP-Adresse für ausgehende Verbindungen verwendet hat als die IP-Adresse um sich im Tor-Netzwerk zu registrieren. ExoneraTor speichert außerdem ob ein Tor-Server Verbindungen ins offene Internet zugelassen hat oder nicht. footer.trademark.text="Tor" und das "Onion Logo" sind %s von The Tor Project, Inc. footer.trademark.link=eingetragene Warenzeichen +footer.language.name=Englisch +footer.language.text=Diese Seite ist auch in den folgenden Sprachen verfügbar\: diff --git a/zh_CN/exonerator.properties b/zh_CN/exonerator.properties index 460ee17..8907b41 100644 --- a/zh_CN/exonerator.properties +++ b/zh_CN/exonerator.properties @@ -49,4 +49,6 @@ footer.aboutexonerator.heading=关于 ExoneraTor footer.aboutexonerator.body=ExoneraTor 提供了 Tor 网络中节点 IP 地址的数据库，可用于查询某个 IP 地址在特定时间是否为 Tor 中继。如果中继使用了与注册在 Tor 网络不同的 IP 地址用作互联网出口，ExoneraTor 可能对每个中继存储超过一个 IP 地址；并且它还会存储一个中继点在当时是否允许来自 Tor 流量的被传出到互联网。 footer.trademark.text=“Tor”和“Onion Logo”是 Tor Project, Inc 的 %s。 footer.trademark.link=注册商标 +footer.language.name=英语 +footer.language.text=本页面提供以下语言：

1 0

[translation/exoneratorproperties] Update translations for exoneratorproperties
by translation＠torproject.org 27 Apr '17

27 Apr '17

commit 3d432e855116b18db8852466e2f2714d4fdf017e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 27 14:18:26 2017 +0000 Update translations for exoneratorproperties --- de/exonerator.properties | 4 ++-- zh_CN/exonerator.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/de/exonerator.properties b/de/exonerator.properties index 928c4a2..9649f81 100644 --- a/de/exonerator.properties +++ b/de/exonerator.properties @@ -49,6 +49,6 @@ footer.aboutexonerator.heading=Über ExoneraTor footer.aboutexonerator.body=Der ExoneraTor-Dienst basiert auf einer Datenbank von IP-Adressen, die Teil des Tor-Netzwerks sind oder waren. Dieser Dienst beantwortet die Frage, ob es an einem bestimmten Tag einen Tor-Server mit einer bestimmten IP-Adresse gegeben hat. ExoneraTor kann in einigen Fällen mehr als nur eine IP-Adresse pro Tor-Server speichern, falls ein Tor-Server eine andere IP-Adresse für ausgehende Verbindungen verwendet hat als die IP-Adresse um sich im Tor-Netzwerk zu registrieren. ExoneraTor speichert außerdem ob ein Tor-Server Verbindungen ins offene Internet zugelassen hat oder nicht. footer.trademark.text="Tor" und das "Onion Logo" sind %s von The Tor Project, Inc. footer.trademark.link=eingetragene Warenzeichen -footer.language.name=English -footer.language.text=This page is also available in the following languages\: +footer.language.name=Englisch +footer.language.text=Diese Seite ist auch in den folgenden Sprachen verfügbar\: diff --git a/zh_CN/exonerator.properties b/zh_CN/exonerator.properties index 9c10c53..8907b41 100644 --- a/zh_CN/exonerator.properties +++ b/zh_CN/exonerator.properties @@ -49,6 +49,6 @@ footer.aboutexonerator.heading=关于 ExoneraTor footer.aboutexonerator.body=ExoneraTor 提供了 Tor 网络中节点 IP 地址的数据库，可用于查询某个 IP 地址在特定时间是否为 Tor 中继。如果中继使用了与注册在 Tor 网络不同的 IP 地址用作互联网出口，ExoneraTor 可能对每个中继存储超过一个 IP 地址；并且它还会存储一个中继点在当时是否允许来自 Tor 流量的被传出到互联网。 footer.trademark.text=“Tor”和“Onion Logo”是 Tor Project, Inc 的 %s。 footer.trademark.link=注册商标 -footer.language.name=English -footer.language.text=This page is also available in the following languages\: +footer.language.name=英语 +footer.language.text=本页面提供以下语言：

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 27 Apr '17

27 Apr '17

commit 7ef3fa8cd647d763d8872103a33f87d0459b1e42 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 27 14:16:47 2017 +0000 Update translations for torbutton-torbuttondtd --- zh_CN/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/torbutton.dtd b/zh_CN/torbutton.dtd index c097ca4..32e1060 100644 --- a/zh_CN/torbutton.dtd +++ b/zh_CN/torbutton.dtd @@ -12,7 +12,7 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "点此初始化 Torbutton"> <!ENTITY torbutton.prefs.security_settings "Tor 浏览器安全设置"> -<!ENTITY torbutton.prefs.restore_defaults "恢复默认值"> +<!ENTITY torbutton.prefs.restore_defaults "恢复默认"> <!ENTITY torbutton.prefs.custom_warning "您自定义的浏览器设置导致了不安全的安全设置。出于安全和隐私考虑，我们建议您选择一个默认的安全级别。"> <!ENTITY torbutton.cookiedialog.title "管理受保护的 Cookie"> <!ENTITY torbutton.cookiedialog.lockCol "受保护">

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 27 Apr '17

27 Apr '17

commit ce4d669807a020c2a8f14ea00a3ae91a5e748bab Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 27 14:15:20 2017 +0000 Update translations for whisperback --- zh_CN/zh_CN.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index 6c3a902..d3c24fb 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -6,13 +6,14 @@ # khi, 2013 # 郑华 <hua5679(a)gmail.com>, 2012 # xtoaster <zhazhenzhong(a)gmail.com>, 2012 +# 吴致远 <wuzhiyuan.cn(a)gmail.com>, 2017 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-03-21 08:24+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2017-04-27 13:52+0000\n" +"Last-Translator: 吴致远 <wuzhiyuan.cn(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -44,11 +45,11 @@ msgstr "在配置文件 /etc/whisperback/config.py、~/.whisperback/config.py #: ../whisperBack/gui.py:110 msgid "Name of the affected software" -msgstr "" +msgstr "受影响软件的名称" #: ../whisperBack/gui.py:112 msgid "Exact steps to reproduce the error" -msgstr "" +msgstr "重现问题的步骤" #: ../whisperBack/gui.py:114 msgid "Actual result and description of the error"

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 27 Apr '17

27 Apr '17

commit dffe34967c3f3228940d86b809d418e234508552 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 27 14:15:16 2017 +0000 Update translations for torcheck_completed --- de/torcheck.po | 4 ++-- zh_CN/torcheck.po | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/de/torcheck.po b/de/torcheck.po index a3d0b5f..b836c84 100644 --- a/de/torcheck.po +++ b/de/torcheck.po @@ -27,8 +27,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: stefanf <stefan-josia.froschauer(a)deutschepost.de>\n" +"PO-Revision-Date: 2017-04-27 14:09+0000\n" +"Last-Translator: stefanf <inactive+stefanf(a)transifex.com>\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/zh_CN/torcheck.po b/zh_CN/torcheck.po index 9fe4be8..ea096f6 100644 --- a/zh_CN/torcheck.po +++ b/zh_CN/torcheck.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" +"PO-Revision-Date: 2017-04-27 13:51+0000\n" "Last-Translator: khi\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0