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

[tor/master] When detecting OpenSSL, look for 1.0.1, and in homebrew location
by nickm＠torproject.org 26 Sep '17

26 Sep '17

commit 564ff506ea34ef44422470ed4dc2856e0c234c87 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 20 15:54:36 2017 -0400 When detecting OpenSSL, look for 1.0.1, and in homebrew location Previously we would detect the system openssl on OSX, and then fail to use it, since we required Open 1.0.1 or later. That's silly! Instead of looking for RAND_add(), look for TLSv1_1_method(): it was introduced in 1.0.1, and is also present in LibreSSL. Also, add the hombebrew path to our search path here. Fixes bug 23602; bugfix on 0.2.7.2-alpha. --- changes/ticket23602 | 6 ++++++ configure.ac | 9 +++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/changes/ticket23602 b/changes/ticket23602 new file mode 100644 index 000000000..c741f2b6d --- /dev/null +++ b/changes/ticket23602 @@ -0,0 +1,6 @@ + o Minor bugfixes (build): + - When searching for OpenSSL, don't accept any OpenSSL library that lacks + TLSv1_1_method(): Tor doesn't build with those versions. Additionally, + look in /usr/local/opt/openssl, if it's present. These changes + together repair the default build on OSX systems with Homebrew + installed. Fixes bug 23602; bugfix on 0.2.7.2-alpha. diff --git a/configure.ac b/configure.ac index 76140cbd1..eaa0cd2be 100644 --- a/configure.ac +++ b/configure.ac @@ -612,11 +612,12 @@ AC_ARG_WITH(ssl-dir, fi ]) +AC_MSG_NOTICE([Now, we'll look for OpenSSL >= 1.0.1]) TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI], - [#include <openssl/rand.h>], - [void RAND_add(const void *buf, int num, double entropy);], - [RAND_add((void*)0,0,0);], [], - [/usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/athena /opt/openssl]) + [#include <openssl/ssl.h>], + [struct ssl_method_st; const struct ssl_method_st *TLSv1_1_method(void);], + [TLSv1_1_method();], [], + [/usr/local/opt/openssl /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/athena /opt/openssl]) dnl XXXX check for OPENSSL_VERSION_NUMBER == SSLeay()

1 0

[tor/master] Correct two state-file variable types.
by nickm＠torproject.org 26 Sep '17

26 Sep '17

commit 4d11a468b20a116978f89115a75cdc45fe5da8ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 25 11:51:15 2017 -0400 Correct two state-file variable types. These should have been int, but we had listed them as unsigned. That's an easy mistake to make, since "int" corresponds with either INT or UINT in the configuration file. This bug cannot have actually caused a problem in practice, since we check those fields' values on load, and ensure that they are in range 0..INT32_MAX. --- src/or/circuitstats.c | 8 ++++---- src/or/or.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c index ad0630e27..923a6d794 100644 --- a/src/or/circuitstats.c +++ b/src/or/circuitstats.c @@ -910,7 +910,7 @@ circuit_build_times_parse_state(circuit_build_times_t *cbt, int tot_values = 0; uint32_t loaded_cnt = 0, N = 0; config_line_t *line; - unsigned int i; + int i; build_time_t *loaded_times; int err = 0; circuit_build_times_init(cbt); @@ -960,8 +960,8 @@ circuit_build_times_parse_state(circuit_build_times_t *cbt, break; } - if (loaded_cnt+count+state->CircuitBuildAbandonedCount - > state->TotalBuildTimes) { + if (loaded_cnt+count+ (unsigned)state->CircuitBuildAbandonedCount + > (unsigned) state->TotalBuildTimes) { log_warn(LD_CIRC, "Too many build times in state file. " "Stopping short before %d", @@ -986,7 +986,7 @@ circuit_build_times_parse_state(circuit_build_times_t *cbt, loaded_times[loaded_cnt++] = CBT_BUILD_ABANDONED; } - if (loaded_cnt != state->TotalBuildTimes) { + if (loaded_cnt != (unsigned)state->TotalBuildTimes) { log_warn(LD_CIRC, "Corrupt state file? Build times count mismatch. " "Read %d times, but file says %d", loaded_cnt, diff --git a/src/or/or.h b/src/or/or.h index a90841fbc..84913efc4 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4686,8 +4686,8 @@ typedef struct { /** Build time histogram */ config_line_t * BuildtimeHistogram; - unsigned int TotalBuildTimes; - unsigned int CircuitBuildAbandonedCount; + int TotalBuildTimes; + int CircuitBuildAbandonedCount; /** What version of Tor wrote this state file? */ char *TorVersion;

1 0

[tor/master] Make the TransProxyType field non-const
by nickm＠torproject.org 26 Sep '17

26 Sep '17

commit a5b18dfba9752d9785172dc814802c482cc77f0e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 26 12:25:07 2017 -0400 Make the TransProxyType field non-const The correct type for a STRING confparse value is char *, not const char *. --- src/or/or.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index 84913efc4..5bd07ba6a 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3704,8 +3704,8 @@ typedef struct { config_line_t *SocksPort_lines; /** Ports to listen on for transparent pf/netfilter connections. */ config_line_t *TransPort_lines; - const char *TransProxyType; /**< What kind of transparent proxy - * implementation are we using? */ + char *TransProxyType; /**< What kind of transparent proxy + * implementation are we using? */ /** Parsed value of TransProxyType. */ enum { TPT_DEFAULT,

1 0

[tor/master] Type bug in shared_random_state -- make sure Version is int.
by nickm＠torproject.org 26 Sep '17

26 Sep '17

commit 49d2346b805b09fde656d05a6bbf1c632a8eb903 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 25 11:52:57 2017 -0400 Type bug in shared_random_state -- make sure Version is int. The confparse field has type UINT, which corresponds to an int type. We had uint32_t. This shouldn't cause trouble in practice, since int happens to 4-bytes wide on every platform where an authority is running. It's still wrong, though. --- src/or/shared_random_state.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/shared_random_state.h b/src/or/shared_random_state.h index a154eb563..b6af6e172 100644 --- a/src/or/shared_random_state.h +++ b/src/or/shared_random_state.h @@ -77,7 +77,7 @@ typedef struct sr_state_t { typedef struct sr_disk_state_t { uint32_t magic_; /* Version of the protocol. */ - uint32_t Version; + int Version; /* Version of our running tor. */ char *TorVersion; /* Creation time of this state */

1 0

[tor/master] Merge branch 'typecheck4'
by nickm＠torproject.org 26 Sep '17

26 Sep '17

commit 6beeb10070190b8caf5af379476f725c38fbd663 Merge: ce4ac7aac 8f0dffe32 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 26 12:26:01 2017 -0400 Merge branch 'typecheck4' changes/ticket23643 | 6 ++++ src/or/circuitstats.c | 8 ++--- src/or/config.c | 14 +++++++-- src/or/confparse.h | 72 ++++++++++++++++++++++++++++++++++++++++++++ src/or/or.h | 8 ++--- src/or/shared_random_state.c | 9 ++++-- src/or/shared_random_state.h | 2 +- src/or/statefile.c | 10 ++++-- 8 files changed, 113 insertions(+), 16 deletions(-)

1 0

[tor/master] Merge branch 'ticket23602_029'
by nickm＠torproject.org 26 Sep '17

26 Sep '17

commit 2de588ffdbb3502ad680283ef5363125a1966de2 Merge: 6beeb1007 564ff506e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 26 13:02:26 2017 -0400 Merge branch 'ticket23602_029' changes/ticket23602 | 6 ++++++ configure.ac | 9 +++++---- 2 files changed, 11 insertions(+), 4 deletions(-)

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 26 Sep '17

26 Sep '17

commit cd7e2ada42971332ea31d509a346d0e6ccbd9675 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 26 16:20:46 2017 +0000 Update translations for tor-browser-manual --- it/it.po | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/it/it.po b/it/it.po index f844cbbd3..d4a17ceff 100644 --- a/it/it.po +++ b/it/it.po @@ -13,12 +13,13 @@ # Massimo Scacco <massimo.scacco(a)hotmail.it>, 2017 # Daniele <daniele356(a)protonmail.com>, 2017 # Giuseppe Pignataro (Fasbyte01) <rogepix(a)gmail.com>, 2017 +# s r <stefano.rufini(a)gmail.com>, 2017 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2016-12-06 16:36-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Giuseppe Pignataro (Fasbyte01) <rogepix(a)gmail.com>, 2017\n" +"Last-Translator: s r <stefano.rufini(a)gmail.com>, 2017\n" "Language-Team: Italian (https://www.transifex.com/otf/teams/1519/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -206,6 +207,9 @@ msgid "" " to the Tor network. Select “Use custom bridges” and enter each bridge " "address on a separate line." msgstr "" +"Seleziona \"si\" quando ti verrà richiesto, se il tuo Provider di servizi " +"Internet blocca le connessioni alla rete Tor. Seleziona \"Usa bridges " +"personalizzati\" ed inserisci gli indirizzi dei bridges, uno per ogni riga." #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -225,6 +229,10 @@ msgid "" " may be down. Please use one of the above methods to obtain more bridge " "addresses, and try again." msgstr "" +"Clicca \"Connetti\". L'utilizzo dei bridges potrebbe rallentare la " +"connessione, rispetto ai normali relays Tor. Se la connessione non va a buon" +" fine, il bridge che hai ricevuto potrebbe essere disattivo. Utilizza uno " +"dei metodi qui sopra per ottenere più bridges e riprova." #: circumvention.page:6 msgid "What to do if the Tor network is blocked" @@ -243,6 +251,11 @@ msgid "" "page for more information on the types of transport that are currently " "available." msgstr "" +"L'accesso diretto alla rete Tor potrebbe essere bloccato dal tuo Provider di" +" servizi Internet o dal governo. Tor Browser include alcune utilità per " +"superare questi ostacoli, e sono chiamate \"pluggable transports\". Vai alla" +" </link> pagina <link xref=\"transports\"> Pluggable Transports per " +"ulteriori informazioni." #: circumvention.page:22 msgid "Using pluggable transports"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 26 Sep '17

26 Sep '17

commit ac261a848be9dd2b28f589d82039d6d57fdd4ac1 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 26 16:15:55 2017 +0000 Update translations for liveusb-creator --- it/it.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/it/it.po b/it/it.po index af6085c7a..c54bcd9c9 100644 --- a/it/it.po +++ b/it/it.po @@ -17,6 +17,7 @@ # Pietro Messineo <pietromessineo(a)hotmail.it>, 2015 # Random_R, 2013-2015,2017 # Rossano Praderi <dshortway(a)gmail.com>, 2013 +# s r <stefano.rufini(a)gmail.com>, 2017 # spawned76 <fswitch20(a)hotmail.com>, 2012 # Vai Ton <eyadlorenzo(a)gmail.com>, 2015 # Vincenzo Cerminara <rebek994(a)gmail.com>, 2013 @@ -24,9 +25,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-20 18:02+0200\n" -"PO-Revision-Date: 2017-09-23 18:36+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2017-09-25 14:02+0200\n" +"PO-Revision-Date: 2017-09-26 16:05+0000\n" +"Last-Translator: s r <stefano.rufini(a)gmail.com>\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" @@ -415,7 +416,7 @@ msgstr "Dispositivo %(size)s %(vendor)s %(model)s (%(device)s)\n\nTutti i dati s #: ../tails_installer/gui.py:717 #, python-format msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)" -msgstr "" +msgstr "%(parent_size)s %(vendor)s %(model)s dispositivo (%(device)s)" #: ../tails_installer/gui.py:725 msgid "" @@ -427,7 +428,7 @@ msgstr "" #: ../tails_installer/gui.py:726 #, python-format msgid "%(description)s%(persistence_message)s" -msgstr "" +msgstr "%(description)s %(persistence_message)s" #: ../tails_installer/gui.py:776 msgid "Download complete!"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 26 Sep '17

26 Sep '17

commit 443566bd6997fea1c26677b5fe061a515ffa8aa3 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 26 16:15:05 2017 +0000 Update translations for bridgedb --- be/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/be/LC_MESSAGES/bridgedb.po b/be/LC_MESSAGES/bridgedb.po index 2504b36a4..6d0e17419 100644 --- a/be/LC_MESSAGES/bridgedb.po +++ b/be/LC_MESSAGES/bridgedb.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2017-09-19 19:57+0000\n" +"PO-Revision-Date: 2017-09-26 16:14+0000\n" "Last-Translator: Stanislaŭ Silkin <moonblr29(a)gmail.com>\n" "Language-Team: Belarusian (http://www.transifex.com/otf/torproject/language/be/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed
by translation＠torproject.org 26 Sep '17

26 Sep '17

commit 2e4c4644dcc0795a6945d2c3cc9a753dba12a786 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 26 15:19:07 2017 +0000 Update translations for tails-openpgp-applet_completed --- fr/openpgp-applet.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/openpgp-applet.pot b/fr/openpgp-applet.pot index 6b11abfa2..9b2ba8b39 100644 --- a/fr/openpgp-applet.pot +++ b/fr/openpgp-applet.pot @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2017-09-23 21:55+0000\n" +"PO-Revision-Date: 2017-09-26 15:00+0000\n" "Last-Translator: French language coordinator <french.coordinator(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0