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

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 28 Jun '17

28 Jun '17

commit 02b15903a8000a6565f92c1cda404b63ec3ae7fb Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 28 16:46:37 2017 +0000 Update translations for mat-gui --- it.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/it.po b/it.po index 5f95655..2fd8935 100644 --- a/it.po +++ b/it.po @@ -5,19 +5,19 @@ # Translators: # Francesca Ciceri <madamezou(a)zouish.org>, 2014 # Francesca Ciceri <madamezou(a)zouish.org>, 2014 -# Giuseppe Pignataro <rogepix(a)gmail.com>, 2015 +# Giuseppe Pignataro (Fasbyte01) <rogepix(a)gmail.com>, 2015 # Maxime <maijin21(a)gmail.com>, 2013 # Maxime <maijin21(a)gmail.com>, 2013 # Random_R, 2013-2014 # Rossano Praderi <dshortway(a)gmail.com>, 2013 -# Walter Nosay, 2016 +# Raffox97, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2016-06-02 14:44+0000\n" -"Last-Translator: Walter Nosay\n" +"PO-Revision-Date: 2017-06-28 16:35+0000\n" +"Last-Translator: Raffox97\n" "Language-Team: Italian (http://www.transifex.com/otf/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 28 Jun '17

28 Jun '17

commit 52fd018d8d50591ca9bba8483313943775cfe8c6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 28 16:45:43 2017 +0000 Update translations for tails-greeter --- it/it.po | 54 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/it/it.po b/it/it.po index ba34edd..c07b351 100644 --- a/it/it.po +++ b/it/it.po @@ -9,15 +9,17 @@ # Francesca Ciceri <madamezou(a)zouish.org>, 2014 # spawned76 <fswitch20(a)hotmail.com>, 2012 # il_doc, 2014 +# il_doc, 2014 # Random_R, 2014-2015 # spawned76 <fswitch20(a)hotmail.com>, 2012 +# spawned76 <fswitch20(a)hotmail.com>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-06-10 12:27+0200\n" -"PO-Revision-Date: 2017-06-13 13:25+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2017-06-28 16:35+0000\n" +"Last-Translator: Sebastiano Pistore <olatusrooc(a)virgilio.it>\n" "Language-Team: Italian (http://www.transifex.com/otf/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,7 +29,7 @@ msgstr "" #: ../data/greeter.ui.h:1 msgid "Administration Password" -msgstr "" +msgstr "Password di amministrazione" #: ../data/greeter.ui.h:2 msgid "" @@ -38,19 +40,19 @@ msgstr "" #: ../data/greeter.ui.h:3 msgid "Enter an administration password" -msgstr "" +msgstr "Inserire una password di amministrazione" #: ../data/greeter.ui.h:4 msgid "Confirm" -msgstr "" +msgstr "Conferma" #: ../data/greeter.ui.h:5 msgid "Confirm your administration password" -msgstr "" +msgstr "Confermare la password di amministrazione" #: ../data/greeter.ui.h:6 msgid "Disable" -msgstr "" +msgstr "Disabilita" #. This string will never be displayed in the 1st version of the greeter. #: ../data/greeter.ui.h:8 @@ -101,7 +103,7 @@ msgstr "" #: ../data/greeter.ui.h:19 msgid "Welcome to Tails!" -msgstr "" +msgstr "Benvenuto in Tails!" #. This string will never be displayed in the 1st version of the greeter. #: ../data/greeter.ui.h:21 @@ -112,11 +114,11 @@ msgstr "" #: ../data/greeter.ui.h:22 msgid "Language & Region" -msgstr "" +msgstr "Area geografica e lingua" #: ../data/greeter.ui.h:23 msgid "Default Settings" -msgstr "" +msgstr "Impostazioni predefinite" #: ../data/greeter.ui.h:24 msgid "Save Language & Region Settings" @@ -124,7 +126,7 @@ msgstr "" #: ../data/greeter.ui.h:25 msgid "_Language" -msgstr "" +msgstr "_Lingua" #: ../data/greeter.ui.h:26 msgid "_Keyboard Layout" @@ -132,7 +134,7 @@ msgstr "" #: ../data/greeter.ui.h:27 msgid "_Formats" -msgstr "" +msgstr "_Formati" #: ../data/greeter.ui.h:28 msgid "_Time Zone" @@ -144,7 +146,7 @@ msgstr "" #: ../data/greeter.ui.h:30 msgid "Show Passphrase" -msgstr "" +msgstr "Mostra passphrase" #: ../data/greeter.ui.h:31 msgid "Configure Persistent Storage" @@ -157,7 +159,7 @@ msgstr "" #: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478 #: ../tailsgreeter/gui.py:528 msgid "Unlock" -msgstr "" +msgstr "Sblocca" #: ../data/greeter.ui.h:34 msgid "Relock Persistent Storage" @@ -173,7 +175,7 @@ msgstr "" #: ../data/greeter.ui.h:37 msgid "Save Additional Settings" -msgstr "" +msgstr "Salvare Impostazioni aggiuntive" #: ../data/greeter.ui.h:38 msgid "Add an additional setting" @@ -181,7 +183,7 @@ msgstr "" #: ../data/greeter.ui.h:39 msgid "Network Configuration" -msgstr "" +msgstr "Configurazione di rete" #: ../data/greeter.ui.h:40 msgid "" @@ -214,7 +216,7 @@ msgstr "" #: ../data/greeter.ui.h:46 msgid "Off (default)" -msgstr "" +msgstr "Off (predefinito)" #: ../data/greeter.ui.h:47 msgid "_MAC Address Spoofing" @@ -222,7 +224,7 @@ msgstr "" #: ../data/greeter.ui.h:48 msgid "On (default)" -msgstr "" +msgstr "On (predefinito)" #: ../data/greeter.ui.h:49 msgid "_Network Connection" @@ -238,11 +240,11 @@ msgstr "" #: ../tailsgreeter/gui.py:391 msgid "Bridge & Proxy" -msgstr "" +msgstr "Bridge & proxy" #: ../tailsgreeter/gui.py:397 msgid "Offline" -msgstr "" +msgstr "Offline" #: ../tailsgreeter/gui.py:481 msgid "Failed to relock persistent storage." @@ -250,27 +252,27 @@ msgstr "" #: ../tailsgreeter/gui.py:499 msgid "Unlocking…" -msgstr "" +msgstr "Sbloccaggio in corso…" #: ../tailsgreeter/gui.py:594 msgid "Additional Settings" -msgstr "" +msgstr "Impostazioni aggiuntive" #: ../tailsgreeter/gui.py:602 msgid "Cancel" -msgstr "" +msgstr "Annulla" #: ../tailsgreeter/gui.py:608 msgid "Add" -msgstr "" +msgstr "Aggiungi" #: ../tailsgreeter/gui.py:616 msgid "Back" -msgstr "" +msgstr "Indietro" #: ../tailsgreeter/gui.py:730 msgid "Shutdown" -msgstr "" +msgstr "Arresto" #: ../tailsgreeter/gui.py:735 msgid "_Start Tails"

1 0

[tor/maint-0.3.1] Fix crash in LZMA module when the Sandbox is enabled.
by nickm＠torproject.org 28 Jun '17

28 Jun '17

commit c239b2fc9c19d7c146888b534a8b51a88df03326 Author: Alexander Færøy <ahf(a)0x90.dk> Date: Wed Jun 28 09:57:58 2017 -0400 Fix crash in LZMA module when the Sandbox is enabled. This patch fixes a crash in our LZMA module where liblzma will allocate slightly more data than it is allowed to by its limit, which leads to a crash. See: https://bugs.torproject.org/22751 --- changes/bug22751 | 5 +++++ src/common/sandbox.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/changes/bug22751 b/changes/bug22751 new file mode 100644 index 0000000..714525c --- /dev/null +++ b/changes/bug22751 @@ -0,0 +1,5 @@ + o Major bugfixes (compression): + - Fix crash in LZMA module, when the Sandbox is enabled, where + liblzma would allocate more than 16 MB of memory. We solve this + by bumping the mprotect() limit in the Sandbox module from 16 MB + to 20 MB. Fixes bug 22751; bugfix on 0.3.1.1-alpha. diff --git a/src/common/sandbox.c b/src/common/sandbox.c index aae0705..52caa4f 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -19,8 +19,14 @@ #define _LARGEFILE64_SOURCE #endif -/** Malloc mprotect limit in bytes. */ -#define MALLOC_MP_LIM (16*1024*1024) +/** Malloc mprotect limit in bytes. + * + * 28/06/2017: This value was increased from 16 MB to 20 MB after we introduced + * LZMA support in Tor (0.3.1.1-alpha). We limit our LZMA coder to 16 MB, but + * liblzma have a small overhead that we need to compensate for to avoid being + * killed by the sandbox. + */ +#define MALLOC_MP_LIM (20*1024*1024) #include <stdio.h> #include <string.h>

1 0

[tor/master] Fix crash in LZMA module when the Sandbox is enabled.
by nickm＠torproject.org 28 Jun '17

28 Jun '17

commit c239b2fc9c19d7c146888b534a8b51a88df03326 Author: Alexander Færøy <ahf(a)0x90.dk> Date: Wed Jun 28 09:57:58 2017 -0400 Fix crash in LZMA module when the Sandbox is enabled. This patch fixes a crash in our LZMA module where liblzma will allocate slightly more data than it is allowed to by its limit, which leads to a crash. See: https://bugs.torproject.org/22751 --- changes/bug22751 | 5 +++++ src/common/sandbox.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/changes/bug22751 b/changes/bug22751 new file mode 100644 index 0000000..714525c --- /dev/null +++ b/changes/bug22751 @@ -0,0 +1,5 @@ + o Major bugfixes (compression): + - Fix crash in LZMA module, when the Sandbox is enabled, where + liblzma would allocate more than 16 MB of memory. We solve this + by bumping the mprotect() limit in the Sandbox module from 16 MB + to 20 MB. Fixes bug 22751; bugfix on 0.3.1.1-alpha. diff --git a/src/common/sandbox.c b/src/common/sandbox.c index aae0705..52caa4f 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -19,8 +19,14 @@ #define _LARGEFILE64_SOURCE #endif -/** Malloc mprotect limit in bytes. */ -#define MALLOC_MP_LIM (16*1024*1024) +/** Malloc mprotect limit in bytes. + * + * 28/06/2017: This value was increased from 16 MB to 20 MB after we introduced + * LZMA support in Tor (0.3.1.1-alpha). We limit our LZMA coder to 16 MB, but + * liblzma have a small overhead that we need to compensate for to avoid being + * killed by the sandbox. + */ +#define MALLOC_MP_LIM (20*1024*1024) #include <stdio.h> #include <string.h>

1 0

[tor/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 28 Jun '17

28 Jun '17

commit 01404d7c52a7c9b5756a73d662811da70d7a8378 Merge: a794fb7 c239b2f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 28 12:25:09 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22751 | 5 +++++ src/common/sandbox.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.1] Fix crash in LZMA module when the Sandbox is enabled.
by nickm＠torproject.org 28 Jun '17

28 Jun '17

commit c239b2fc9c19d7c146888b534a8b51a88df03326 Author: Alexander Færøy <ahf(a)0x90.dk> Date: Wed Jun 28 09:57:58 2017 -0400 Fix crash in LZMA module when the Sandbox is enabled. This patch fixes a crash in our LZMA module where liblzma will allocate slightly more data than it is allowed to by its limit, which leads to a crash. See: https://bugs.torproject.org/22751 --- changes/bug22751 | 5 +++++ src/common/sandbox.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/changes/bug22751 b/changes/bug22751 new file mode 100644 index 0000000..714525c --- /dev/null +++ b/changes/bug22751 @@ -0,0 +1,5 @@ + o Major bugfixes (compression): + - Fix crash in LZMA module, when the Sandbox is enabled, where + liblzma would allocate more than 16 MB of memory. We solve this + by bumping the mprotect() limit in the Sandbox module from 16 MB + to 20 MB. Fixes bug 22751; bugfix on 0.3.1.1-alpha. diff --git a/src/common/sandbox.c b/src/common/sandbox.c index aae0705..52caa4f 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -19,8 +19,14 @@ #define _LARGEFILE64_SOURCE #endif -/** Malloc mprotect limit in bytes. */ -#define MALLOC_MP_LIM (16*1024*1024) +/** Malloc mprotect limit in bytes. + * + * 28/06/2017: This value was increased from 16 MB to 20 MB after we introduced + * LZMA support in Tor (0.3.1.1-alpha). We limit our LZMA coder to 16 MB, but + * liblzma have a small overhead that we need to compensate for to avoid being + * killed by the sandbox. + */ +#define MALLOC_MP_LIM (20*1024*1024) #include <stdio.h> #include <string.h>

1 0

[stem/master] Sign created extrainfo descriptors
by atagar＠torproject.org 28 Jun '17

28 Jun '17

commit 05f0dc8763e18f7aa0c3aca8d209c1a901ffaf94 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 28 09:24:46 2017 -0700 Sign created extrainfo descriptors Extrainfo descriptors are signed the same way as server descriptors so simple to add support. Good opportunity too for generalizing this. --- stem/descriptor/__init__.py | 81 ++++++++++++++++++++++++++++ stem/descriptor/extrainfo_descriptor.py | 17 ++++-- stem/descriptor/server_descriptor.py | 57 +++++--------------- test/unit/descriptor/extrainfo_descriptor.py | 2 +- 4 files changed, 108 insertions(+), 49 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 80901af..21e7bd7 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -39,6 +39,7 @@ Package for parsing and processing descriptor data. import base64 import codecs +import collections import copy import hashlib import os @@ -99,6 +100,18 @@ DocumentHandler = stem.util.enum.UppercaseEnum( ) +class SigningKey(collections.namedtuple('SigningKey', ['private', 'public', 'public_digest'])): + """ + Key used by relays to sign their server and extrainfo descriptors. + + .. versionadded:: 1.6.0 + + :var cryptography.hazmat.backends.openssl.rsa._RSAPrivateKey private: private key + :var cryptography.hazmat.backends.openssl.rsa._RSAPublicKey public: public key + :var bytes public_digest: block that can be used for the a server descrptor's 'signing-key' field + """ + + def parse_file(descriptor_file, descriptor_type = None, validate = False, document_handler = DocumentHandler.ENTRIES, normalize_newlines = None, **kwargs): """ Simple function to read the descriptor contents from a file, providing an @@ -953,6 +966,74 @@ def _get_pseudo_pgp_block(remaining_contents): return None +def _signing_key(private_key = None): + """ + Serializes a signing key if we have one. Otherwise this creates a new signing + key we can use to create descriptors. + + :param cryptography.hazmat.backends.openssl.rsa._RSAPrivateKey private_key: private key + + :returns: :class:`~stem.descriptor.__init__.SigningKey` that can be used to + create descriptors + """ + + if not stem.prereq.is_crypto_available(): + raise ImportError('Signing requires the cryptography module') + + from cryptography.hazmat.backends import default_backend + from cryptography.hazmat.primitives import serialization + from cryptography.hazmat.primitives.asymmetric import rsa + + if private_key is None: + private_key = rsa.generate_private_key( + public_exponent = 65537, + key_size = 1024, + backend = default_backend(), + ) + + # When signing the cryptography module includes a constant indicating + # the hash algorithm used. Tor doesn't. This causes signature + # validation failures and unfortunately cryptography have no nice way + # of excluding these so we need to mock out part of their internals... + # + # https://github.com/pyca/cryptography/issues/3713 + + def no_op(*args, **kwargs): + return 1 + + private_key._backend._lib.EVP_PKEY_CTX_set_signature_md = no_op + private_key._backend.openssl_assert = no_op + + public_key = private_key.public_key() + public_digest = b'\n' + public_key.public_bytes( + encoding = serialization.Encoding.PEM, + format = serialization.PublicFormat.PKCS1, + ).strip() + + return SigningKey(private_key, public_key, public_digest) + + +def _append_router_signature(content, private_key): + """ + Appends a router signature to a server or extrainfo descriptor. + + :param bytes content: descriptor content up through 'router-signature\\n' + :param cryptography.hazmat.backends.openssl.rsa._RSAPrivateKey private_key: + private relay signing key + + :returns: **bytes** with the signed descriptor content + """ + + if not stem.prereq.is_crypto_available(): + raise ImportError('Signing requires the cryptography module') + + from cryptography.hazmat.primitives import hashes + from cryptography.hazmat.primitives.asymmetric import padding + + signature = base64.b64encode(private_key.sign(content, padding.PKCS1v15(), hashes.SHA1())) + return content + b'\n'.join([b'-----BEGIN SIGNATURE-----'] + stem.util.str_tools._split_by_length(signature, 64) + [b'-----END SIGNATURE-----\n']) + + def _random_ipv4_address(): return '%i.%i.%i.%i' % (random.randint(0, 255), random.randint(0, 255), random.randint(0, 255), random.randint(0, 255)) diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index c0484ad..3b4e9a4 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -89,6 +89,8 @@ from stem.descriptor import ( _parse_timestamp_line, _parse_forty_character_hex, _parse_key_block, + _signing_key, + _append_router_signature, ) try: @@ -973,11 +975,20 @@ class RelayExtraInfoDescriptor(ExtraInfoDescriptor): }) @classmethod - def content(cls, attr = None, exclude = (), sign = False): + def content(cls, attr = None, exclude = (), sign = False, private_signing_key = None): if sign: - raise NotImplementedError('Signing of %s not implemented' % cls.__name__) + if attr and 'router-signature' in attr: + raise ValueError('Cannot sign the descriptor if a router-signature has been provided') - return _descriptor_content(attr, exclude, sign, RELAY_EXTRAINFO_HEADER, RELAY_EXTRAINFO_FOOTER) + signing_key = _signing_key(private_signing_key) + content = _descriptor_content(attr, exclude, sign, RELAY_EXTRAINFO_HEADER) + b'\nrouter-signature\n' + return _append_router_signature(content, signing_key.private) + else: + return _descriptor_content(attr, exclude, sign, RELAY_EXTRAINFO_HEADER, RELAY_EXTRAINFO_FOOTER) + + @classmethod + def create(cls, attr = None, exclude = (), validate = True, sign = False, private_signing_key = None): + return cls(cls.content(attr, exclude, sign, private_signing_key), validate = validate) @lru_cache() def digest(self): diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 6ffe914..580b3d3 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -66,6 +66,8 @@ from stem.descriptor import ( _parse_forty_character_hex, _parse_protocol_line, _parse_key_block, + _signing_key, + _append_router_signature, _random_ipv4_address, _random_date, _random_crypto_blob, @@ -801,6 +803,9 @@ class RelayDescriptor(ServerDescriptor): @classmethod def content(cls, attr = None, exclude = (), sign = False, private_signing_key = None): + if attr is None: + attr = {} + base_header = ( ('router', 'Unnamed%i %s 9001 0 0' % (random.randint(0, sys.maxint), _random_ipv4_address())), ('published', _random_date()), @@ -810,59 +815,21 @@ class RelayDescriptor(ServerDescriptor): ('signing-key', _random_crypto_blob('RSA PUBLIC KEY')), ) - base_footer = ( - ('router-signature', _random_crypto_blob('SIGNATURE')), - ) - if sign: - if not stem.prereq.is_crypto_available(): - raise ImportError('Signing requires the cryptography module') - elif attr and 'signing-key' in attr: + if attr and 'signing-key' in attr: raise ValueError('Cannot sign the descriptor if a signing-key has been provided') elif attr and 'router-signature' in attr: raise ValueError('Cannot sign the descriptor if a router-signature has been provided') - from cryptography.hazmat.backends import default_backend - from cryptography.hazmat.primitives import hashes, serialization - from cryptography.hazmat.primitives.asymmetric import padding, rsa - - if attr is None: - attr = {} - - if private_signing_key is None: - private_signing_key = rsa.generate_private_key( - public_exponent = 65537, - key_size = 1024, - backend = default_backend(), - ) - - # When signing the cryptography module includes a constant indicating - # the hash algorithm used. Tor doesn't. This causes signature - # validation failures and unfortunately cryptography have no nice way - # of excluding these so we need to mock out part of their internals... - # - # https://github.com/pyca/cryptography/issues/3713 - - def no_op(*args, **kwargs): - return 1 - - private_signing_key._backend._lib.EVP_PKEY_CTX_set_signature_md = no_op - private_signing_key._backend.openssl_assert = no_op - - # create descriptor content without the router-signature, then - # appending the content signature - - attr['signing-key'] = b'\n' + private_signing_key.public_key().public_bytes( - encoding = serialization.Encoding.PEM, - format = serialization.PublicFormat.PKCS1, - ).strip() + signing_key = _signing_key(private_signing_key) + attr['signing-key'] = signing_key.public_digest content = _descriptor_content(attr, exclude, sign, base_header) + b'\nrouter-signature\n' - signature = base64.b64encode(private_signing_key.sign(content, padding.PKCS1v15(), hashes.SHA1())) - - return content + b'\n'.join([b'-----BEGIN SIGNATURE-----'] + stem.util.str_tools._split_by_length(signature, 64) + [b'-----END SIGNATURE-----\n']) + return _append_router_signature(content, signing_key.private) else: - return _descriptor_content(attr, exclude, sign, base_header, base_footer) + return _descriptor_content(attr, exclude, sign, base_header, ( + ('router-signature', _random_crypto_blob('SIGNATURE')), + )) @classmethod def create(cls, attr = None, exclude = (), validate = True, sign = False, private_signing_key = None): diff --git a/test/unit/descriptor/extrainfo_descriptor.py b/test/unit/descriptor/extrainfo_descriptor.py index d41f68b..1f91e72 100644 --- a/test/unit/descriptor/extrainfo_descriptor.py +++ b/test/unit/descriptor/extrainfo_descriptor.py @@ -136,7 +136,7 @@ k0d2aofcVbHr4fPQOSST0LXDrhFl5Fqo5um296zpJGvRUeO6S44U/EfJAGShtqWw @test.require.cryptography def test_descriptor_signing(self): - self.assertRaisesRegexp(NotImplementedError, 'Signing of RelayExtraInfoDescriptor not implemented', RelayExtraInfoDescriptor.create, sign = True) + RelayExtraInfoDescriptor.create(sign = True) self.assertRaisesRegexp(NotImplementedError, 'Signing of BridgeExtraInfoDescriptor not implemented', BridgeExtraInfoDescriptor.create, sign = True) def test_multiple_metrics_bridge_descriptors(self):

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 28 Jun '17

28 Jun '17

commit 6a88984d58feb55662b4313850e63ab9f429a054 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 28 16:18:52 2017 +0000 Update translations for https_everywhere_completed --- it/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it/https-everywhere.dtd b/it/https-everywhere.dtd index 2e6598b..a1c600d 100644 --- a/it/https-everywhere.dtd +++ b/it/https-everywhere.dtd @@ -8,7 +8,7 @@ <!ENTITY https-everywhere.about.add_new_rule "Aggiungi una nuova regola"> <!ENTITY https-everywhere.about.thanks "Grazie a"> <!ENTITY https-everywhere.about.many_contributors "Tanti e tanti collaboratori, compresi"> -<!ENTITY https-everywhere.about.noscript "Inoltre, porzioni di HTTPS Everywhere sono basate su codice di NoScript, di Giorgio Maone ed altri. Noi siamo grati per il loro eccellente lavoro!"> +<!ENTITY https-everywhere.about.noscript "Inoltre, porzioni di HTTPS Everywhere sono basate su codice di NoScript, di Giorgio Maone ed altri. Gli siamo grati per il loro eccellente lavoro!"> <!ENTITY https-everywhere.about.contribute "Se ti piace HTTPS Everywhere, considera anche"> <!ENTITY https-everywhere.about.donate_tor "Donazioni a Tor"> <!ENTITY https-everywhere.about.tor_lang_code "it">

1 0

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

28 Jun '17

commit 463b5e371269fd5dda61c29dc1249974f9a5f3f9 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 28 16:15:23 2017 +0000 Update translations for https_everywhere --- it/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it/https-everywhere.dtd b/it/https-everywhere.dtd index 2e6598b..a1c600d 100644 --- a/it/https-everywhere.dtd +++ b/it/https-everywhere.dtd @@ -8,7 +8,7 @@ <!ENTITY https-everywhere.about.add_new_rule "Aggiungi una nuova regola"> <!ENTITY https-everywhere.about.thanks "Grazie a"> <!ENTITY https-everywhere.about.many_contributors "Tanti e tanti collaboratori, compresi"> -<!ENTITY https-everywhere.about.noscript "Inoltre, porzioni di HTTPS Everywhere sono basate su codice di NoScript, di Giorgio Maone ed altri. Noi siamo grati per il loro eccellente lavoro!"> +<!ENTITY https-everywhere.about.noscript "Inoltre, porzioni di HTTPS Everywhere sono basate su codice di NoScript, di Giorgio Maone ed altri. Gli siamo grati per il loro eccellente lavoro!"> <!ENTITY https-everywhere.about.contribute "Se ti piace HTTPS Everywhere, considera anche"> <!ENTITY https-everywhere.about.donate_tor "Donazioni a Tor"> <!ENTITY https-everywhere.about.tor_lang_code "it">

1 0

[tor/master] ed25519: Check retval of unpack_negative_vartime in donna.
by nickm＠torproject.org 28 Jun '17

28 Jun '17

commit 0d9873ac0daa82fa9d43c1eb7e93ec75758f2063 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jun 28 14:10:10 2017 +0300 ed25519: Check retval of unpack_negative_vartime in donna. --- src/common/crypto_ed25519.c | 10 ++++++---- src/ext/ed25519/donna/ed25519_tor.c | 4 +++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/common/crypto_ed25519.c b/src/common/crypto_ed25519.c index 1a6d19b..d61549b 100644 --- a/src/common/crypto_ed25519.c +++ b/src/common/crypto_ed25519.c @@ -497,7 +497,8 @@ ed25519_public_key_from_curve25519_public_key(ed25519_public_key_t *pubkey, * service descriptors are encrypted with a key derived from the service's * long-term public key, and then signed with (and stored at a position * indexed by) a short-term key derived by blinding the long-term keys. - */ + * + * Return 0 if blinding was successful, else return -1. */ int ed25519_keypair_blind(ed25519_keypair_t *out, const ed25519_keypair_t *inp, @@ -508,7 +509,9 @@ ed25519_keypair_blind(ed25519_keypair_t *out, get_ed_impl()->blind_secret_key(out->seckey.seckey, inp->seckey.seckey, param); - ed25519_public_blind(&pubkey_check, &inp->pubkey, param); + if (ed25519_public_blind(&pubkey_check, &inp->pubkey, param) < 0) { + return -1; + } ed25519_public_key_generate(&out->pubkey, &out->seckey); tor_assert(fast_memeq(pubkey_check.pubkey, out->pubkey.pubkey, 32)); @@ -528,8 +531,7 @@ ed25519_public_blind(ed25519_public_key_t *out, const ed25519_public_key_t *inp, const uint8_t *param) { - get_ed_impl()->blind_public_key(out->pubkey, inp->pubkey, param); - return 0; + return get_ed_impl()->blind_public_key(out->pubkey, inp->pubkey, param); } /** diff --git a/src/ext/ed25519/donna/ed25519_tor.c b/src/ext/ed25519/donna/ed25519_tor.c index bd11027..6bc2267 100644 --- a/src/ext/ed25519/donna/ed25519_tor.c +++ b/src/ext/ed25519/donna/ed25519_tor.c @@ -304,7 +304,9 @@ ed25519_donna_blind_public_key(unsigned char *out, const unsigned char *inp, /* No "ge25519_unpack", negate the public key. */ memcpy(pkcopy, inp, 32); pkcopy[31] ^= (1<<7); - ge25519_unpack_negative_vartime(&A, pkcopy); + if (!ge25519_unpack_negative_vartime(&A, pkcopy)) { + return -1; + } /* A' = [tweak] * A + [0] * basepoint. */ ge25519_double_scalarmult_vartime(&Aprime, &A, t, zero);

1 0