March 2015 - tor-commits - lists.torproject.org

[stem/master] Python3 support for hidden service descriptor decryption
by atagar＠torproject.org 10 Mar '15

10 Mar '15

commit 378bfaf32c2eda1e22d92c6b2bce67f973af25da Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 10 09:10:50 2015 -0700 Python3 support for hidden service descriptor decryption Didn't have pycrypto for python3 so this test was being skipped for me. There were two issues... * we need to normalize the cookie to be bytes * indexing into bytes provides an int in python3, so we need to use an equivalent slice instead Caught by toralf (on irc) and cypherpunks (on #15004). --- stem/descriptor/hidden_service_descriptor.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/stem/descriptor/hidden_service_descriptor.py b/stem/descriptor/hidden_service_descriptor.py index f64036d..8c3ce7d 100644 --- a/stem/descriptor/hidden_service_descriptor.py +++ b/stem/descriptor/hidden_service_descriptor.py @@ -28,6 +28,7 @@ import hashlib import io import stem.util.connection +import stem.util.str_tools from stem.descriptor import ( PGP_BLOCK_END, @@ -287,11 +288,11 @@ class HiddenServiceDescriptor(Descriptor): try: missing_padding = len(authentication_cookie) % 4 - authentication_cookie = base64.b64decode(authentication_cookie + '=' * missing_padding) + authentication_cookie = base64.b64decode(stem.util.str_tools._to_bytes(authentication_cookie) + b'=' * missing_padding) except TypeError as exc: raise DecryptionFailure('authentication_cookie must be a base64 encoded string (%s)' % exc) - authentication_type = int(binascii.hexlify(content[0]), 16) + authentication_type = int(binascii.hexlify(content[0:1]), 16) if authentication_type == BASIC_AUTH: content = HiddenServiceDescriptor._decrypt_basic_auth(content, authentication_cookie) @@ -314,7 +315,7 @@ class HiddenServiceDescriptor(Descriptor): from Crypto.Util.number import bytes_to_long try: - client_blocks = int(binascii.hexlify(content[1]), 16) + client_blocks = int(binascii.hexlify(content[1:2]), 16) except ValueError: raise DecryptionFailure("When using basic auth the content should start with a number of blocks but wasn't a hex digit: %s" % binascii.hexlify(content[1]))

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 10 Mar '15

10 Mar '15

commit 8dfa3f5e0543e92dd8fb2151d6dffd49afab2cff Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 10 15:45:23 2015 +0000 Update translations for tails-persistence-setup_completed --- es/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/es.po b/es/es.po index 3e174db..1c99dd1 100644 --- a/es/es.po +++ b/es/es.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2015-02-23 13:07+0100\n" -"PO-Revision-Date: 2015-03-10 15:14+0000\n" +"PO-Revision-Date: 2015-03-10 15:30+0000\n" "Last-Translator: Emma Peel\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 10 Mar '15

10 Mar '15

commit 7bc9a590675e1754c7f69869da4a32819d6f562a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 10 15:45:19 2015 +0000 Update translations for tails-persistence-setup --- es/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/es.po b/es/es.po index 3e174db..1c99dd1 100644 --- a/es/es.po +++ b/es/es.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2015-02-23 13:07+0100\n" -"PO-Revision-Date: 2015-03-10 15:14+0000\n" +"PO-Revision-Date: 2015-03-10 15:30+0000\n" "Last-Translator: Emma Peel\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n"

1 0

[tor-messenger-build/master] Update the XMPP patches
by sukhbir＠torproject.org 10 Mar '15

10 Mar '15

commit d8c9f5ec184065ca9aafe41c041303dcc918aef1 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Mar 10 20:57:19 2015 +0530 Update the XMPP patches Merge all XMPP patches into a single patch and set the default Jabber domain to jabber.ccc.de. --- projects/instantbird/config | 1 - projects/instantbird/xmpp-resource.patch | 13 ------------- projects/instantbird/xmpp.patch | 19 +++++++++++++++++-- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/projects/instantbird/config b/projects/instantbird/config index e50111a..939faf7 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -60,7 +60,6 @@ input_files: - filename: preferences.patch - filename: irc.patch - filename: xmpp.patch - - filename: xmpp-resource.patch - filename: gtalk-resource.patch - filename: accountcreation.patch - filename: links.patch diff --git a/projects/instantbird/xmpp-resource.patch b/projects/instantbird/xmpp-resource.patch deleted file mode 100644 index f71a830..0000000 --- a/projects/instantbird/xmpp-resource.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chat/protocols/xmpp/xmpp.js b/chat/protocols/xmpp/xmpp.js -index f125b20..5104bd6 100644 ---- a/chat/protocols/xmpp/xmpp.js -+++ b/chat/protocols/xmpp/xmpp.js -@@ -28,7 +28,7 @@ XMPPProtocol.prototype = { - getAccount: function(aImAccount) new XMPPAccount(this, aImAccount), - options: { - resource: {get label() _("options.resource"), -- get default() XMPPDefaultResource}, -+ default: ""}, - priority: {get label() _("options.priority"), default: 0}, - connection_security: { - get label() _("options.connectionSecurity"), diff --git a/projects/instantbird/xmpp.patch b/projects/instantbird/xmpp.patch index 38cd4a3..593966c 100644 --- a/projects/instantbird/xmpp.patch +++ b/projects/instantbird/xmpp.patch @@ -1,8 +1,23 @@ diff --git a/chat/protocols/xmpp/xmpp.js b/chat/protocols/xmpp/xmpp.js -index b05c77e..f8c829f 100644 +index f99a238..bc787c9 100644 --- a/chat/protocols/xmpp/xmpp.js +++ b/chat/protocols/xmpp/xmpp.js -@@ -41,7 +41,7 @@ XMPPProtocol.prototype = { +@@ -29,12 +29,12 @@ XMPPProtocol.prototype = { + + usernameSplits: [ + {get label() _("options.domain"), separator: "@", +- defaultValue: "jabber.org", reverse: true} ++ defaultValue: "jabber.ccc.de", reverse: true} + ], + + options: { + resource: {get label() _("options.resource"), +- get default() XMPPDefaultResource}, ++ default: ""}, + priority: {get label() _("options.priority"), default: 0}, + connection_security: { + get label() _("options.connectionSecurity"), +@@ -47,7 +47,7 @@ XMPPProtocol.prototype = { }, default: "require_tls" },

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 10 Mar '15

10 Mar '15

commit b82361fff2b164ffc2baa9d9c9851e7d589d123c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 10 15:15:38 2015 +0000 Update translations for tails-greeter_completed --- es/es.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/es/es.po b/es/es.po index ac9b0b5..f5fa9f8 100644 --- a/es/es.po +++ b/es/es.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# her_tor_es_ar <cvmay08(a)gmail.com>, 2014 +# her_tor_es_ar <inactive+her_tor_es_ar(a)transifex.com>, 2014 # Animalcustomize <inacho24(a)hotmail.com>, 2014 # Noel Torres <envite(a)rolamasao.org>, 2013 # strel, 2013-2014 @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-20 18:36+0200\n" -"PO-Revision-Date: 2014-08-25 14:31+0000\n" -"Last-Translator: strel\n" +"POT-Creation-Date: 2014-10-15 16:05+0200\n" +"PO-Revision-Date: 2015-03-10 14:57+0000\n" +"Last-Translator: Emma Peel\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\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 10 Mar '15

10 Mar '15

commit 5d395d6b860a02a8776b4451d8cf158bdab7991c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 10 15:15:34 2015 +0000 Update translations for tails-greeter --- es/es.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/es/es.po b/es/es.po index ac9b0b5..f5fa9f8 100644 --- a/es/es.po +++ b/es/es.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# her_tor_es_ar <cvmay08(a)gmail.com>, 2014 +# her_tor_es_ar <inactive+her_tor_es_ar(a)transifex.com>, 2014 # Animalcustomize <inacho24(a)hotmail.com>, 2014 # Noel Torres <envite(a)rolamasao.org>, 2013 # strel, 2013-2014 @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-20 18:36+0200\n" -"PO-Revision-Date: 2014-08-25 14:31+0000\n" -"Last-Translator: strel\n" +"POT-Creation-Date: 2014-10-15 16:05+0200\n" +"PO-Revision-Date: 2015-03-10 14:57+0000\n" +"Last-Translator: Emma Peel\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 10 Mar '15

10 Mar '15

commit 08f4400546f3783d218d45dcec03230a27ef176d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 10 15:15:30 2015 +0000 Update translations for tails-persistence-setup_completed --- es/es.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/es/es.po b/es/es.po index 1dc3b7d..3e174db 100644 --- a/es/es.po +++ b/es/es.po @@ -4,6 +4,7 @@ # # Translators: # Cesar Enrique Sanchez Medina <cesare01(a)gmail.com>, 2014 +# Emma Peel, 2015 # Manuel Herrera <ma_herrer(a)yahoo.com.mx>, 2013 # strel, 2013-2015 # strel, 2012-2013 @@ -12,8 +13,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2015-02-23 13:07+0100\n" -"PO-Revision-Date: 2015-02-24 16:18+0000\n" -"Last-Translator: strel\n" +"PO-Revision-Date: 2015-03-10 15:14+0000\n" +"Last-Translator: Emma Peel\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -99,7 +100,7 @@ msgstr "Cliente bitcoin" #: ../lib/Tails/Persistence/Configuration/Presets.pm:140 msgid "Electrum's bitcoin wallet and configuration" -msgstr "Cartera bitcoin de Electrum y configuración" +msgstr "Cartera de bitcoins Electrum y configuración" #: ../lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "APT Packages" @@ -142,12 +143,12 @@ msgstr "El dispositivo %s ya tiene un volumen persistente." #: ../lib/Tails/Persistence/Setup.pm:346 #, perl-format msgid "Device %s has not enough unallocated space." -msgstr "El dispositivo %s no tiene suficiente espacio sin asignar." +msgstr "El dispositivo %s no tiene suficiente espacio libre." #: ../lib/Tails/Persistence/Setup.pm:354 ../lib/Tails/Persistence/Setup.pm:368 #, perl-format msgid "Device %s has no persistent volume." -msgstr "El dispositivo %s no tiene un volumen persistente." +msgstr "El dispositivo %s no tiene ningún volumen persistente." #: ../lib/Tails/Persistence/Setup.pm:360 msgid "" @@ -195,7 +196,7 @@ msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" "You may now close this application." -msgstr "Cualquier cambio que haya hecho sólo tendrá efecto después de reiniciar Tails. \n \nAhora puede cerrar esta aplicación." +msgstr "Cualquier cambio que hayas hecho sólo tendrá efecto después de reiniciar Tails. \n \nAhora puedes cerrar esta aplicación." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:54 msgid "Persistence wizard - Persistent volume creation"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 10 Mar '15

10 Mar '15

commit 8680a22386488d5fa5746cbfd7ac0b2c0e614227 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 10 15:15:26 2015 +0000 Update translations for tails-persistence-setup --- es/es.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/es/es.po b/es/es.po index 1dc3b7d..3e174db 100644 --- a/es/es.po +++ b/es/es.po @@ -4,6 +4,7 @@ # # Translators: # Cesar Enrique Sanchez Medina <cesare01(a)gmail.com>, 2014 +# Emma Peel, 2015 # Manuel Herrera <ma_herrer(a)yahoo.com.mx>, 2013 # strel, 2013-2015 # strel, 2012-2013 @@ -12,8 +13,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2015-02-23 13:07+0100\n" -"PO-Revision-Date: 2015-02-24 16:18+0000\n" -"Last-Translator: strel\n" +"PO-Revision-Date: 2015-03-10 15:14+0000\n" +"Last-Translator: Emma Peel\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -99,7 +100,7 @@ msgstr "Cliente bitcoin" #: ../lib/Tails/Persistence/Configuration/Presets.pm:140 msgid "Electrum's bitcoin wallet and configuration" -msgstr "Cartera bitcoin de Electrum y configuración" +msgstr "Cartera de bitcoins Electrum y configuración" #: ../lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "APT Packages" @@ -142,12 +143,12 @@ msgstr "El dispositivo %s ya tiene un volumen persistente." #: ../lib/Tails/Persistence/Setup.pm:346 #, perl-format msgid "Device %s has not enough unallocated space." -msgstr "El dispositivo %s no tiene suficiente espacio sin asignar." +msgstr "El dispositivo %s no tiene suficiente espacio libre." #: ../lib/Tails/Persistence/Setup.pm:354 ../lib/Tails/Persistence/Setup.pm:368 #, perl-format msgid "Device %s has no persistent volume." -msgstr "El dispositivo %s no tiene un volumen persistente." +msgstr "El dispositivo %s no tiene ningún volumen persistente." #: ../lib/Tails/Persistence/Setup.pm:360 msgid "" @@ -195,7 +196,7 @@ msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" "You may now close this application." -msgstr "Cualquier cambio que haya hecho sólo tendrá efecto después de reiniciar Tails. \n \nAhora puede cerrar esta aplicación." +msgstr "Cualquier cambio que hayas hecho sólo tendrá efecto después de reiniciar Tails. \n \nAhora puedes cerrar esta aplicación." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:54 msgid "Persistence wizard - Persistent volume creation"

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 10 Mar '15

10 Mar '15

commit 1ba79327be3c438b84b24849725b464e33c99bf1 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 10 15:15:22 2015 +0000 Update translations for liveusb-creator_completed --- es/es.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es/es.po b/es/es.po index cdc4314..443c1bd 100644 --- a/es/es.po +++ b/es/es.po @@ -17,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-11 19:14+0100\n" -"PO-Revision-Date: 2015-02-14 09:01+0000\n" -"Last-Translator: Jose Luis <joseluis.tirado(a)gmail.com>\n" +"POT-Creation-Date: 2015-02-23 13:07+0100\n" +"PO-Revision-Date: 2015-03-10 14:59+0000\n" +"Last-Translator: Emma Peel\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 10 Mar '15

10 Mar '15

commit 1f58afb6fcfb9a36f73121b653fb3eaa262f13ca Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 10 15:15:18 2015 +0000 Update translations for liveusb-creator --- es/es.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es/es.po b/es/es.po index cdc4314..443c1bd 100644 --- a/es/es.po +++ b/es/es.po @@ -17,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-11 19:14+0100\n" -"PO-Revision-Date: 2015-02-14 09:01+0000\n" -"Last-Translator: Jose Luis <joseluis.tirado(a)gmail.com>\n" +"POT-Creation-Date: 2015-02-23 13:07+0100\n" +"PO-Revision-Date: 2015-03-10 14:59+0000\n" +"Last-Translator: Emma Peel\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0