December 2014 - tor-commits - lists.torproject.org

[tor/master] Remove a logically dead check to please coverity
by nickm＠torproject.org 30 Dec '14

30 Dec '14

commit b3b840443ddbf126c5a9c25533986e9b9ea33585 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 30 12:10:30 2014 -0500 Remove a logically dead check to please coverity --- src/common/address.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/common/address.c b/src/common/address.c index 267b4e3..8a0e96d 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1026,7 +1026,6 @@ tor_addr_compare_masked(const tor_addr_t *addr1, const tor_addr_t *addr2, } else { a2 = tor_addr_to_ipv4h(addr2); } - if (mbits <= 0) return 0; if (mbits > 32) mbits = 32; a1 >>= (32-mbits); a2 >>= (32-mbits);

1 0

[tor/master] Coalesce v0 and v1 fields of rend_intro_cell_t
by nickm＠torproject.org 30 Dec '14

30 Dec '14

commit ac632a784cdeecaef81e5f1fe45a20f43a93aea7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 30 12:07:28 2014 -0500 Coalesce v0 and v1 fields of rend_intro_cell_t This saves a tiny bit of code, and makes a longstanding coverity false positive go away. --- src/or/rendservice.c | 9 ++------- src/or/rendservice.h | 6 +----- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 196145e..d4fbe73 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1527,8 +1527,7 @@ find_rp_for_intro(const rend_intro_cell_t *intro, } if (intro->version == 0 || intro->version == 1) { - if (intro->version == 1) rp_nickname = (const char *)(intro->u.v1.rp); - else rp_nickname = (const char *)(intro->u.v0.rp); + rp_nickname = (const char *)(intro->u.v0_v1.rp); node = node_get_by_nickname(rp_nickname, 0); if (!node) { @@ -1777,11 +1776,7 @@ rend_service_parse_intro_for_v0_or_v1( goto err; } - if (intro->version == 1) { - memcpy(intro->u.v1.rp, rp_nickname, endptr - rp_nickname + 1); - } else { - memcpy(intro->u.v0.rp, rp_nickname, endptr - rp_nickname + 1); - } + memcpy(intro->u.v0_v1.rp, rp_nickname, endptr - rp_nickname + 1); return ver_specific_len; diff --git a/src/or/rendservice.h b/src/or/rendservice.h index c2342ef..05502ca 100644 --- a/src/or/rendservice.h +++ b/src/or/rendservice.h @@ -38,13 +38,9 @@ struct rend_intro_cell_s { /* Version-specific parts */ union { struct { - /* Rendezvous point nickname */ - uint8_t rp[20]; - } v0; - struct { /* Rendezvous point nickname or hex-encoded key digest */ uint8_t rp[42]; - } v1; + } v0_v1; struct { /* The extend_info_t struct has everything v2 uses */ extend_info_t *extend_info;

1 0

[tor/master] Allow IPv4 and IPv6 addresses in SOCKS5 FQDN requests.
by nickm＠torproject.org 30 Dec '14

30 Dec '14

commit d87d4183eee40d172eda5265feb0fddfe723dd06 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Tue Dec 30 16:36:16 2014 +0000 Allow IPv4 and IPv6 addresses in SOCKS5 FQDN requests. Supposedly there are a decent number of applications that "support" IPv6 and SOCKS5 using the FQDN address type. While said applications should be using the IPv6 address type, allow the connection if SafeSocks is not set. Bug not in any released version. --- src/or/buffers.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/or/buffers.c b/src/or/buffers.c index 4cdc03b..f0d7e60 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -2063,9 +2063,7 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, socks_request_set_socks5_error(req, SOCKS5_NOT_ALLOWED); return -1; } - } - - if (!string_is_valid_hostname(req->address)) { + } else if (!string_is_valid_hostname(req->address)) { socks_request_set_socks5_error(req, SOCKS5_GENERAL_ERROR); log_warn(LD_PROTOCOL,

1 0

[tor/master] Merge remote-tracking branch 'yawning/bug13315_fixup'
by nickm＠torproject.org 30 Dec '14

30 Dec '14

commit f2e4423bd2bf684849c968ff6bb19dfc3ee7d788 Merge: a4cf2ae d87d418 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 30 11:46:56 2014 -0500 Merge remote-tracking branch 'yawning/bug13315_fixup' src/or/buffers.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 30 Dec '14

30 Dec '14

commit 4b44a98f047480c5eab04c86442986b2bc26c1fc Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 30 16:45:34 2014 +0000 Update translations for tails-misc --- az.po | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/az.po b/az.po index 2b77db0..2e3320a 100644 --- a/az.po +++ b/az.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-02 11:29+0100\n" -"PO-Revision-Date: 2014-12-30 16:14+0000\n" +"PO-Revision-Date: 2014-12-30 16:44+0000\n" "Last-Translator: E <ehuseynzade(a)gmail.com>\n" "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/torproject/language/az/)\n" "MIME-Version: 1.0\n" @@ -216,25 +216,25 @@ msgstr "Tails" #: config/chroot_local-includes/usr/local/bin/tails-about:24 msgid "The Amnesic Incognito Live System" -msgstr "" +msgstr "Amnestik İnkoqnito Canlı Sistemi" #: config/chroot_local-includes/usr/local/bin/tails-about:25 #, python-format msgid "" "Build information:\n" "%s" -msgstr "" +msgstr "Quruluş məlumatı:\n%s" #: config/chroot_local-includes/usr/local/bin/tails-about:27 #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:1 msgid "About Tails" -msgstr "" +msgstr "Tails Haqqında" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:118 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:128 msgid "Your additional software" -msgstr "" +msgstr "Sənin əlaqə proqramın" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:119 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:129 @@ -242,29 +242,29 @@ msgid "" "The upgrade failed. This might be due to a network problem. Please check " "your network connection, try to restart Tails, or read the system log to " "understand better the problem." -msgstr "" +msgstr "Təkmilləşmə alınmadı. Bunun səbəbi şəbəkə problemi ola bilər. Lütfən, şəbəkə əlaqəni yoxla, Tails-i yenidən başlatmağa cəhd et, və ya problemi daha yaxşı anlamaq üçün sistem girişini oxu." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125 msgid "The upgrade was successful." -msgstr "" +msgstr "Təkmilləşmə uğurla bitdi." #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:52 msgid "Synchronizing the system's clock" -msgstr "" +msgstr "Sistem saatının sinxronlaşdırılması" #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:53 msgid "" "Tor needs an accurate clock to work properly, especially for Hidden " "Services. Please wait..." -msgstr "" +msgstr "Tor-un yaxşı işləməsi, xüsusilə də Gizli Xidmətlər üçün dəqiq saata ehtiyacı var. Lütfən, gözlə..." #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:87 msgid "Failed to synchronize the clock!" -msgstr "" +msgstr "Saatın sinxronlaşdırılması alınmadı!" #: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:38 msgid "Network connection blocked?" -msgstr "" +msgstr "Şəbəkə əlaqəsi kilidlidir?" #: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:40 msgid "" @@ -272,16 +272,16 @@ msgid "" "MAC spoofing feature. For more information, see the <a " "href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC" " spoofing documentation</a>." -msgstr "" +msgstr "Görünür, sən şəbəkə tərəfindən kilidlənmisən. Bu MAC-ın aldatma funksiyasından da ola bilər. Daha ətraflı məlumat üçün <a href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC aldatma sənədləşməsi</a>nə bax." #: config/chroot_local-includes/usr/local/bin/tails-security-check:145 msgid "This version of Tails has known security issues:" -msgstr "" +msgstr "Tails-in bu versiyasının bilinən təhlükəsizlik problemləri var:" #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:29 #, sh-format msgid "Network card ${nic} disabled" -msgstr "" +msgstr "${nic} şəbəkə kartı deaktivə edilib" #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:30 #, sh-format

1 0

[tor/master] Note fix for bug 12831
by nickm＠torproject.org 30 Dec '14

30 Dec '14

commit a4cf2ae24bf77c3c277a50b166fed0a09558d398 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 30 11:45:01 2014 -0500 Note fix for bug 12831 --- ChangeLog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 18bd536..4b7f35f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,8 +38,9 @@ Changes in version 0.2.6.2-alpha - 2014-12-?? - Repair automapping with IPv6 addresses; this automapping should have worked previously, but one piece of debugging code that we inserted to detect a regression actually caused the regression to - manifest itself again. Fixes bug 13811; bugfix on 0.2.4.7-alpha. - Diagnosed and fixed by Francisco Blas Izquierdo Riera. + manifest itself again. Fixes bug 13811 and bug 12831; bugfix on + 0.2.4.7-alpha. Diagnosed and fixed by Francisco Blas + Izquierdo Riera. o Major bugfixes (hidden services): - When closing an introduction circuit that was opened in parallel

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 30 Dec '14

30 Dec '14

commit d327aa6acabc896521eb29437cfc2305a29fc875 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 30 16:15:34 2014 +0000 Update translations for tails-misc --- az.po | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/az.po b/az.po index 3cd89f2..2b77db0 100644 --- a/az.po +++ b/az.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-02 11:29+0100\n" -"PO-Revision-Date: 2014-12-30 15:41+0000\n" +"PO-Revision-Date: 2014-12-30 16:14+0000\n" "Last-Translator: E <ehuseynzade(a)gmail.com>\n" "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/torproject/language/az/)\n" "MIME-Version: 1.0\n" @@ -149,14 +149,14 @@ msgstr "Bu açarlara inanırsan?" #: config/chroot_local-includes/usr/local/bin/gpgApplet:552 msgid "The following selected key is not fully trusted:" msgid_plural "The following selected keys are not fully trusted:" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Bu seçilmiş açar tam inamlı deyil:" +msgstr[1] "Bu seçilmiş açarlar tam inamlı deyil:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:570 msgid "Do you trust this key enough to use it anyway?" msgid_plural "Do you trust these keys enough to use them anyway?" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Heç nəyə baxmayaraq bu açarı istifadə edəcək qədər ona inanırsan?" +msgstr[1] "Heç nəyə baxmayaraq bu açarları istifadə edəcək qədər onlara inanırsan?" #: config/chroot_local-includes/usr/local/bin/gpgApplet:583 msgid "No keys selected" @@ -166,53 +166,53 @@ msgstr "Açar seçilməyib" msgid "" "You must select a private key to sign the message, or some public keys to " "encrypt the message, or both." -msgstr "" +msgstr "Mesajı imzalamaq üçün şəxsi açar, şifrələmək üçün hər hansı ictimai açar, ya da hər ikisini seçməlisən." #: config/chroot_local-includes/usr/local/bin/gpgApplet:613 msgid "No keys available" -msgstr "" +msgstr "Açar yoxdur" #: config/chroot_local-includes/usr/local/bin/gpgApplet:615 msgid "" "You need a private key to sign messages or a public key to encrypt messages." -msgstr "" +msgstr "Mesajı imzalamaq üçün şəxsi, şifrələmək üçün isə ictimai açara ehtiyacın var." #: config/chroot_local-includes/usr/local/bin/gpgApplet:743 msgid "GnuPG error" -msgstr "" +msgstr "GnuPG xətası" #: config/chroot_local-includes/usr/local/bin/gpgApplet:764 msgid "Therefore the operation cannot be performed." -msgstr "" +msgstr "Buna görə də əməliyyat yerinə yetirilə bilmir." #: config/chroot_local-includes/usr/local/bin/gpgApplet:814 msgid "GnuPG results" -msgstr "" +msgstr "GnuPG nəticələr" #: config/chroot_local-includes/usr/local/bin/gpgApplet:820 msgid "Output of GnuPG:" -msgstr "" +msgstr "GnuPG nəticəsi:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:845 msgid "Other messages provided by GnuPG:" -msgstr "" +msgstr "GnuPG tərəfindən təqdim edilmiş başqa mesajlar:" #: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:39 msgid "Shutdown Immediately" -msgstr "" +msgstr "Dərhal Bağlamaq" #: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:40 msgid "Reboot Immediately" -msgstr "" +msgstr "Dərhal Yenidən Yüklənsin" #: config/chroot_local-includes/usr/local/bin/tails-about:16 msgid "not available" -msgstr "" +msgstr "qeyri mümkün" #: config/chroot_local-includes/usr/local/bin/tails-about:19 #: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:1 msgid "Tails" -msgstr "" +msgstr "Tails" #: config/chroot_local-includes/usr/local/bin/tails-about:24 msgid "The Amnesic Incognito Live System"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 30 Dec '14

30 Dec '14

commit 493a771128149ac39ed014a9f221226764be7607 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 30 15:45:33 2014 +0000 Update translations for tails-misc --- az.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/az.po b/az.po index 0b11672..3cd89f2 100644 --- a/az.po +++ b/az.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-02 11:29+0100\n" -"PO-Revision-Date: 2014-12-30 14:51+0000\n" +"PO-Revision-Date: 2014-12-30 15:41+0000\n" "Last-Translator: E <ehuseynzade(a)gmail.com>\n" "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/torproject/language/az/)\n" "MIME-Version: 1.0\n" @@ -113,8 +113,8 @@ msgstr "Barmaq izi:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:395 msgid "User ID:" msgid_plural "User IDs:" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "İstifadəçi ID-si:" +msgstr[1] "İstifadəçi ID-ləri:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:425 msgid "None (Don't sign)"

1 0

[chutney/master] Automatically create hidden service directory for hidden services
by nickm＠torproject.org 30 Dec '14

30 Dec '14

commit 6108e68c184befb078906704c746260906732f47 Author: teor <teor2345(a)gmail.com> Date: Wed Dec 24 07:41:28 2014 +1100 Automatically create hidden service directory for hidden services Add a new env hs (boolean) that is set to 1 for hidden services. Add a new env hs_directory (string) that is set to the name of the hidden service directory ('hidden_service' by default). When hs is 1, create hs_directory with mode 0700 (448 decimal). --- lib/chutney/TorNet.py | 19 +++++++++++++++++++ networks/hs | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 2d2054b..ef85e1f 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -199,6 +199,7 @@ class LocalNodeBuilder(NodeBuilder): # bridgeauthority -- bool -- are we a bridge authority? # relay -- bool -- are we a relay? # bridge -- bool -- are we a bridge? + # hs -- bool -- are we a hidden service? # nodenum -- int -- set by chutney -- which unique node index is this? # dir -- path -- set by chutney -- data directory for this tor # tor_gencert -- path to tor_gencert binary @@ -319,6 +320,8 @@ class LocalNodeBuilder(NodeBuilder): self._genAuthorityKey() if self._env['relay']: self._genRouterKey() + if self._env['hs']: + self._makeHiddenServiceDir() def config(self, net): """Called to configure a node: creates a torrc file for it.""" @@ -336,6 +339,20 @@ class LocalNodeBuilder(NodeBuilder): datadir = self._env['dir'] mkdir_p(os.path.join(datadir, 'keys')) + def _makeHiddenServiceDir(self): + """Create the hidden service subdirectory for this node. + + The directory name is stored under the 'hs_directory' environment + key. It is combined with the 'dir' data directory key to yield the + path to the hidden service directory. + + 448 is the decimal representation of the octal number 0700. Since + python2 only supports 0700 and python3 only supports 0o700, we can + use neither. + """ + datadir = self._env['dir'] + mkdir_p(os.path.join(datadir, self._env['hs_directory']), 448) + def _genAuthorityKey(self): """Generate an authority identity and signing key for this authority, if they do not already exist.""" @@ -647,6 +664,8 @@ DEFAULTS = { 'hasbridgeauth': False, 'relay': False, 'bridge': False, + 'hs': False, + 'hs_directory': 'hidden_service', 'connlimit': 60, 'net_base_dir': 'net', 'tor': os.environ.get('CHUTNEY_TOR', 'tor'), diff --git a/networks/hs b/networks/hs index a76ba2b..e91f82e 100644 --- a/networks/hs +++ b/networks/hs @@ -2,7 +2,7 @@ Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") Middle = Node(tag="m", relay=1, torrc="relay-non-exit.tmpl") Relay = Node(tag="r", relay=1, torrc="relay.tmpl") Client = Node(tag="c", torrc="client.tmpl") -HS = Node(tag="h", torrc="hs.tmpl") +HS = Node(tag="h", hs=1, torrc="hs.tmpl") NODES = Authority.getN(4) + Middle.getN(10) + Relay.getN(6) + Client.getN(5) + HS.getN(1)

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 30 Dec '14

30 Dec '14

commit a9f056367f45ccc6589f95229f3f12cae6a427d0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 30 15:15:34 2014 +0000 Update translations for tails-misc --- az.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/az.po b/az.po index 8e8f3d5..0b11672 100644 --- a/az.po +++ b/az.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-02 11:29+0100\n" -"PO-Revision-Date: 2014-12-30 14:41+0000\n" +"PO-Revision-Date: 2014-12-30 14:51+0000\n" "Last-Translator: E <ehuseynzade(a)gmail.com>\n" "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/torproject/language/az/)\n" "MIME-Version: 1.0\n"

1 0