June 2020 - tor-commits - lists.torproject.org

[tor/master] doc: specify C99 coding standards
by nickm＠torproject.org 04 Jun '20

04 Jun '20

commit 284e9459b8840bdf9865e756a0bb0e63e56bae77 Author: c <c(a)chroniko.jp> Date: Thu Jun 4 13:27:30 2020 +0000 doc: specify C99 coding standards Make clear that Tor's C code targets C99 standards. This makes it more explicit what to expect for new code, because guessing from existing code is not always reliable, especially for code that predates the change in standard. --- doc/HACKING/CodingStandards.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/HACKING/CodingStandards.md b/doc/HACKING/CodingStandards.md index a181759d6..99bc3e502 100644 --- a/doc/HACKING/CodingStandards.md +++ b/doc/HACKING/CodingStandards.md @@ -193,8 +193,9 @@ Why use changes files instead of entries in the ChangeLog? ## Whitespace and C conformance -Invoke `make check-spaces` from time to time, so it can tell you about -deviations from our C whitespace style. Generally, we use: +Tor's C code is written in accordance with the C99 standard. Invoke `make +check-spaces` from time to time, so it can tell you about deviations from our C +whitespace style. Generally, we use: - Unix-style line endings - K&R-style indentation @@ -213,6 +214,8 @@ deviations from our C whitespace style. Generally, we use: - Use `void foo(void)` to declare a function with no arguments. Saying `void foo()` is C++ syntax. - Use `const` for new APIs. + - Variables should be initialized when declared, rather than declared at the + top of a scope. If you use an editor that has plugins for editorconfig.org, the file `.editorconfig` will help you to conform this coding style.

1 0

[translation/tails-greeter-2] https://gitweb.torproject.org/translation.git/commit/?h=tails-greeter-2
by translation＠torproject.org 04 Jun '20

04 Jun '20

commit 90e0aaeb15b18128e01eb7ebf363ebcba2b2b552 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 4 12:19:32 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-greeter-2 --- ur/ur.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/ur/ur.po b/ur/ur.po index f820968ab4..96b1718c2a 100644 --- a/ur/ur.po +++ b/ur/ur.po @@ -10,6 +10,7 @@ # Muhammad Ishaq <ishaq(a)kahaf.com>, 2018 # Giovanni Pellerano <giovanni.pellerano(a)evilaliv3.org>, 2018 # erinm, 2018 +# iram hassan <iramhassan136(a)gmail.com>, 2020 # #, fuzzy msgid "" @@ -18,7 +19,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-05-11 00:25+0200\n" "PO-Revision-Date: 2016-11-18 21:29+0000\n" -"Last-Translator: erinm, 2018\n" +"Last-Translator: iram hassan <iramhassan136(a)gmail.com>, 2020\n" "Language-Team: Urdu (https://www.transifex.com/otf/teams/1519/ur/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -43,7 +44,7 @@ msgstr "" #: ../data/greeter.ui.h:4 msgid "Confirm" -msgstr "" +msgstr "تصدیق کی توسیع" #: ../data/greeter.ui.h:5 msgid "Confirm your administration password" @@ -51,7 +52,7 @@ msgstr "" #: ../data/greeter.ui.h:6 msgid "Disable" -msgstr "" +msgstr "Disable" #. This string will never be displayed in the 1st version of the greeter. #: ../data/greeter.ui.h:8 @@ -245,7 +246,7 @@ msgstr "" #: ../tailsgreeter/gui.py:397 msgid "Offline" -msgstr "" +msgstr "آف لائن" #: ../tailsgreeter/gui.py:481 msgid "Failed to relock persistent storage." @@ -261,19 +262,19 @@ msgstr "" #: ../tailsgreeter/gui.py:602 msgid "Cancel" -msgstr "" +msgstr "تنسیخ کیجیے" #: ../tailsgreeter/gui.py:608 msgid "Add" -msgstr "" +msgstr "شامل کریں" #: ../tailsgreeter/gui.py:616 msgid "Back" -msgstr "" +msgstr "پیچھے" #: ../tailsgreeter/gui.py:730 msgid "Shutdown" -msgstr "" +msgstr "Shutdown" #: ../tailsgreeter/gui.py:735 msgid "_Start Tails"

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 04 Jun '20

04 Jun '20

commit b7ee1f1087342c2f73fd88d29e22014d8096f19d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 4 12:18:56 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- ur.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ur.po b/ur.po index c895f2f088..45101a95e9 100644 --- a/ur.po +++ b/ur.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-03-21 09:59+0100\n" -"PO-Revision-Date: 2020-03-25 13:13+0000\n" -"Last-Translator: Ali Kamran <kamran(a)digitalrightsfoundation.pk>\n" +"PO-Revision-Date: 2020-06-04 11:52+0000\n" +"Last-Translator: iram hassan <iramhassan136(a)gmail.com>\n" "Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 04 Jun '20

04 Jun '20

commit 74b55ebe938f6892ee9bd336db2bd74061cd9e9e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 4 12:17:16 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- ur.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ur.po b/ur.po index a901aeba40..480d0ee74c 100644 --- a/ur.po +++ b/ur.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-03-21 09:59+0100\n" -"PO-Revision-Date: 2020-03-25 13:13+0000\n" -"Last-Translator: Ali Kamran <kamran(a)digitalrightsfoundation.pk>\n" +"PO-Revision-Date: 2020-06-04 11:52+0000\n" +"Last-Translator: iram hassan <iramhassan136(a)gmail.com>\n" "Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1522,7 +1522,7 @@ msgstr "" #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124 msgid "Disable" -msgstr "" +msgstr "Disable" #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 04 Jun '20

04 Jun '20

commit 19a4072f275150365579c96f7e49df80120e7579 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 4 11:53:26 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ur.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contents+ur.po b/contents+ur.po index 88e183a7f1..f82c1f4cf6 100644 --- a/contents+ur.po +++ b/contents+ur.po @@ -1,9 +1,11 @@ +# # Translators: # Muhammad Ishaq <ishaq(a)kahaf.com>, 2019 # Furhan Hussain <furhan(a)bytesforall.pk>, 2019 # Tor Project <support-team-private(a)lists.torproject.org>, 2019 # erinm, 2019 # Ali Kamran <kamran(a)digitalrightsfoundation.pk>, 2020 +# iram hassan <iramhassan136(a)gmail.com>, 2020 # msgid "" msgstr "" @@ -11,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-02-24 13:39+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Ali Kamran <kamran(a)digitalrightsfoundation.pk>, 2020\n" +"Last-Translator: iram hassan <iramhassan136(a)gmail.com>, 2020\n" "Language-Team: Urdu (https://www.transifex.com/otf/teams/1519/ur/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -664,7 +666,7 @@ msgstr "" #: lego/templates/footer.html:75 templates/footer-min.html:48 #: templates/footer.html:75 msgid "Sign up" -msgstr "" +msgstr "Sign up" #: lego/templates/footer.html:94 templates/footer-min.html:67 #: templates/footer.html:94

1 0

[tpo/master] This project ended in 2019
by gus＠torproject.org 04 Jun '20

04 Jun '20

commit 62ec75cef9c8a5b78cd29adcec91f6d439939b20 Author: gus <gus(a)torproject.org> Date: Wed Jun 3 22:23:22 2020 -0400 This project ended in 2019 --- content/about/sponsors/DARPA-penn/contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/about/sponsors/DARPA-penn/contents.lr b/content/about/sponsors/DARPA-penn/contents.lr index c96ea062..173860db 100644 --- a/content/about/sponsors/DARPA-penn/contents.lr +++ b/content/about/sponsors/DARPA-penn/contents.lr @@ -2,7 +2,7 @@ _model: sponsor --- active: False --- -time: 2018 - 2020 +time: 2018 - 2019 --- name: DARPA via University of Pennsylvania --- @@ -16,4 +16,4 @@ link: https://www.darpa.mil/program/extreme-ddos-defense --- description: -DARPA’s Extreme DDoS Defense (XD3) program focuses on three broad areas of opportunity to improve resilience against DDoS attacks and aims to thwart DDoS attacks. This contract supports our work addressing denial of service attacks on free and open communication on the internet. \ No newline at end of file +DARPA’s Extreme DDoS Defense (XD3) program focuses on three broad areas of opportunity to improve resilience against DDoS attacks and aims to thwart DDoS attacks. This contract supports our work addressing denial of service attacks on free and open communication on the internet.

1 0

[tpo/master] DARPA via University of Pennsylvania is no longer an active sponsor as of June 2020
by gus＠torproject.org 03 Jun '20

03 Jun '20

commit 58b7da09bb29ccc4bdec61f3365f1428f55b2612 Author: Bekeela Davila <bekeela(a)torproject.org> Date: Wed Jun 3 18:16:04 2020 +0000 DARPA via University of Pennsylvania is no longer an active sponsor as of June 2020 --- content/about/sponsors/DARPA-penn/contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/about/sponsors/DARPA-penn/contents.lr b/content/about/sponsors/DARPA-penn/contents.lr index dd73dcac..c96ea062 100644 --- a/content/about/sponsors/DARPA-penn/contents.lr +++ b/content/about/sponsors/DARPA-penn/contents.lr @@ -1,8 +1,8 @@ _model: sponsor --- -active: True +active: False --- -time: 2018 - Present +time: 2018 - 2020 --- name: DARPA via University of Pennsylvania ---

1 0

[chutney/master] Adding regex to search microdescriptor files for relay ed25519 keys
by nickm＠torproject.org 03 Jun '20

03 Jun '20

commit 5f80ae467f88adf8685737d6543cf9a4eb0f931a Author: ANURADHAJHA99 <anuradha750871(a)gmail.com> Date: Tue Mar 24 18:33:33 2020 +0530 Adding regex to search microdescriptor files for relay ed25519 keys --- lib/chutney/TorNet.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 1c24053..1d9f7c7 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -806,7 +806,7 @@ class LocalNodeBuilder(NodeBuilder): if CURRENT_ED25519_BASE64_KEY_SIZE != EXPECTED_ED25519_BASE64_KEY_SIZE: raise ValueError("The current length of the key is {}, which is not matching the expected length of {}".format(CURRENT_ED25519_BASE64_KEY_SIZE, EXPECTED_ED25519_BASE64_KEY_SIZE)) else: - self._env['ed25519-id'] = ed25519_id + self._env['ed25519_id'] = ed25519_id def _getAltAuthLines(self, hasbridgeauth=False): """Return a combination of AlternateDirAuthority, @@ -1354,6 +1354,8 @@ class LocalNodeController(NodeController): the ed25519 key. (Or RSA block matching, which is hard.) """ nickname = self.getNick() + ed25519_id = self._setEd25519Id() + cons = dir_format in ["ns_cons", "md_cons", @@ -1378,10 +1380,11 @@ class LocalNodeController(NodeController): return r'^router ' + nickname + " " elif md: # Not yet implemented, see #33428 + return r'^id ed25519 ' + re.escape('ed25519_id') # r'^id ed25519 " + ed25519_identity (end of line) # needs ed25519-identity from #30642 # or the existing keys/ed25519_master_id_public_key - return None + #return None def getFileDirInfoStatus(self, dir_format, dir_path): """Check dir_path, a directory path used by another node, to see if

1 0

[chutney/master] resolving the ed25519_key and the calling of function issues
by nickm＠torproject.org 03 Jun '20

03 Jun '20

commit bda9f452536d9fad2886256c07ad7f1b80d0729a Author: ANURADHAJHA99 <anuradha750871(a)gmail.com> Date: Fri Apr 10 00:05:28 2020 +0530 resolving the ed25519_key and the calling of function issues --- lib/chutney/TorNet.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 706027a..20e28c1 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -49,8 +49,7 @@ class MissingBinaryException(Exception): pass def getenv_type(env_var, default, type_, type_name=None): - """ - Return the value of the environment variable 'envar' as type_, + """ Return the value of the environment variable 'envar' as type_, or 'default' if no such variable exists. Raise ValueError using type_name if the environment variable is set, but type_() raises a ValueError on its value. (If type_name is None @@ -666,7 +665,6 @@ class LocalNodeBuilder(NodeBuilder): self._genAuthorityKey() if self._env['relay']: self._genRouterKey() - #self._setEd25519Id() if self._env['hs']: self._makeHiddenServiceDir() @@ -865,6 +863,7 @@ class LocalNodeController(NodeController): rest_file = f.read() encoded_value = base64.b64encode(rest_file) ed25519_id = encoded_value.decode('utf-8').replace('=', '') + print('abcd') EXPECTED_ED25519_BASE64_KEY_SIZE = 43 CURRENT_ED25519_BASE64_KEY_SIZE = len(ed25519_id) if CURRENT_ED25519_BASE64_KEY_SIZE != EXPECTED_ED25519_BASE64_KEY_SIZE: @@ -873,9 +872,11 @@ class LocalNodeController(NodeController): self._env['ed25519_id'] = ed25519_id def __init__(self, env): - NodeController.__init__(self, env) + NodeController.__init__(self,env) self._env = env - + #print('abcd') + self._setEd25519Id() + def getNick(self): """Return the nickname for this node.""" return self._env['nick'] @@ -890,6 +891,7 @@ class LocalNodeController(NodeController): def getEd25519Id(self): """Return the value of ed25519 key""" try: + #self._setEd25519Id() return self._env['ed25519_id'] except KeyError: return None @@ -1328,7 +1330,7 @@ class LocalNodeController(NodeController): def getNodeDirInfoStatusPattern(self, dir_format): """Returns a regular expression pattern for finding this node's entry - in a dir_format file and returning None if nickname or ed25519_id key not found. + in a dir_format file. Returns None if the requested pattern is not available. """ nickname = self.getNick() ed25519_key = self.getEd25519Id()

1 0

[chutney/master] Added function in TorNet.py to make chutney check for relay microdescriptors before verifying
by nickm＠torproject.org 03 Jun '20

03 Jun '20

commit 7d42052b903e04b77c2c3355955a78d32ed0e4c0 Author: ANURADHAJHA99 <anuradha750871(a)gmail.com> Date: Tue Mar 17 23:48:09 2020 +0530 Added function in TorNet.py to make chutney check for relay microdescriptors before verifying --- lib/chutney/TorNet.py | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 697025e..1c24053 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -22,6 +22,7 @@ import signal import subprocess import sys import time +import base64 from chutney.Debug import debug_flag, debug @@ -684,9 +685,10 @@ class LocalNodeBuilder(NodeBuilder): self._genAuthorityKey() if self._env['relay']: self._genRouterKey() + self._setEd25519Id() if self._env['hs']: self._makeHiddenServiceDir() - + def config(self, net): """Called to configure a node: creates a torrc file for it.""" self._createTorrcFile() @@ -780,7 +782,32 @@ class LocalNodeBuilder(NodeBuilder): .format(repr(" ".join(cmdline)), repr(stdouterr))) sys.exit(1) self._env['fingerprint'] = fingerprint - + + def _setEd25519Id(self): + """Read the ed25519 identity key for this router, and set up the 'ed25519-id' entry in the Environ""" + datadir = self._env['dir'] + key_file = os.path.join(datadir, 'keys', "ed25519_master_id_public_key") + EXPECTED_ED25519_FILE_SIZE = 64 + CURRENT_FILE_SIZE = os.stat(key_file).st_size + if not os.path.exists(key_file): + print("File {} does not exist. Are you running a very old tor version?".format(key_file)) + return + elif CURRENT_FILE_SIZE != EXPECTED_ED25519_FILE_SIZE: + raise ValueError("The current size of the file is {} bytes, which is not matching the expected value of {} bytes".format(CURRENT_FILE_SIZE, EXPECTED_ED25519_FILE_SIZE)) + else: + with open(key_file, 'rb') as f: + ED25519_KEY_POSITION = 32 + f.seek(ED25519_KEY_POSITION) + rest_file = f.read() + encoded_value = base64.b64encode(rest_file) + ed25519_id = encoded_value.decode('utf-8').replace('=', '') + EXPECTED_ED25519_BASE64_KEY_SIZE = 43 + CURRENT_ED25519_BASE64_KEY_SIZE = len(ed25519_id) + if CURRENT_ED25519_BASE64_KEY_SIZE != EXPECTED_ED25519_BASE64_KEY_SIZE: + raise ValueError("The current length of the key is {}, which is not matching the expected length of {}".format(CURRENT_ED25519_BASE64_KEY_SIZE, EXPECTED_ED25519_BASE64_KEY_SIZE)) + else: + self._env['ed25519-id'] = ed25519_id + def _getAltAuthLines(self, hasbridgeauth=False): """Return a combination of AlternateDirAuthority, and AlternateBridgeAuthority lines for

1 0