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

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 21 Sep '18

21 Sep '18

commit 0392c104f888e4ad0cda8c6b696905c3a548250a Merge: 9ba12d1a1 e24195c7c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 21 09:35:23 2018 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug27316 | 3 +++ src/or/protover.c | 15 +++++++++++++++ src/test/test_protover.c | 4 ++++ 3 files changed, 22 insertions(+)

1 0

[tor/release-0.3.3] protover: reject invalid protocol names
by nickm＠torproject.org 21 Sep '18

21 Sep '18

commit e24195c7c1aaecebaf5ef4f81b54da2f0db917c6 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Sun Aug 26 01:20:44 2018 +0000 protover: reject invalid protocol names The spec only allows the characters [A-Za-z0-9-]. Fix on b2b2e1c7f24d9b65059e3d089768d6c49ba4f58f. Fixes #27316; bugfix on 0.2.9.4-alpha. --- changes/bug27316 | 3 +++ src/or/protover.c | 15 +++++++++++++++ src/test/test_protover.c | 4 ++++ 3 files changed, 22 insertions(+) diff --git a/changes/bug27316 b/changes/bug27316 new file mode 100644 index 000000000..cec934891 --- /dev/null +++ b/changes/bug27316 @@ -0,0 +1,3 @@ + o Minor bugfixes (protover): + - Reject protocol names containing bytes other than alphanumeric characters + and hyphens ([A-Za-z0-9-]). Fixes bug 27316; bugfix on 0.2.9.4-alpha. diff --git a/src/or/protover.c b/src/or/protover.c index 31ca13fe6..2c5d5ab1f 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -23,6 +23,7 @@ #define PROTOVER_PRIVATE +#include "compat.h" #include "or.h" #include "protover.h" #include "routerparse.h" @@ -170,6 +171,16 @@ parse_version_range(const char *s, const char *end_of_range, return -1; } +static int +is_valid_keyword(const char *s, size_t n) +{ + for (size_t i = 0; i < n; i++) { + if (!TOR_ISALNUM(s[i]) && s[i] != '-') + return 0; + } + return 1; +} + /** Parse a single protocol entry from <b>s</b> up to an optional * <b>end_of_entry</b> pointer, and return that protocol entry. Return NULL * on error. @@ -195,6 +206,10 @@ parse_single_entry(const char *s, const char *end_of_entry) if (equals == s) goto error; + /* The name must contain only alphanumeric characters and hyphens. */ + if (!is_valid_keyword(s, equals-s)) + goto error; + out->name = tor_strndup(s, equals-s); tor_assert(equals < end_of_entry); diff --git a/src/test/test_protover.c b/src/test/test_protover.c index 92ead3ca3..c4379a15e 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -283,6 +283,10 @@ test_protover_vote_roundtrip(void *args) const char *input; const char *expected_output; } examples[] = { + { "Risqu\u00e9=1", NULL }, + { ",,,=1", NULL }, + { "\xc1=1", NULL }, + { "Foo_Bar=1", NULL }, { "Fkrkljdsf", NULL }, { "Zn=4294967295", NULL }, { "Zn=4294967295-1", NULL },

1 0

[tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 21 Sep '18

21 Sep '18

commit 5b04392c1553e2a3e278a48f8d0e071181c0444f Merge: 0971b3ce4 e24195c7c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 21 09:35:23 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27316 | 3 +++ src/or/protover.c | 15 +++++++++++++++ src/test/test_protover.c | 4 ++++ 3 files changed, 22 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/ticket27797_035_01'
by nickm＠torproject.org 21 Sep '18

21 Sep '18

commit 96d1f2e6d0ebcb97aa66a1416d147533b24fac9c Merge: 55122bfe0 e3713f17f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 21 09:33:03 2018 -0400 Merge remote-tracking branch 'dgoulet/ticket27797_035_01' changes/ticket27797 | 5 +++++ src/feature/nodelist/nodelist.c | 5 +++++ 2 files changed, 10 insertions(+)

1 0

[tor/master] node: Make node_supports_v3_rendezvous_point() also check for the key
by nickm＠torproject.org 21 Sep '18

21 Sep '18

commit e3713f17fb393ef701f566dc3a34a188d270a908 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Sep 20 08:50:27 2018 -0400 node: Make node_supports_v3_rendezvous_point() also check for the key It is not enough to look at protover for v3 rendezvous support but also we need to make sure that the curve25519 onion key is present or in other words that the descriptor has been fetched and does contain it. Fixes #27797. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket27797 | 5 +++++ src/feature/nodelist/nodelist.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/changes/ticket27797 b/changes/ticket27797 new file mode 100644 index 000000000..f07e35f84 --- /dev/null +++ b/changes/ticket27797 @@ -0,0 +1,5 @@ + o Minor bugfixes (node, hidden service v3): + - When selecting a v3 rendezvous point, not only look at the protover but + also if the curve25519 onion key is present. That way we avoid picking a + node that supports the v3 rendezvous but for which we don't have the + descriptor yet for the key. Fixes bug 27797; bugfix on 0.3.2.1-alpha. diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c index 50dc8f7d3..24557a56f 100644 --- a/src/feature/nodelist/nodelist.c +++ b/src/feature/nodelist/nodelist.c @@ -1141,6 +1141,11 @@ node_supports_v3_rendezvous_point(const node_t *node) { tor_assert(node); + /* We can't use a v3 rendezvous point without the curve25519 onion pk. */ + if (!node_get_curve25519_onion_key(node)) { + return 0; + } + return node_get_protover_summary_flags(node)->supports_v3_rendezvous_point; }

1 0

[translation/torbutton-torbuttondtd_completed] Update translations for torbutton-torbuttondtd_completed
by translation＠torproject.org 21 Sep '18

21 Sep '18

commit c25e03254f8b74c805030b1d594056425fd315d2 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 21 13:17:59 2018 +0000 Update translations for torbutton-torbuttondtd_completed --- el/torbutton.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/el/torbutton.dtd b/el/torbutton.dtd index bdd484bf1..4d9456a93 100644 --- a/el/torbutton.dtd +++ b/el/torbutton.dtd @@ -2,11 +2,11 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Νέο κύκλωμα Tor για αυτήν την ιστοσελίδα"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Ρυθμίσεις Aσφαλείας"> +<!ENTITY torbutton.context_menu.preferences "Ρυθμίσεις Ασφαλείας..."> <!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Ρυθμίσεις του Δικτύου Tor..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> -<!ENTITY torbutton.context_menu.downloadUpdate "Έλεγχος για Αναβάθμιση του Tor Browser..."> +<!ENTITY torbutton.context_menu.downloadUpdate "Έλεγχος για ενημέρωση του Tor Browser..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Προστασία Cookies..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C">

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 21 Sep '18

21 Sep '18

commit 6e585fb401a194cc356d002f9d59540ea9682857 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 21 13:17:54 2018 +0000 Update translations for torbutton-torbuttondtd --- el/torbutton.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/el/torbutton.dtd b/el/torbutton.dtd index bdd484bf1..4d9456a93 100644 --- a/el/torbutton.dtd +++ b/el/torbutton.dtd @@ -2,11 +2,11 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Νέο κύκλωμα Tor για αυτήν την ιστοσελίδα"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Ρυθμίσεις Aσφαλείας"> +<!ENTITY torbutton.context_menu.preferences "Ρυθμίσεις Ασφαλείας..."> <!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Ρυθμίσεις του Δικτύου Tor..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> -<!ENTITY torbutton.context_menu.downloadUpdate "Έλεγχος για Αναβάθμιση του Tor Browser..."> +<!ENTITY torbutton.context_menu.downloadUpdate "Έλεγχος για ενημέρωση του Tor Browser..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Προστασία Cookies..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C">

1 0

[translation/torbutton-branddtd_completed] Update translations for torbutton-branddtd_completed
by translation＠torproject.org 21 Sep '18

21 Sep '18

commit f9e5b4d3af7af2f2e58a73a42a045dac5d02724f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 21 13:17:41 2018 +0000 Update translations for torbutton-branddtd_completed --- el/brand.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/el/brand.dtd b/el/brand.dtd index 0e3db6284..65bd74eba 100644 --- a/el/brand.dtd +++ b/el/brand.dtd @@ -9,7 +9,7 @@ <!ENTITY trademarkInfo.part1 "O Firefox και το λογότυπο Firefox είναι εμπορικά σήματα του Mozilla Foundation.">  -<!ENTITY plugins.installed.find "Κλικ για την φόρτωση των εγκατεστημένων πρόσθετων του συστήματος"> +<!ENTITY plugins.installed.find "Κάντε κλικ για να φορτώσετε εγκατεστημένα πρόσθετα συστήματος"> <!ENTITY plugins.installed.enable "Ενεργοποίηση Πρόσθετων"> <!ENTITY plugins.installed.disable "Απενεργοποίηση Πρόσθετων"> -<!ENTITY plugins.installed.disable.tip "Κλικ για να μην φορτωθουν τα πρόσθετα του συστήματος"> +<!ENTITY plugins.installed.disable.tip "Κάντε κλικ για να μην φορτωθούν τα πρόσθετα του συστήματος">

1 0

[translation/torbutton-branddtd] Update translations for torbutton-branddtd
by translation＠torproject.org 21 Sep '18

21 Sep '18

commit 451959fcf2b60b59f54d51d1c58b628d7e853c1c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 21 13:17:36 2018 +0000 Update translations for torbutton-branddtd --- el/brand.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/el/brand.dtd b/el/brand.dtd index 0e3db6284..65bd74eba 100644 --- a/el/brand.dtd +++ b/el/brand.dtd @@ -9,7 +9,7 @@ <!ENTITY trademarkInfo.part1 "O Firefox και το λογότυπο Firefox είναι εμπορικά σήματα του Mozilla Foundation.">  -<!ENTITY plugins.installed.find "Κλικ για την φόρτωση των εγκατεστημένων πρόσθετων του συστήματος"> +<!ENTITY plugins.installed.find "Κάντε κλικ για να φορτώσετε εγκατεστημένα πρόσθετα συστήματος"> <!ENTITY plugins.installed.enable "Ενεργοποίηση Πρόσθετων"> <!ENTITY plugins.installed.disable "Απενεργοποίηση Πρόσθετων"> -<!ENTITY plugins.installed.disable.tip "Κλικ για να μην φορτωθουν τα πρόσθετα του συστήματος"> +<!ENTITY plugins.installed.disable.tip "Κάντε κλικ για να μην φορτωθούν τα πρόσθετα του συστήματος">

1 0

[translation/tails-perl5lib_completed] Update translations for tails-perl5lib_completed
by translation＠torproject.org 21 Sep '18

21 Sep '18

commit 4d4b91d3a7c3e4b8e84e42779eb7793d325655a1 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 21 13:16:13 2018 +0000 Update translations for tails-perl5lib_completed --- el.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/el.po b/el.po index 3bd065d82..259990cc0 100644 --- a/el.po +++ b/el.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: 2018-08-16 11:11+0200\n" -"PO-Revision-Date: 2018-08-13 13:42+0000\n" +"PO-Revision-Date: 2018-09-21 12:57+0000\n" "Last-Translator: Sofia K.\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgstr "Σφάλμα" msgid "" "The device Tails is running from cannot be found. Maybe you used the 'toram'" " option?" -msgstr "Δεν μπορεί να βρεθεί η συσκευή από την οποία τρέχει το Tails. Ίσως χρησιμοποιήσατε την επιλογή \"toram\";" +msgstr "Δεν μπορεί να βρεθεί η συσκευή από την οποία τρέχει το Tails. Μήπως χρησιμοποιήσατε την επιλογή \"toram\";" #: ../lib/Tails/RunningSystem.pm:220 msgid "" "The drive Tails is running from cannot be found. Maybe you used the 'toram' " "option?" -msgstr "Δεν μπορεί να βρεθεί ο δίσκος από τον οποίο τρέχει το Tails. Ίσως χρησιμοποιήσατε την επιλογή `toram' ;" +msgstr "Δεν μπορεί να βρεθεί ο δίσκος από τον οποίο τρέχει το Tails. Μήπως χρησιμοποιήσατε την επιλογή `toram' ;"

1 0