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

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 28 Sep '17

28 Sep '17

commit 40d120e93094a1edfe227fde396214497067ae57 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 28 14:45:44 2017 +0000 Update translations for https_everywhere --- ga/https-everywhere.dtd | 22 +++++++++++----------- ga/https-everywhere.properties | 8 ++++---- ga/ssl-observatory.dtd | 2 +- hi/https-everywhere.dtd | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ga/https-everywhere.dtd b/ga/https-everywhere.dtd index c7f2bbaaa..37b2ba941 100644 --- a/ga/https-everywhere.dtd +++ b/ga/https-everywhere.dtd @@ -1,14 +1,14 @@ <!ENTITY https-everywhere.about.title "Faoi HTTPS Everywhere"> <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> -<!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites."> +<!ENTITY https-everywhere.about.ext_description "Criptigh an Gréasán! Bain úsáid as slándáil HTTPS go huathoibríoch ar go leor suíomh."> <!ENTITY https-everywhere.about.version "Leagan"> <!ENTITY https-everywhere.about.add_new_rule "Cuir Riail Nua Leis"> -<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF"> -<!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences"> +<!ENTITY https-everywhere.menu.donate_eff_imperative "Tabhair síntiús airgid don EFF"> +<!ENTITY https-everywhere.menu.observatory "Sainroghanna SSL Observatory"> <!ENTITY https-everywhere.menu.globalEnable "Cumasaigh HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.blockUnencryptedRequests "Cuir cosc ar gach iarratas gan chriptiú"> -<!ENTITY https-everywhere.menu.showCounter "Taispeáin an Cuntar"> +<!ENTITY https-everywhere.menu.blockUnencryptedRequests "Cuir cosc ar gach iarratas neamhchriptithe"> +<!ENTITY https-everywhere.menu.showCounter "Taispeáin Áiritheoir"> <!ENTITY https-everywhere.menu.viewAllRules "Taispeáin Gach Riail"> <!ENTITY https-everywhere.options.importSettings "Iompórtáil Socruithe"> @@ -19,16 +19,16 @@ <!ENTITY https-everywhere.prefs.reset_defaults "Fill ar Réamhshocruithe"> <!ENTITY https-everywhere.chrome.stable_rules "Rialacha cobhsaí"> -<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> +<!ENTITY https-everywhere.chrome.stable_rules_description "Fórsáil ceangal criptithe leis na suímh seo:"> <!ENTITY https-everywhere.chrome.experimental_rules "Rialacha turgnamhacha"> -<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default."> -<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site"> -<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site"> -<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host"> +<!ENTITY https-everywhere.chrome.experimental_rules_description "D'fhéadfadh seo a bheith ina chúis le rabhaidh nó le hearráidí. Díchumasaithe de réir réamhshocraithe."> +<!ENTITY https-everywhere.chrome.add_rule "Cuir riail i bhfeidhm ar an suíomh seo"> +<!ENTITY https-everywhere.chrome.add_new_rule "Cuir riail nua i bhfeidhm ar an suíomh seo"> +<!ENTITY https-everywhere.chrome.always_https_for_host "Bain úsáid as https i gcónaí leis an óstríomhaire seo"> <!ENTITY https-everywhere.chrome.host "Óstríomhaire:"> <!ENTITY https-everywhere.chrome.show_advanced "Taispeáin na hardroghanna"> <!ENTITY https-everywhere.chrome.hide_advanced "Folaigh na hardroghanna"> <!ENTITY https-everywhere.chrome.rule_name "Ainm na rialach"> <!ENTITY https-everywhere.chrome.regex "A mheaitseálann slonn"> -<!ENTITY https-everywhere.chrome.redirect_to "Redirect to"> +<!ENTITY https-everywhere.chrome.redirect_to "Atreoraigh chuig"> <!ENTITY https-everywhere.chrome.status_cancel_button "Cuir ar ceal"> diff --git a/ga/https-everywhere.properties b/ga/https-everywhere.properties index b975eb781..48fd039b0 100644 --- a/ga/https-everywhere.properties +++ b/ga/https-everywhere.properties @@ -2,7 +2,7 @@ https-everywhere.menu.globalEnable = Cumasaigh HTTPS Everywhere https-everywhere.menu.globalDisable = Díchumasaigh HTTPS Everywhere https-everywhere.menu.enableDisable = Cumasaigh / Díchumasaigh Rialacha https-everywhere.menu.noRules = (Níl aon rialacha ar an leathanach seo) -https-everywhere.menu.unknownRules = (Rules for This Page Unknown) -https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar. -https-everywhere.migration.notification0 = In order to implement a crucial fix, this update resets your HTTPS Everywhere rule preferences to their default values. -https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests +https-everywhere.menu.unknownRules = (Ní fios na rialacha ar an leathanach seo) +https-everywhere.toolbar.hint = Tá HTTPS Everywhere ar siúl anois. Is féidir leat é a mhúchadh ar shuímh ar leith leis an deilbhín sa mbarra suímh. +https-everywhere.migration.notification0 = Fillfear do chuid rialacha HTTPS Everywhere ar réamhshocruithe leis an nuashonrú seo, chun ceartúchán ríthábhachtach a chur i bhfeidhm. +https-everywhere.menu.ruleset-tests = Cuir Tástálacha Rialacha HTTPS Everywhere ar siúl diff --git a/ga/ssl-observatory.dtd b/ga/ssl-observatory.dtd index 393e514a4..b21dcfa3a 100644 --- a/ga/ssl-observatory.dtd +++ b/ga/ssl-observatory.dtd @@ -86,7 +86,7 @@ looked at. Mouseover the options for further details:"> <!ENTITY ssl-observatory.prefs.show "Taispeáin na hardroghanna"> -<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences"> +<!ENTITY ssl-observatory.prefs.title "Sainroghanna SSL Observatory"> <!ENTITY ssl-observatory.prefs.use "Use the Observatory?"> <!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory"> diff --git a/hi/https-everywhere.dtd b/hi/https-everywhere.dtd index a6e8caae3..0725fefd6 100644 --- a/hi/https-everywhere.dtd +++ b/hi/https-everywhere.dtd @@ -12,7 +12,7 @@ <!ENTITY https-everywhere.menu.viewAllRules "View All Rules"> <!ENTITY https-everywhere.options.importSettings "Import Settings"> -<!ENTITY https-everywhere.options.import "Import"> +<!ENTITY https-everywhere.options.import "आयात"> <!ENTITY https-everywhere.options.imported "Your settings have been imported."> <!ENTITY https-everywhere.prefs.export_settings "Export Settings">

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 28 Sep '17

28 Sep '17

commit ffad2bb615fff096ddfdb5e4863f5321a0216535 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 28 14:45:26 2017 +0000 Update translations for whisperback --- hi/hi.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hi/hi.po b/hi/hi.po index 08e12abd8..e260dfcdd 100644 --- a/hi/hi.po +++ b/hi/hi.po @@ -9,7 +9,7 @@ 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-09-25 20:05+0000\n" +"PO-Revision-Date: 2017-09-28 14:39+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Hindi (http://www.transifex.com/otf/torproject/language/hi/)\n" "MIME-Version: 1.0\n" @@ -212,4 +212,4 @@ msgstr "मदद" #: ../data/whisperback.ui.h:30 msgid "Send" -msgstr "" +msgstr "भेजना"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 28 Sep '17

28 Sep '17

commit 4ea6554ad02d8d00d54e0a9ac353ac5ddda2e919 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 28 14:45:06 2017 +0000 Update translations for bridgedb --- ga/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ga/LC_MESSAGES/bridgedb.po b/ga/LC_MESSAGES/bridgedb.po index f09833796..e5eb9b0c4 100644 --- a/ga/LC_MESSAGES/bridgedb.po +++ b/ga/LC_MESSAGES/bridgedb.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2017-09-28 14:14+0000\n" +"PO-Revision-Date: 2017-09-28 14:16+0000\n" "Last-Translator: Kevin Scannell <kscanne(a)gmail.com>\n" "Language-Team: Irish (http://www.transifex.com/otf/torproject/language/ga/)\n" "MIME-Version: 1.0\n" @@ -60,7 +60,7 @@ msgstr "Taispeáin Cód QR" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "" +msgstr "Do chuid línte droichid mar chód QR" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -255,7 +255,7 @@ msgstr "Cad is droichead ann?" #: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "" +msgstr "Is éard atá i %snDroichead%s ná athsheachadán Tor a chabhraíonn leat cinsireacht a sheachaint." #: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 28 Sep '17

28 Sep '17

commit 2364b3a2a98f2ac6004f293ef4fe22379bc806d3 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 28 14:15:06 2017 +0000 Update translations for bridgedb --- ga/LC_MESSAGES/bridgedb.po | 60 +++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/ga/LC_MESSAGES/bridgedb.po b/ga/LC_MESSAGES/bridgedb.po index b117c04cf..f09833796 100644 --- a/ga/LC_MESSAGES/bridgedb.po +++ b/ga/LC_MESSAGES/bridgedb.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2017-09-26 02:46+0000\n" +"PO-Revision-Date: 2017-09-28 14:14+0000\n" "Last-Translator: Kevin Scannell <kscanne(a)gmail.com>\n" "Language-Team: Irish (http://www.transifex.com/otf/torproject/language/ga/)\n" "MIME-Version: 1.0\n" @@ -48,7 +48,7 @@ msgstr "Logchomhad athruithe" #: bridgedb/https/templates/base.html:88 msgid "Contact" -msgstr "" +msgstr "Teagmháil" #: bridgedb/https/templates/bridges.html:35 msgid "Select All" @@ -73,24 +73,24 @@ msgstr "Ochón ó!" #: bridgedb/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode." -msgstr "" +msgstr "Dealraíonn sé gur tharla earráid agus do chód QR á fháil." #: bridgedb/https/templates/bridges.html:73 msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "" +msgstr "Tá do chuid línte droichid laistigh den chód QR seo. Is féidir é a scanadh le léitheoir QR chun na línte droichid a chóipeáil go dtí fón póca nó gléasanna soghluaiste eile." #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." -msgstr "" +msgstr "Níl aon droichead ar fáil faoi láthair..." #: bridgedb/https/templates/bridges.html:132 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " "type!" -msgstr "" +msgstr "B'fhéidir gur chóir duit %s dul siar %s agus cineál difriúil droichid a roghnú!" #: bridgedb/https/templates/index.html:11 #, python-format @@ -100,7 +100,7 @@ msgstr "Céim %s1%s" #: bridgedb/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "" +msgstr "Íoslódáil %s Brabhsálaí Tor %s" #: bridgedb/https/templates/index.html:25 #, python-format @@ -110,7 +110,7 @@ msgstr "Céim %s2%s" #: bridgedb/https/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "" +msgstr "Faigh %s droichid %s" #: bridgedb/https/templates/index.html:36 #, python-format @@ -120,7 +120,7 @@ msgstr "Céi %s3%s" #: bridgedb/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "" +msgstr "Anois %s cuir na droichid le Brabhsálaí Tor %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -129,7 +129,7 @@ msgstr "" #: bridgedb/https/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "" +msgstr "%sN%sí theastaíonn uaim ach droichid!" #: bridgedb/https/templates/options.html:51 msgid "Advanced Options" @@ -141,7 +141,7 @@ msgstr "Níl" #: bridgedb/https/templates/options.html:87 msgid "none" -msgstr "" +msgstr "dada" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -157,11 +157,11 @@ msgstr "%sT%sá!" #: bridgedb/https/templates/options.html:147 #, python-format msgid "%sG%set Bridges" -msgstr "" +msgstr "%sF%saigh Droichid" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" -msgstr "" +msgstr "[Is teachtaireacht uathoibríoch é seo; ná tabhair freagra.]" #: bridgedb/strings.py:45 msgid "Here are your bridges:" @@ -172,12 +172,12 @@ msgstr "Seo do chuid droichead:" msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "" +msgstr "Sháraigh tú an teorainn ráta. Tóg go bog é! Is é %s uair an chloig an tréimhse is lú a cheadaítear idir ríomhphoist. Déanfar neamhaird de aon teachtaireacht eile le linn na tréimhse seo." #: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" -msgstr "" +msgstr "ORDUITHE: (úsáid na hORDUITHE seo chun níos mó ná rogha amháin a shocrú san am céanna)" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: bridgedb/strings.py:53 @@ -187,7 +187,7 @@ msgstr "Fáilte go BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" -msgstr "" +msgstr "CINEÁLACHA iompair a dtacaítear leo faoi láthair:" #: bridgedb/strings.py:56 #, python-format @@ -210,7 +210,7 @@ msgstr "Eochracha Poiblí" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "" +msgstr "Leipreacháin a scríobh an ríomhphost seo le haghaidh %s ar %s ag %s." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". @@ -250,7 +250,7 @@ msgstr "" #: bridgedb/strings.py:101 msgid "What are bridges?" -msgstr "" +msgstr "Cad is droichead ann?" #: bridgedb/strings.py:102 #, python-format @@ -271,13 +271,13 @@ msgstr "" #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" -msgstr "" +msgstr "Níl mo chuid droichead ag obair! Tá cúnamh uaim!" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "" +msgstr "Mura bhfuil Tor ag obair duit, seol ríomhphost chuig %s." #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". @@ -291,32 +291,32 @@ msgstr "" #: bridgedb/strings.py:128 msgid "Here are your bridge lines:" -msgstr "" +msgstr "Seo do chuid línte droichid:" #: bridgedb/strings.py:129 msgid "Get Bridges!" -msgstr "" +msgstr "Faigh Droichid!" #: bridgedb/strings.py:133 msgid "Please select options for bridge type:" -msgstr "" +msgstr "Roghanna don chineál droichid:" #: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" -msgstr "" +msgstr "An dteastaíonn seoltaí IPv6 uait?" #: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" -msgstr "" +msgstr "An dteastaíonn %s uait?" #: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." -msgstr "" +msgstr "Níl do bhrabhsálaí ag taispeáint íomhánna mar is ceart." #: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." -msgstr "" +msgstr "Cuir isteach na carachtair ón íomhá thuas..." #: bridgedb/strings.py:144 msgid "How to start using your bridges" @@ -356,18 +356,18 @@ msgstr "" #: bridgedb/strings.py:167 msgid "Displays this message." -msgstr "" +msgstr "Taispeánann sé an teachtaireacht seo." #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. #: bridgedb/strings.py:171 msgid "Request vanilla bridges." -msgstr "" +msgstr "Iarr gnáthdhroichid." #: bridgedb/strings.py:172 msgid "Request IPv6 bridges." -msgstr "" +msgstr "Iarr droichid IPv6" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". #: bridgedb/strings.py:174

1 0

[tor/master] Correct docs for config_lines_dup_and_filter
by nickm＠torproject.org 28 Sep '17

28 Sep '17

commit 55873107d02085927cb9ffbe667b468af403283e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 28 09:40:04 2017 -0400 Correct docs for config_lines_dup_and_filter --- src/common/confline.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/common/confline.c b/src/common/confline.c index f2fbe9c8e..04545bc2c 100644 --- a/src/common/confline.c +++ b/src/common/confline.c @@ -342,7 +342,8 @@ config_lines_dup(const config_line_t *inp) } /** Return a newly allocated deep copy of the lines in inp, - * but only the ones that match key. */ + * but only the ones whose keys begin with key (case-insensitive). + * If key is NULL, do not filter. */ config_line_t * config_lines_dup_and_filter(const config_line_t *inp, const char *key)

1 0

[tor/master] unit test for config_lines_dup_and_filter
by nickm＠torproject.org 28 Sep '17

28 Sep '17

commit 5b6f2713cd7d6e1611fd3d8bc8e456a91d06e2f1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 28 09:40:17 2017 -0400 unit test for config_lines_dup_and_filter --- src/test/test_config.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/src/test/test_config.c b/src/test/test_config.c index 39f9e3ba9..0941931bc 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -5372,6 +5372,41 @@ test_config_include_flag_defaults_only(void *data) tor_free(dir); } +static void +test_config_dup_and_filter(void *arg) +{ + (void)arg; + /* Test normal input. */ + config_line_t *line = NULL; + config_line_append(&line, "abc", "def"); + config_line_append(&line, "ghi", "jkl"); + config_line_append(&line, "ABCD", "mno"); + + config_line_t *line_dup = config_lines_dup_and_filter(line, "aBc"); + tt_ptr_op(line_dup, OP_NE, NULL); + tt_ptr_op(line_dup->next, OP_NE, NULL); + tt_ptr_op(line_dup->next->next, OP_EQ, NULL); + + tt_str_op(line_dup->key, OP_EQ, "abc"); + tt_str_op(line_dup->value, OP_EQ, "def"); + tt_str_op(line_dup->next->key, OP_EQ, "ABCD"); + tt_str_op(line_dup->next->value, OP_EQ, "mno"); + + /* empty output */ + config_free_lines(line_dup); + line_dup = config_lines_dup_and_filter(line, "skdjfsdkljf"); + tt_ptr_op(line_dup, OP_EQ, NULL); + + /* empty input */ + config_free_lines(line_dup); + line_dup = config_lines_dup_and_filter(NULL, "abc"); + tt_ptr_op(line_dup, OP_EQ, NULL); + + done: + config_free_lines(line); + config_free_lines(line_dup); +} + #define CONFIG_TEST(name, flags) \ { #name, test_config_ ## name, flags, NULL, NULL } @@ -5411,6 +5446,7 @@ struct testcase_t config_tests[] = { CONFIG_TEST(include_flag_both_without, TT_FORK), CONFIG_TEST(include_flag_torrc_only, TT_FORK), CONFIG_TEST(include_flag_defaults_only, TT_FORK), + CONFIG_TEST(dup_and_filter, 0), END_OF_TESTCASES };

1 0

[tor/master] Unit test for case where %included dir exists but is unreadable
by nickm＠torproject.org 28 Sep '17

28 Sep '17

commit f71ff0cabc36b5aeb790f133c00ac1ccfdfefacb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 28 09:49:30 2017 -0400 Unit test for case where %included dir exists but is unreadable --- src/test/test_config.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/src/test/test_config.c b/src/test/test_config.c index 0941931bc..e9cdf9ddb 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -4949,6 +4949,41 @@ test_config_include_empty_file_folder(void *data) tor_free(dir); } +#ifndef _WIN32 +static void +test_config_include_no_permission(void *data) +{ + (void)data; + config_line_t *result = NULL; + + char *folder_path = NULL; + char *dir = tor_strdup(get_fname("test_include_forbidden_folder")); + tt_ptr_op(dir, OP_NE, NULL); + + tt_int_op(mkdir(dir, 0700), OP_EQ, 0); + + tor_asprintf(&folder_path, "%s"PATH_SEPARATOR"forbidden_dir", dir); + tt_int_op(mkdir(folder_path, 0100), OP_EQ, 0); + + char torrc_contents[1000]; + tor_snprintf(torrc_contents, sizeof(torrc_contents), + "%%include %s\n", + folder_path); + + int include_used; + tt_int_op(config_get_lines_include(torrc_contents, &result, 0,&include_used), + OP_EQ, -1); + tt_ptr_op(result, OP_EQ, NULL); + + done: + config_free_lines(result); + tor_free(folder_path); + if (dir) + chmod(dir, 0700); + tor_free(dir); +} +#endif + static void test_config_include_recursion_before_after(void *data) { @@ -5437,6 +5472,9 @@ struct testcase_t config_tests[] = { CONFIG_TEST(include_does_not_exist, 0), CONFIG_TEST(include_error_in_included_file, 0), CONFIG_TEST(include_empty_file_folder, 0), +#ifndef _WIN32 + CONFIG_TEST(include_no_permission, 0), +#endif CONFIG_TEST(include_recursion_before_after, 0), CONFIG_TEST(include_recursion_after_only, 0), CONFIG_TEST(include_folder_order, 0),

1 0

[tor/master] Move around some LCOV_EXCLs in src/common
by nickm＠torproject.org 28 Sep '17

28 Sep '17

commit a64d79ca4c5699be161a54d94e0e6c0f7d06db7c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 28 09:25:17 2017 -0400 Move around some LCOV_EXCLs in src/common Apparently, my compiler now generates coverage markers for label-only lines, so we need to exclude those too if they are meant to be unreachable. --- src/common/address.c | 10 ++++++---- src/common/compat.c | 2 +- src/common/compress.c | 3 ++- src/common/compress_lzma.c | 8 ++++++-- src/common/crypto.c | 5 +++-- src/common/crypto_curve25519.c | 3 +++ src/common/crypto_ed25519.c | 13 +++++++++++-- src/common/crypto_pwbox.c | 2 +- src/common/crypto_s2k.c | 10 +++++++--- src/common/tortls.c | 3 ++- src/common/util.c | 6 ++++-- src/common/util_format.c | 5 ++++- 12 files changed, 50 insertions(+), 20 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index aa61b5423..dbe129be5 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -907,8 +907,8 @@ tor_addr_is_loopback(const tor_addr_t *addr) return (tor_addr_to_ipv4h(addr) & 0xff000000) == 0x7f000000; case AF_UNSPEC: return 0; - default: /* LCOV_EXCL_START */ + default: tor_fragile_assert(); return 0; /* LCOV_EXCL_STOP */ @@ -1031,8 +1031,10 @@ tor_addr_copy_tight(tor_addr_t *dest, const tor_addr_t *src) memcpy(dest->addr.in6_addr.s6_addr, src->addr.in6_addr.s6_addr, 16); case AF_UNSPEC: break; + // LCOV_EXCL_START default: - tor_fragile_assert(); // LCOV_EXCL_LINE + tor_fragile_assert(); + // LCOV_EXCL_STOP } } @@ -1138,8 +1140,8 @@ tor_addr_compare_masked(const tor_addr_t *addr1, const tor_addr_t *addr2, return 0; else return 1; - default: /* LCOV_EXCL_START */ + default: tor_fragile_assert(); return 0; /* LCOV_EXCL_STOP */ @@ -1194,8 +1196,8 @@ tor_addr_hash(const tor_addr_t *addr) return 0x4e4d5342; case AF_INET6: return siphash24g(&addr->addr.in6_addr.s6_addr, 16); - default: /* LCOV_EXCL_START */ + default: tor_fragile_assert(); return 0; /* LCOV_EXCL_STOP */ diff --git a/src/common/compat.c b/src/common/compat.c index ab1fbc64f..7fe97488e 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -3350,8 +3350,8 @@ get_total_system_memory_impl(void) tor_free(s); return result * 1024; - err: /* LCOV_EXCL_START Can't reach this unless proc is broken. */ + err: tor_free(s); close(fd); return 0; diff --git a/src/common/compress.c b/src/common/compress.c index 472268a43..110eb6586 100644 --- a/src/common/compress.c +++ b/src/common/compress.c @@ -188,8 +188,9 @@ tor_compress_impl(int compress, "Error while %scompresing data: bad input?", compress?"":"un"); goto err; // bad data. - default: + // LCOV_EXCL_START + default: tor_assert_nonfatal_unreached(); goto err; // LCOV_EXCL_STOP diff --git a/src/common/compress_lzma.c b/src/common/compress_lzma.c index 2bdbbe1d4..6426ede4f 100644 --- a/src/common/compress_lzma.c +++ b/src/common/compress_lzma.c @@ -158,8 +158,10 @@ tor_lzma_state_size_precalc(int compress, compression_level_t level) return (size_t)memory_usage; + // LCOV_EXCL_START err: - return 0; // LCOV_EXCL_LINE + return 0; + // LCOV_EXCL_STOP } #endif /* defined(HAVE_LZMA) */ @@ -212,9 +214,11 @@ tor_lzma_compress_new(int compress, atomic_counter_add(&total_lzma_allocation, result->allocation); return result; + /* LCOV_EXCL_START */ err: - tor_free(result); // LCOV_EXCL_LINE + tor_free(result); return NULL; + /* LCOV_EXCL_STOP */ #else /* !(defined(HAVE_LZMA)) */ (void)compress; (void)method; diff --git a/src/common/crypto.c b/src/common/crypto.c index 1730619f8..6fe3c661c 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1798,8 +1798,8 @@ crypto_digest_algorithm_get_name(digest_algorithm_t alg) return "sha3-256"; case DIGEST_SHA3_512: return "sha3-512"; - default: // LCOV_EXCL_START + default: tor_fragile_assert(); return "??unknown_digest??"; // LCOV_EXCL_STOP @@ -2447,9 +2447,10 @@ crypto_dh_new(int dh_type) #endif /* defined(OPENSSL_1_1_API) */ return res; - err: + /* LCOV_EXCL_START * This error condition is only reached when an allocation fails */ + err: crypto_log_errors(LOG_WARN, "creating DH object"); if (res->dh) DH_free(res->dh); /* frees p and g too */ tor_free(res); diff --git a/src/common/crypto_curve25519.c b/src/common/crypto_curve25519.c index f5c2acb87..8793fa627 100644 --- a/src/common/crypto_curve25519.c +++ b/src/common/crypto_curve25519.c @@ -318,8 +318,11 @@ curve25519_basepoint_spot_check(void) } goto end; + // LCOV_EXCL_START -- we can only hit this code if there is a bug in our + // curve25519-basepoint implementation. fail: r = -1; + // LCOV_EXCL_STOP end: curve25519_use_ed = save_use_ed; return r; diff --git a/src/common/crypto_ed25519.c b/src/common/crypto_ed25519.c index 969cc1047..94b23e31b 100644 --- a/src/common/crypto_ed25519.c +++ b/src/common/crypto_ed25519.c @@ -293,9 +293,12 @@ ed25519_sign_prefixed,(ed25519_signature_t *signature_out, prefixed_msg = get_prefixed_msg(msg, msg_len, prefix_str, &prefixed_msg_len); - if (!prefixed_msg) { + if (BUG(!prefixed_msg)) { + /* LCOV_EXCL_START -- only possible when the message and prefix are + * ridiculously huge */ log_warn(LD_GENERAL, "Failed to get prefixed msg."); return -1; + /* LCOV_EXCL_STOP */ } retval = ed25519_sign(signature_out, @@ -338,9 +341,12 @@ ed25519_checksig_prefixed(const ed25519_signature_t *signature, prefixed_msg = get_prefixed_msg(msg, msg_len, prefix_str, &prefixed_msg_len); - if (!prefixed_msg) { + if (BUG(!prefixed_msg)) { + /* LCOV_EXCL_START -- only possible when the message and prefix are + * ridiculously huge */ log_warn(LD_GENERAL, "Failed to get prefixed msg."); return -1; + /* LCOV_EXCL_STOP */ } retval = ed25519_checksig(signature, @@ -718,8 +724,11 @@ ed25519_impl_spot_check,(void)) */ goto end; + // LCOV_EXCL_START -- We can only reach this if our ed25519 implementation is + // broken. fail: r = -1; + // LCOV_EXCL_STOP end: return r; } diff --git a/src/common/crypto_pwbox.c b/src/common/crypto_pwbox.c index db8892e37..12acc9331 100644 --- a/src/common/crypto_pwbox.c +++ b/src/common/crypto_pwbox.c @@ -107,7 +107,6 @@ crypto_pwbox(uint8_t **out, size_t *outlen_out, rv = 0; goto out; - err: /* LCOV_EXCL_START This error case is often unreachable if we're correctly coded, unless @@ -123,6 +122,7 @@ crypto_pwbox(uint8_t **out, size_t *outlen_out, - pwbox_encoded_encode can't fail unless we're using trunnel wrong, or it's buggy. */ + err: tor_free(result); rv = -1; /* LCOV_EXCL_STOP */ diff --git a/src/common/crypto_s2k.c b/src/common/crypto_s2k.c index 4db6762ef..b2fcca54c 100644 --- a/src/common/crypto_s2k.c +++ b/src/common/crypto_s2k.c @@ -86,9 +86,11 @@ secret_to_key_key_len(uint8_t type) return DIGEST_LEN; case S2K_TYPE_SCRYPT: return DIGEST256_LEN; + // LCOV_EXCL_START default: - tor_fragile_assert(); // LCOV_EXCL_LINE - return -1; // LCOV_EXCL_LINE + tor_fragile_assert(); + return -1; + // LCOV_EXCL_STOP } } @@ -169,9 +171,11 @@ make_specifier(uint8_t *spec_out, uint8_t type, unsigned flags) /* r = 8; p = 2. */ spec_out[SCRYPT_SPEC_LEN-1] = (3u << 4) | (1u << 0); break; + // LCOV_EXCL_START - we should have returned above. default: - tor_fragile_assert(); // LCOV_EXCL_LINE - we should have returned above. + tor_fragile_assert(); return S2K_BAD_ALGORITHM; + // LCOV_EXCL_STOP } return speclen; diff --git a/src/common/tortls.c b/src/common/tortls.c index 8727b605b..197c5e8d3 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -444,8 +444,9 @@ tor_x509_name_new(const char *cname) goto error; /* LCOV_EXCL_BR_STOP */ return name; - error: + /* LCOV_EXCL_START : these lines will only execute on out of memory errors*/ + error: X509_NAME_free(name); return NULL; /* LCOV_EXCL_STOP */ diff --git a/src/common/util.c b/src/common/util.c index bcb1449a1..5ff7e104d 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2980,8 +2980,9 @@ unescape_string(const char *s, char **result, size_t *size_out) *out = '\0'; if (size_out) *size_out = out - *result; return cp+1; - case '\0': + /* LCOV_EXCL_START -- we caught this in parse_config_from_line. */ + case '\0': tor_fragile_assert(); tor_free(*result); return NULL; @@ -3029,8 +3030,9 @@ unescape_string(const char *s, char **result, size_t *size_out) *out++ = cp[1]; cp += 2; break; - default: + /* LCOV_EXCL_START */ + default: /* we caught this above in the initial loop. */ tor_assert_nonfatal_unreached(); tor_free(*result); return NULL; diff --git a/src/common/util_format.c b/src/common/util_format.c index 1f7b8b03a..e51757a4e 100644 --- a/src/common/util_format.c +++ b/src/common/util_format.c @@ -266,10 +266,13 @@ base64_encode(char *dest, size_t destlen, const char *src, size_t srclen, ENCODE_N(3); ENCODE_PAD(); break; + // LCOV_EXCL_START -- we can't reach this point, because we enforce + // 0 <= ncov_idx < 3 in the loop above. default: /* Something went catastrophically wrong. */ - tor_fragile_assert(); // LCOV_EXCL_LINE + tor_fragile_assert(); return -1; + // LCOV_EXCL_STOP } #undef ENCODE_N

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 28 Sep '17

28 Sep '17

commit 4700a226d297af44e63ce26ca8cac9e7d537df14 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 28 13:16:07 2017 +0000 Update translations for tails-persistence-setup --- ca/ca.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca/ca.po b/ca/ca.po index 8b593f843..0418d3ca8 100644 --- a/ca/ca.po +++ b/ca/ca.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-05-15 13:51+0200\n" -"PO-Revision-Date: 2017-09-23 18:56+0000\n" +"PO-Revision-Date: 2017-09-28 12:57+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n" "MIME-Version: 1.0\n"

1 0

[tor/master] Improve cov-diff script to account for new files.
by nickm＠torproject.org 28 Sep '17

28 Sep '17

commit 9727a9248a474909c0ad53be9d55cd39b69d0611 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 28 08:53:16 2017 -0400 Improve cov-diff script to account for new files. --- scripts/test/cov-diff | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/test/cov-diff b/scripts/test/cov-diff index 7da7f0be9..ed8874d2d 100755 --- a/scripts/test/cov-diff +++ b/scripts/test/cov-diff @@ -7,9 +7,13 @@ DIRA="$1" DIRB="$2" -for A in $DIRA/*; do - B=$DIRB/`basename $A` - perl -pe 's/^\s*\!*\d+:/ 1:/; s/^([^:]+:)[\d\s]+:/$1/; s/^ *-:(Runs|Programs):.*//;' "$A" > "$A.tmp" +for B in $DIRB/*; do + A=$DIRA/`basename $B` + if [ -f $A ]; then + perl -pe 's/^\s*\!*\d+:/ 1:/; s/^([^:]+:)[\d\s]+:/$1/; s/^ *-:(Runs|Programs):.*//;' "$A" > "$A.tmp" + else + cat /dev/null > "$A.tmp" + fi perl -pe 's/^\s*\!*\d+:/ 1:/; s/^([^:]+:)[\d\s]+:/$1/; s/^ *-:(Runs|Programs):.*//;' "$B" > "$B.tmp" diff -u "$A.tmp" "$B.tmp" rm "$A.tmp" "$B.tmp"

1 0