August 2016 - tor-commits - lists.torproject.org

[tor-messenger-build/master] Remove links from the updater window
by sukhbir＠torproject.org 26 Aug '16

26 Aug '16

commit c1a11869d136155dc74a709c34d733cdd610ad97 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Aug 26 21:59:23 2016 -0400 Remove links from the updater window --- projects/instantbird/config | 1 + projects/instantbird/updater-remove-links.mozpatch | 37 ++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/projects/instantbird/config b/projects/instantbird/config index 7e3bf13..c1d2b58 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -135,6 +135,7 @@ input_files: - filename: Updater-Linux-search-path-bug-18900.mozpatch - filename: aboutTBUpdateLogo.png - filename: trac-16475.mozpatch + - filename: updater-remove-links.mozpatch - filename: OSX-package-as-tar.bz2.mozpatch enable: '[% c("var/osx") %]' - filename: browserMountPoints.inc diff --git a/projects/instantbird/updater-remove-links.mozpatch b/projects/instantbird/updater-remove-links.mozpatch new file mode 100644 index 0000000..865423e --- /dev/null +++ b/projects/instantbird/updater-remove-links.mozpatch @@ -0,0 +1,37 @@ +diff --git a/toolkit/locales/en-US/chrome/mozapps/update/updates.dtd b/toolkit/locales/en-US/chrome/mozapps/update/updates.dtd +--- a/toolkit/locales/en-US/chrome/mozapps/update/updates.dtd ++++ b/toolkit/locales/en-US/chrome/mozapps/update/updates.dtd +@@ -34,7 +34,7 @@ + <!ENTITY incompatibleCheck.title "Checking Add-on Compatibility"> + <!ENTITY incompatibleCheck.label "Looking for newer versions of your add-ons…"> + +-<!ENTITY clickHere.label "View more information about this update"> ++<!ENTITY clickHere.label "View more information about this update:"> + + <!ENTITY evangelism.desc "It is strongly recommended that you apply this + update for &brandShortName; as soon as possible."> +diff --git a/toolkit/mozapps/update/content/updates.js b/toolkit/mozapps/update/content/updates.js +--- a/toolkit/mozapps/update/content/updates.js ++++ b/toolkit/mozapps/update/content/updates.js +@@ -952,7 +952,7 @@ + + var updateMoreInfoURL = document.getElementById("updateMoreInfoURL"); + if (update.detailsURL) +- updateMoreInfoURL.setAttribute("url", update.detailsURL); ++ updateMoreInfoURL.setAttribute("value", update.detailsURL); + else + updateMoreInfoURL.hidden = true; + +diff --git a/toolkit/mozapps/update/content/updates.xul b/toolkit/mozapps/update/content/updates.xul +--- a/toolkit/mozapps/update/content/updates.xul ++++ b/toolkit/mozapps/update/content/updates.xul +@@ -121,8 +121,7 @@ + <separator id="upgradeEvangelismSep" flex="1"/> + <vbox flex="1"> + <hbox id="moreInfoURL"> +- <label class="text-link" id="updateMoreInfoURL" +- value="&clickHere.label;" onclick="openUpdateURL(event);"/> ++ <textbox class="plain" flex="1" readonly="true" id="updateMoreInfoURL" /> + </hbox> + </vbox> + </vbox>

1 0

[tor-messenger-build/master] Remove links from the about screen
by sukhbir＠torproject.org 26 Aug '16

26 Aug '16

commit b6af820db5d77fe5bc9c9e2f02420a8b93c7eb4f Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Aug 26 11:15:24 2016 -0400 Remove links from the about screen --- projects/instantbird/aboutDialog.dtd | 8 +++++--- projects/instantbird/aboutDialog.xul | 32 ++++++++------------------------ projects/instantbird/preferences.patch | 2 +- 3 files changed, 14 insertions(+), 28 deletions(-) diff --git a/projects/instantbird/aboutDialog.dtd b/projects/instantbird/aboutDialog.dtd index 1562ebc..187cf5c 100644 --- a/projects/instantbird/aboutDialog.dtd +++ b/projects/instantbird/aboutDialog.dtd @@ -106,17 +106,19 @@ <!ENTITY channel.description.start "You are currently on the "> <!ENTITY channel.description.end " update channel. "> -<!ENTITY project.start "&brandShortName; is developed by "> +<!ENTITY project.start "&brandShortName; is developed by">  <!ENTITY project.tpoLink "the &vendorShortName;"> <!ENTITY project.end ", a nonprofit working to defend your privacy and freedom online."> <!ENTITY help.start "Want to help? ">  -<!ENTITY help.donateLink "Donate"> +<!ENTITY help.donate "Donate:"> +<!ENTITY help.donateLink "https://www.torproject.org/donate"> <!ENTITY help.or " or ">  -<!ENTITY help.getInvolvedLink "get involved"> +<!ENTITY help.getInvolved "Get Involved:"> +<!ENTITY help.getInvolvedLink "https://www.torproject.org/volunteer"> <!ENTITY help.end "!">  <!ENTITY bottomLinks.questions "Questions?"> diff --git a/projects/instantbird/aboutDialog.xul b/projects/instantbird/aboutDialog.xul index 35dfdd6..5e1f51f 100644 --- a/projects/instantbird/aboutDialog.xul +++ b/projects/instantbird/aboutDialog.xul @@ -116,16 +116,14 @@ </label>&project.end; </description> <description class="text-blurb" id="helpDesc"> - &help.start; - <label class="text-link" - href="https://www.torproject.org/donate/donate.html.en"> - &help.donateLink; - </label> - &help.or; - <label class="text-link" - href="https://www.torproject.org/getinvolved/volunteer.html.en"> - &help.getInvolvedLink; - </label>&help.end; + &help.donate; + <textbox flex="1" class="plain" readonly="true" size="36" + value="&help.donateLink;" /> + </description> + <description class="text-blurb" id="getInvolvedLinkDesc"> + &help.getInvolved; + <textbox flex="1" class="plain" readonly="true" size="36" + value="&help.getInvolvedLink;" /> </description> </vbox> @@ -162,20 +160,6 @@ </hbox> <description id="trademark"></description> </vbox> - <hbox id="newBottom" pack="center" position="1"> - <label class="text-link bottom-link" - href="https://www.torproject.org/docs/faq.html.en"> - &bottomLinks.questions; - </label> - <label class="text-link bottom-link" - href="https://www.torproject.org/getinvolved/relays"> - &bottomLinks.grow; - </label> - <label class="text-link bottom-link" - href="about:license"> - &bottomLinks.license; - </label> - </hbox> <description id="trademarkTor" insertafter="trademark"> &tor.TrademarkStatement; </description> diff --git a/projects/instantbird/preferences.patch b/projects/instantbird/preferences.patch index f94c7ad..55d1439 100644 --- a/projects/instantbird/preferences.patch +++ b/projects/instantbird/preferences.patch @@ -50,7 +50,7 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. // URL user can browse to manually if for some reason all update installation // attempts fail. -pref("app.update.url.manual", "http://www.instantbird.com/download.html"); -+pref("app.update.url.manual", "https://www.torproject.org/download/download-easy.html"); ++pref("app.update.url.manual", "https://www.torproject.org) // A default value for the "More information about this update" link // supplied in the "An update is available" page of the update wizard.

1 0

[tor-messenger-build/master] Remove redundant diff from updater-remove-links.mozpatch
by sukhbir＠torproject.org 26 Aug '16

26 Aug '16

commit 521606be0e73e589a176a2ef78674ace8df4f380 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Aug 26 22:00:39 2016 -0400 Remove redundant diff from updater-remove-links.mozpatch --- projects/instantbird/updater-remove-links.mozpatch | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/projects/instantbird/updater-remove-links.mozpatch b/projects/instantbird/updater-remove-links.mozpatch index 865423e..9832a3f 100644 --- a/projects/instantbird/updater-remove-links.mozpatch +++ b/projects/instantbird/updater-remove-links.mozpatch @@ -1,15 +1,3 @@ -diff --git a/toolkit/locales/en-US/chrome/mozapps/update/updates.dtd b/toolkit/locales/en-US/chrome/mozapps/update/updates.dtd ---- a/toolkit/locales/en-US/chrome/mozapps/update/updates.dtd -+++ b/toolkit/locales/en-US/chrome/mozapps/update/updates.dtd -@@ -34,7 +34,7 @@ - <!ENTITY incompatibleCheck.title "Checking Add-on Compatibility"> - <!ENTITY incompatibleCheck.label "Looking for newer versions of your add-ons…"> - --<!ENTITY clickHere.label "View more information about this update"> -+<!ENTITY clickHere.label "View more information about this update:"> - - <!ENTITY evangelism.desc "It is strongly recommended that you apply this - update for &brandShortName; as soon as possible."> diff --git a/toolkit/mozapps/update/content/updates.js b/toolkit/mozapps/update/content/updates.js --- a/toolkit/mozapps/update/content/updates.js +++ b/toolkit/mozapps/update/content/updates.js

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 26 Aug '16

26 Aug '16

commit 59b99a2c3d301fe46e059c5a2179bdc39b82271c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 26 21:16:32 2016 +0000 Update translations for torbutton-torbuttondtd --- lt/torbutton.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lt/torbutton.dtd b/lt/torbutton.dtd index 5f26e06..1eee17f 100644 --- a/lt/torbutton.dtd +++ b/lt/torbutton.dtd @@ -27,8 +27,8 @@ <!ENTITY torbutton.prefs.priv_caption "Privatumo nustatymai"> <!ENTITY torbutton.prefs.block_disk "Neįrašinėti naršymo žurnalo ir svetainių duomenų (įjungia privataus naršymo veikseną)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Neleisti trečiųjų šalių slapukų ir kitų sekimo duomenų"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> -<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> +<!ENTITY torbutton.prefs.block_plugins "Išjungti naršyklės papildinius (tokius kaip Flash)"> +<!ENTITY torbutton.prefs.resist_fingerprinting "Pakeisti informaciją, kuri išskiria jus iš kitų Tor Browser naudotojų"> <!ENTITY torbutton.prefs.sec_caption "Saugumo lygmuo"> <!ENTITY torbutton.prefs.sec_low "Žemas (numatytasis)"> <!ENTITY torbutton.prefs.sec_low_usable_desc "Tai suteikia didžiausią naudojimosi patogumą."> @@ -59,5 +59,5 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc "Kai kurie šriftai ir piktogramos gali būti rodomos neteisingai."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Tinklalapio teikiami šriftai blokuojami."> <!ENTITY torbutton.prefs.sec_custom "Tinkintos reikšmės"> -<!ENTITY torbutton.circuit_display.title "Tor grandinė šiam saitui."> +<!ENTITY torbutton.circuit_display.title "Tor grandinė šiam tinklalapiui.">

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 26 Aug '16

26 Aug '16

commit 7e3552b68d22cc9db6944a53e3a79576b788333d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 26 20:46:33 2016 +0000 Update translations for torbutton-torbuttondtd --- lt/torbutton.dtd | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/lt/torbutton.dtd b/lt/torbutton.dtd index 9579b71..5f26e06 100644 --- a/lt/torbutton.dtd +++ b/lt/torbutton.dtd @@ -1,32 +1,32 @@ <!ENTITY torbutton.context_menu.new_identity "Nauja tapatybė"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.new_circuit "Nauja Tor grandinė šiam saitui"> +<!ENTITY torbutton.context_menu.new_circuit "Nauja Tor grandinė šiam tinklalapiui"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> <!ENTITY torbutton.context_menu.preferences "Privatumo ir saugumo nustatymai..."> <!ENTITY torbutton.context_menu.preferences.key "P"> -<!ENTITY torbutton.context_menu.networksettings "Tor tinklo nustatymai"> +<!ENTITY torbutton.context_menu.networksettings "Tor tinklo nustatymai..."> <!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Tikrinti ar yra Tor naršyklės atnaujinimų..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "Slapukų apsaugos"> +<!ENTITY torbutton.context_menu.cookieProtections "Slapukų apsaugos..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> -<!ENTITY torbutton.button.tooltip "Paspauskite kad aktyvuoti Torbutton"> +<!ENTITY torbutton.button.tooltip "Spustelėkite, kad aktyvuotumėte Torbutton"> <!ENTITY torbutton.prefs.privacy_security_settings "Privatumo ir saugumo nustatymai"> <!ENTITY torbutton.prefs.restore_defaults "Atstatyti numatytuosius"> -<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> -<!ENTITY torbutton.cookiedialog.lockCol "Protected"> -<!ENTITY torbutton.cookiedialog.domainCol "Host"> +<!ENTITY torbutton.cookiedialog.title "Tvarkyti slapukų apsaugas"> +<!ENTITY torbutton.cookiedialog.lockCol "Apsaugotas"> +<!ENTITY torbutton.cookiedialog.domainCol "Serveris"> <!ENTITY torbutton.cookiedialog.nameCol "Pavadinimas"> -<!ENTITY torbutton.cookiedialog.pathCol "Path"> -<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie"> -<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie"> -<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie"> -<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> -<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> -<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> +<!ENTITY torbutton.cookiedialog.pathCol "Kelias"> +<!ENTITY torbutton.cookiedialog.protectCookie "Apsaugoti slapuką"> +<!ENTITY torbutton.cookiedialog.removeCookie "Šalinti slapuką"> +<!ENTITY torbutton.cookiedialog.unprotectCookie "Neapsaugoti slapuko"> +<!ENTITY torbutton.cookiedialog.removeAllBut "Šalinti visus, išskyrus apsaugotus"> +<!ENTITY torbutton.cookiedialog.saveAllCookies "Apsaugoti naujus slapukus"> +<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Neapsaugoti naujų slapukų"> <!ENTITY torbutton.prefs.priv_caption "Privatumo nustatymai"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> -<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> +<!ENTITY torbutton.prefs.block_disk "Neįrašinėti naršymo žurnalo ir svetainių duomenų (įjungia privataus naršymo veikseną)"> +<!ENTITY torbutton.prefs.restrict_thirdparty "Neleisti trečiųjų šalių slapukų ir kitų sekimo duomenų"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> <!ENTITY torbutton.prefs.sec_caption "Saugumo lygmuo">

1 0

[tor/master] test: Fix shared random unit test for big endian
by nickm＠torproject.org 26 Aug '16

26 Aug '16

commit f46ce6e3d8bea3cf00388c87c29cdcafd4bab350 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Aug 26 11:06:09 2016 -0400 test: Fix shared random unit test for big endian Copying the integer 42 in a char buffer has a different representation depending on the endianess of the system thus that unit test was failing on big endian system. This commit introduces a python script, like the one we have for SRV, that computes a COMMIT/REVEAL from scratch so we can use it as a test vector for our encoding unit tests. With this, we use a random value of bytes instead of a number fixing the endianess issue and making the whole test case more solid with an external tool that builds the COMMIT and REVEAL according to the spec. Fixes #19977 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/19977 | 6 +++++ src/test/sr_commit_calc_ref.py | 51 ++++++++++++++++++++++++++++++++++++++++++ src/test/test_shared_random.c | 19 +++++++--------- 3 files changed, 65 insertions(+), 11 deletions(-) diff --git a/changes/19977 b/changes/19977 new file mode 100644 index 0000000..0ca1af1 --- /dev/null +++ b/changes/19977 @@ -0,0 +1,6 @@ + o Minor bugfixes (unit test) + - Fix shared random unit test that was failing on big endian architecture + due to internal representation of a integer copied to a buffer. The test + is changed to take a full 32 bytes of data and use the output of a + python script that make the COMMIT and REVEAL calculation according to + the spec. Fixes #19977; bugfix on tor-0.2.9.1-alpha. diff --git a/src/test/sr_commit_calc_ref.py b/src/test/sr_commit_calc_ref.py new file mode 100644 index 0000000..45e629c --- /dev/null +++ b/src/test/sr_commit_calc_ref.py @@ -0,0 +1,51 @@ +# This is a reference implementation of the COMMIT/REVEAL calculation for +# prop250. We use it to generate a test vector for the test_encoding() +# unittest. +# +# Here is the computation formula: +# +# H = SHA3-256 +# TIMESTAMP = 8 bytes network-endian value +# RAND = H(32 bytes of random) +# +# REVEAL = base64-encode( TIMESTAMP || RAND ) +# COMMIT = base64-encode( TIMESTAMP || H(REVEAL) ) +# + +import sys +import hashlib +import struct +import base64 + +# Python 3.6+, the SHA3 is available in hashlib natively. Else this requires +# the pysha3 package (pip install pysha3). +if sys.version_info < (3, 6): + import sha3 + +# Test vector to make sure the right sha3 version will be used. pysha3 < 1.0 +# used the old Keccak implementation. During the finalization of SHA3, NIST +# changed the delimiter suffix from 0x01 to 0x06. The Keccak sponge function +# stayed the same. pysha3 1.0 provides the previous Keccak hash, too. +TEST_VALUE = "e167f68d6563d75bb25f3aa49c29ef612d41352dc00606de7cbd630bb2665f51" +if TEST_VALUE != sha3.sha3_256(b"Hello World").hexdigest(): + print("pysha3 version is < 1.0. Please install from:") + print("https://github.com/tiran/pysha3https://github.com/tiran/pysha3") + sys.exit(1) + +# TIMESTAMP +ts = 1454333590 +# RAND +data = 'A' * 32 # Yes very very random, NIST grade :). +rand = hashlib.sha3_256(data) + +reveal = struct.pack('!Q', ts) + rand.digest() +b64_reveal = base64.b64encode(reveal) +print("REVEAL: %s" % (b64_reveal)) + +# Yes we do hash the _encoded_ reveal here that is H(REVEAL) +hashed_reveal = hashlib.sha3_256(b64_reveal) +commit = struct.pack('!Q', ts) + hashed_reveal.digest() +print("COMMIT: %s" % (base64.b64encode(commit))) + +# REVEAL: AAAAAFavXpZJxbwTupvaJCTeIUCQmOPxAMblc7ChL5H2nZKuGchdaA== +# COMMIT: AAAAAFavXpbkBMzMQG7aNoaGLFNpm2Wkk1ozXhuWWqL//GynltxVAg== diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index d6787e4..8368300 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -370,26 +370,23 @@ static void test_encoding(void *arg) { (void) arg; - int ret, duper_rand = 42; + int ret; /* Random number is 32 bytes. */ char raw_rand[32]; time_t ts = 1454333590; char hashed_rand[DIGEST256_LEN], hashed_reveal[DIGEST256_LEN]; sr_commit_t parsed_commit; - /* Encoded commit is: base64-encode( 1454333590 || H(H(42)) ). Remember - * that we do no expose the raw bytes of our PRNG to the network thus - * explaining the double H(). */ - static const char *encoded_commit = - "AAAAAFavXpZbx2LRneYFSLPCP8DLp9BXfeH5FXzbkxM4iRXKGeA54g=="; - /* Encoded reveal is: base64-encode( 1454333590 || H(42) ). */ + /* Those values were generated by sr_commit_calc_ref.py where the random + * value is 32 'A' and timestamp is the one in ts. */ static const char *encoded_reveal = - "AAAAAFavXpYk9x9kTjiQWUqjHwSAEOdPAfCaurXgjPy173SzYjeC2g=="; + "AAAAAFavXpZJxbwTupvaJCTeIUCQmOPxAMblc7ChL5H2nZKuGchdaA=="; + static const char *encoded_commit = + "AAAAAFavXpbkBMzMQG7aNoaGLFNpm2Wkk1ozXhuWWqL//GynltxVAg=="; /* Set up our raw random bytes array. */ - memset(raw_rand, 0, sizeof(raw_rand)); - memcpy(raw_rand, &duper_rand, sizeof(duper_rand)); - /* Hash random number. */ + memset(raw_rand, 'A', sizeof(raw_rand)); + /* Hash random number because we don't expose bytes of the RNG. */ ret = crypto_digest256(hashed_rand, raw_rand, sizeof(raw_rand), SR_DIGEST_ALG); tt_int_op(0, ==, ret);

1 0

[torspec/master] Update proposal 264 based on implementation experience
by nickm＠torproject.org 26 Aug '16

26 Aug '16

commit 6561a518eeb5611731c37f3238fb0bc8888b76dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 26 13:27:08 2016 -0400 Update proposal 264 based on implementation experience --- proposals/264-subprotocol-versions.txt | 54 +++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/proposals/264-subprotocol-versions.txt b/proposals/264-subprotocol-versions.txt index 077ae55..e4357e5 100644 --- a/proposals/264-subprotocol-versions.txt +++ b/proposals/264-subprotocol-versions.txt @@ -42,7 +42,7 @@ Status: Open We revive the "Protocols" design above, in a new form. - "proto" Entries NL + "proto" SP Entries NL Entries = Entries = Entry @@ -62,9 +62,9 @@ Status: Open Each 'Entry' in the "proto" line indicates that the Tor relay supports one or more versions of the protocol in question. Entries - must be sorted by keyword. Values must be numerically ascending - within each entry. (This implies that there are no overlapping - ranges.) Ranges must be represented as compactly as possible. Ints + should be sorted by keyword. Values should be numerically ascending + within each entry. (This implies that there should be no overlapping + ranges.) Ranges should be represented as compactly as possible. Ints must be no more than 2^32 - 1. The semantics for each keyword must be defined in a Tor @@ -104,7 +104,7 @@ Status: Open inferrable from the v line. Removing all the v lines from the current consensus would save only 1.7% after gzip compression.] -3. Using "protos" and "v" lines +3. Using "proto" and "v" lines Whenever possible, clients and relays should use the list of advertised protocols instead of version numbers. Version numbers @@ -116,23 +116,26 @@ Status: Open 4. Required protocols - The consensus may contain four lines: RecommendedRelayProtocols, - RequiredRelayProtocols, RecommendedClientProtocols, and - RequiredClientProtocols. Each has the same format as the "protos" line. - To vote on these entries, a protocol/version combination is included only - if it is listed by a majority of the voters. + The consensus may contain four lines: + "recommended-relay-protocols", + "required-relay-protocols", + "recommended-client-protocols", and + "required-client-protocols". + Each has the same format as the "proto" line. To vote on these + entries, a protocol/version combination is included only if it is + listed by a majority of the voters. - When a relay lacks a protocol listed in RecommendeddRelayProtocols, it + When a relay lacks a protocol listed in recommended-relay-protocols, it should warn its operator that the relay is obsolete. - When a relay lacks a protocol listed in RequiredRelayProtocols, it + When a relay lacks a protocol listed in required-relay-protocols, it must not attempt to join the network. - When a client lacks a protocol listed in RecommendedClientProtocols, + When a client lacks a protocol listed in recommended-client-protocols, it should warn the user that the client is obsolete. - When a client lacks a protocol listed in RequiredClientProtocols, it + When a client lacks a protocol listed in required-client-protocols, it must not connect to the network. This implements a "safe forward shutdown" mechanism for zombie clients. @@ -140,11 +143,15 @@ Status: Open protocol is required, and it does not implement that protocol, it SHOULD NOT try to fetch a newer consensus. - The above features should be backported to 0.2.4 and later, or all the - versions we expect to continue supporting. + [[XXX I propose we remove this idea: + The above features should be backported to 0.2.4 and later, or all the + versions we expect to continue supporting.]] - These lines should be voted on, and should require a supermajority of + These lines should be voted on. A majority of votes is sufficient to + make a protocol un-supported. + + and should require a supermajority of authorities (2/3) to make a protocol required. The required protocols should not be torrc-configurable, but rather should be hardwired in the Tor code. @@ -278,7 +285,7 @@ Status: Open Adding new protocol types is pretty cheap, given compression. -A.1. Inferring missing protos lines. +A.1. Inferring missing proto lines. The directory authorities no longer allow versions of Tor before 0.2.4.18-rc. But right now, there is no version of Tor in the @@ -297,15 +304,16 @@ A.1. Inferring missing protos lines. A.2. Initial required protocols - For clients we will Recommend and Require: + For clients we will Recommend and Require these. For relays, we will + Recommend these: - DirCache=1 HSDir=1 Desc=1 Cons=9-20 Microdesc=9-20 - HSMid=1 Link=4 LinkAuth=1 Relay=2 + Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSMid=1 Link=4 + LinkAuth=1 Microdesc=1-2 Relay=2 For relays we will Require: - DirCache=1 HSDir=1 Desc=1 Cons=9-20 Microdesc=9-20 - HSMid=1 Link=3-4 LinkAuth=1 Relay=1-2 + Cons=1 Desc=1 DirCache=1 HSDir=1 HSMid=1 Link=3-4 + LinkAuth=1 icrodesc=1 Relay=1-2 A.3. Example integration with other open proposals

1 0

[torspec/master] Add a proposal for a better way to do 266
by nickm＠torproject.org 26 Aug '16

26 Aug '16

commit 68177157137e97359511cdf86675af2df3a3628c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 26 13:48:26 2016 -0400 Add a proposal for a better way to do 266 --- proposals/000-index.txt | 2 + proposals/272-valid-and-running-by-default.txt | 59 ++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index 41aec3d..d0376cd 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -192,6 +192,7 @@ Proposals by number: 269 Transitionally secure hybrid handshakes [DRAFT] 270 RebelAlliance: A Post-Quantum Secure Hybrid Handshake Based on NewHope [DRAFT] 271 Another algorithm for guard selection [OPEN] +272 Listed routers should be Valid, Running, and treated as such [OPEN] Proposals by status: @@ -251,6 +252,7 @@ Proposals by status: 262 Re-keying live circuits with new cryptographic material 264 Putting version numbers on the Tor subprotocols 271 Another algorithm for guard selection + 272 Listed routers should be Valid, Running, and treated as such ACCEPTED: 140 Provide diffs between consensuses 172 GETINFO controller option for circuit information diff --git a/proposals/272-valid-and-running-by-default.txt b/proposals/272-valid-and-running-by-default.txt new file mode 100644 index 0000000..7e14b6b --- /dev/null +++ b/proposals/272-valid-and-running-by-default.txt @@ -0,0 +1,59 @@ +Filename: 272-valid-and-running-by-default.txt +Title: Listed routers should be Valid, Running, and treated as such +Created: 26 Aug 2016 +Author: Nick Mathewson +Status: Open + +1. Introduction and proposal. + + This proposal describes a change in how clients understand consensus + flags, and how authorities vote on consensuses. + +1.1. Authority-side changes + + Back in proposal 138, we made it so that non-Running routers were not + included in the consensus documents. We should do the same with the + Valid flag. Specifically, after voting, if the authorities find that + a router would not receive the Valid flag, they should not include it + at all. + + This will require the allocation of a new consensus method, since it + is a change in how consensuses are made from votes. + + In the most recent consensus, it will affect exactly 1 router. + +1.2. Client-side changes + + I propose that clients should consider every listed router to be + listed as Running and Valid if any consensus method above or higher + is in use. + +2. Benefits + + Removing the notion of listed but invalid routers will remove an + opportunity for error, and let us remove some client side code. + + More interestingly, the above changes would allow us to eventually + stop including the Running and Valid flags, thereby providing an + authority-side way to feature-gate clients off of the Tor network + without a fast-zombie problem. (See proposal 266 for discussion.) + + +A. An additional possible change + + Perhaps authorities might also treat BadExit like they treat the + absence of Valid and Running: as sufficient reason to not include a + router in the consensus. Right now, there are only 4 listed BadExit + routers in the consensus, amounting to a small fraction of total + bandwidth. + + Making this change would allow us to remove the client-side badexit + logic. + + +B. Does this solve the zombie problem? + + I tested it a little, and it does seem to be a way to make even the + most ancient consensus-understanding Tors stop fetching descriptors + and using the network. More testing needed though. +

1 0

[torspec/master] prop250: Fix COMMIT construction to match the implementation
by dgoulet＠torproject.org 26 Aug '16

26 Aug '16

commit 0fbfd827779c8eb915270639cbd6e1290a6731b8 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Aug 26 11:21:10 2016 -0400 prop250: Fix COMMIT construction to match the implementation Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- proposals/250-commit-reveal-consensus.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/proposals/250-commit-reveal-consensus.txt b/proposals/250-commit-reveal-consensus.txt index 3e701fc..d05d11d 100644 --- a/proposals/250-commit-reveal-consensus.txt +++ b/proposals/250-commit-reveal-consensus.txt @@ -396,9 +396,7 @@ Supersedes: 225 The value COMMIT is computed as follows: - COMMIT = base64-encode( TIMESTAMP || H(H(RN)) ) - - where RN is the random value from REVEAL. + COMMIT = base64-encode( TIMESTAMP || H(REVEAL) ) 4.1.2. Validating commitments and reveals [VALIDATEVALUES]

1 0

[tor/master] Avoid asserts in oos/kill_conn_list unit test
by nickm＠torproject.org 26 Aug '16

26 Aug '16

commit 33a3e6f7183c791d7aa544e3878c66f4ede9a2e7 Author: Andrea Shepard <andrea(a)torproject.org> Date: Fri Aug 26 00:02:00 2016 +0000 Avoid asserts in oos/kill_conn_list unit test --- src/test/test_oos.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/test_oos.c b/src/test/test_oos.c index 3afb68b..db06625 100644 --- a/src/test/test_oos.c +++ b/src/test/test_oos.c @@ -294,6 +294,8 @@ test_oos_kill_conn_list(void *arg) dir_c2 = tor_malloc_zero(sizeof(*dir_c2)); dir_c2->base_.magic = DIR_CONNECTION_MAGIC; dir_c2->base_.type = CONN_TYPE_DIR; + dir_c2->base_.state = DIR_CONN_STATE_MIN_; + dir_c2->base_.purpose = DIR_PURPOSE_MIN_; c2 = TO_CONN(dir_c2); tt_assert(c1 != NULL);

1 0