- tor-commits - lists.torproject.org

[tor/master] Downgrade "missing a certificate" from notice to info
by nickm＠torproject.org 10 Feb '12

10 Feb '12

commit c8b855082bdb4ea5f9006e6ce5ce673509643a5c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 10 12:01:56 2012 -0500 Downgrade "missing a certificate" from notice to info It was apparently getting mistaken for a problem, even though it was at notice. Fixes 5067; fix on 0.2.0.10-alpha. --- changes/bug5067 | 5 +++++ src/or/routerlist.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/changes/bug5067 b/changes/bug5067 new file mode 100644 index 0000000..d94b921 --- /dev/null +++ b/changes/bug5067 @@ -0,0 +1,5 @@ + o Minor bugfixes (usability): + - Downgrade the "We're missing a certificate" message from notice + to info: people kept mistaking it for a real problem, whereas it + is only a problem when we are failing to bootstrap. Fixes bug + 5067; bugfix on 0.2.10-alpha. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index f8df089..1edf651 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -504,9 +504,9 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now) if (download_status_is_ready(&cl->dl_status, now, MAX_CERT_DL_FAILURES) && !digestmap_get(pending, voter->identity_digest)) { - log_notice(LD_DIR, "We're missing a certificate from authority " - "with signing key %s: launching request.", - hex_str(sig->signing_key_digest, DIGEST_LEN)); + log_info(LD_DIR, "We're missing a certificate from authority " + "with signing key %s: launching request.", + hex_str(sig->signing_key_digest, DIGEST_LEN)); smartlist_add(missing_digests, sig->identity_digest); } } SMARTLIST_FOREACH_END(sig);

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 10 Feb '12

10 Feb '12

commit 64523609c91d9207191bf8c59ef684a239dd4f31 Merge: 34b9bc2 c8b8550 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 10 12:03:46 2012 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug5067 | 5 +++++ src/or/routerlist.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.2.2] Downgrade "missing a certificate" from notice to info
by nickm＠torproject.org 10 Feb '12

10 Feb '12

commit c8b855082bdb4ea5f9006e6ce5ce673509643a5c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 10 12:01:56 2012 -0500 Downgrade "missing a certificate" from notice to info It was apparently getting mistaken for a problem, even though it was at notice. Fixes 5067; fix on 0.2.0.10-alpha. --- changes/bug5067 | 5 +++++ src/or/routerlist.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/changes/bug5067 b/changes/bug5067 new file mode 100644 index 0000000..d94b921 --- /dev/null +++ b/changes/bug5067 @@ -0,0 +1,5 @@ + o Minor bugfixes (usability): + - Downgrade the "We're missing a certificate" message from notice + to info: people kept mistaking it for a real problem, whereas it + is only a problem when we are failing to bootstrap. Fixes bug + 5067; bugfix on 0.2.10-alpha. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index f8df089..1edf651 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -504,9 +504,9 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now) if (download_status_is_ready(&cl->dl_status, now, MAX_CERT_DL_FAILURES) && !digestmap_get(pending, voter->identity_digest)) { - log_notice(LD_DIR, "We're missing a certificate from authority " - "with signing key %s: launching request.", - hex_str(sig->signing_key_digest, DIGEST_LEN)); + log_info(LD_DIR, "We're missing a certificate from authority " + "with signing key %s: launching request.", + hex_str(sig->signing_key_digest, DIGEST_LEN)); smartlist_add(missing_digests, sig->identity_digest); } } SMARTLIST_FOREACH_END(sig);

1 0

[obfsproxy/master] Abort, not exit, on obfs_assert failure
by nickm＠torproject.org 10 Feb '12

10 Feb '12

commit e493fffaacda5e1f6e02aa21ff850361c2789332 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 10 11:47:13 2012 -0500 Abort, not exit, on obfs_assert failure --- src/util.c | 13 +++++++++++++ src/util.h | 20 ++++++++++++-------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/src/util.c b/src/util.c index 000bf85..70bd9b4 100644 --- a/src/util.c +++ b/src/util.c @@ -567,6 +567,19 @@ log_error(const char *format, ...) exit(1); } +/** Public function for logging an error message then aborting. */ +void +log_error_abort(const char *format, ...) +{ + va_list ap; + va_start(ap,format); + + logv(LOG_SEV_ERR, format, ap); + + va_end(ap); + abort(); +} + /** Public function for logging a warning. */ void log_warn(const char *format, ...) diff --git a/src/util.h b/src/util.h index a8588c2..91f7585 100644 --- a/src/util.h +++ b/src/util.h @@ -156,6 +156,10 @@ void close_obfsproxy_logfile(void); void log_error(const char *format, ...) ATTR_PRINTF_1 ATTR_NORETURN; +/** Fatal errors: the program cannot continue and will abort */ +void log_error_abort(const char *format, ...) + ATTR_PRINTF_1 ATTR_NORETURN; + /** Warn-level severity: for messages that only appear when something has gone wrong. */ void log_warn(const char *format, ...) @@ -176,16 +180,16 @@ void log_debug_raw(const char *format, va_list ap); /** Assertion checking. We don't ever compile assertions out, and we want precise control over the error messages, so we use our own assertion macros. */ -#define obfs_assert(expr) \ - do { \ - if (!(expr)) \ - log_error("assertion failure at %s:%d: %s", \ - __FILE__, __LINE__, #expr); \ +#define obfs_assert(expr) \ + do { \ + if (!(expr)) \ + log_error_abort("assertion failure at %s:%d: %s", \ + __FILE__, __LINE__, #expr); \ } while (0) -#define obfs_abort() \ - do { \ - log_error("aborted at %s:%d", __FILE__, __LINE__); \ +#define obfs_abort() \ + do { \ + log_error_abort("aborted at %s:%d", __FILE__, __LINE__); \ } while (0) #endif

1 0

[tor/master] Use correct CVE number for CVE-2011-4576. Found by fermenthor. bug 5066
by nickm＠torproject.org 10 Feb '12

10 Feb '12

commit 2da0efb547b70a7caed59097036d1e59859a4b35 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 10 10:55:39 2012 -0500 Use correct CVE number for CVE-2011-4576. Found by fermenthor. bug 5066 --- src/common/tortls.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index d766377..4c9d218 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -72,7 +72,7 @@ (OPENSSL_VERSION_NUMBER >= 0x00909000L && \ OPENSSL_VERSION_NUMBER < 0x1000006fL)) /* This is a version of OpenSSL before 0.9.8s/1.0.0f. It does not have - * the CVE-2011-4657 fix, and as such it can't use RELEASE_BUFFERS and + * the CVE-2011-4576 fix, and as such it can't use RELEASE_BUFFERS and * SSL3 safely at the same time. */ #define DISABLE_SSL3_HANDSHAKE @@ -797,9 +797,9 @@ tor_tls_context_new(crypto_pk_env_t *identity, unsigned int key_lifetime, SSLeay() < 0x0090813fL || (SSLeay() >= 0x00909000L && SSLeay() < 0x1000006fL)) { - /* And not SSL3 if it's subject to CVE-2011-4657. */ + /* And not SSL3 if it's subject to CVE-2011-4576. */ log_info(LD_NET, "Disabling SSLv3 because this OpenSSL version " - "might otherwise be vulnerable to CVE-2011-4657 " + "might otherwise be vulnerable to CVE-2011-4576 " "(compile-time version %08lx (%s); " "runtime version %08lx (%s))", (unsigned long)OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT,

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 10 Feb '12

10 Feb '12

commit 8855b2a90c8b3314ac9aa804ec2802e9d4c50617 Merge: ef0bc7f 2da0efb Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 10 10:56:37 2012 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/common/tortls.c Conflict on comment near use of the new OPENSSL_V macro src/common/tortls.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --cc src/common/tortls.c index 26d3714,4c9d218..cffba2e --- a/src/common/tortls.c +++ b/src/common/tortls.c @@@ -79,11 -68,11 +79,11 @@@ #define ADDR(tls) (((tls) && (tls)->address) ? tls->address : "peer") -#if (OPENSSL_VERSION_NUMBER < 0x0090813fL || \ - (OPENSSL_VERSION_NUMBER >= 0x00909000L && \ - OPENSSL_VERSION_NUMBER < 0x1000006fL)) +#if (OPENSSL_VERSION_NUMBER < OPENSSL_V(0,9,8,'s') || \ + (OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(0,9,9) && \ + OPENSSL_VERSION_NUMBER < OPENSSL_V(1,0,0,'f'))) /* This is a version of OpenSSL before 0.9.8s/1.0.0f. It does not have - * the CVE-2011-4657 fix, and as such it can't use RELEASE_BUFFERS and + * the CVE-2011-4576 fix, and as such it can't use RELEASE_BUFFERS and * SSL3 safely at the same time. */ #define DISABLE_SSL3_HANDSHAKE @@@ -1179,12 -794,12 +1179,12 @@@ tor_tls_context_new(crypto_pk_t *identi #ifdef DISABLE_SSL3_HANDSHAKE 1 || #endif - SSLeay() < 0x0090813fL || - (SSLeay() >= 0x00909000L && - SSLeay() < 0x1000006fL)) { + SSLeay() < OPENSSL_V(0,9,8,'s') || + (SSLeay() >= OPENSSL_V_SERIES(0,9,9) && + SSLeay() < OPENSSL_V(1,0,0,'f'))) { - /* And not SSL3 if it's subject to CVE-2011-4657. */ + /* And not SSL3 if it's subject to CVE-2011-4576. */ log_info(LD_NET, "Disabling SSLv3 because this OpenSSL version " - "might otherwise be vulnerable to CVE-2011-4657 " + "might otherwise be vulnerable to CVE-2011-4576 " "(compile-time version %08lx (%s); " "runtime version %08lx (%s))", (unsigned long)OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT,

1 0

[tor/master] Add a changes file for bug 5066.
by nickm＠torproject.org 10 Feb '12

10 Feb '12

commit 34b9bc2829d0c061317684602c5296f13e0ced44 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 10 10:57:57 2012 -0500 Add a changes file for bug 5066. (It appeared in 0.2.3.11-alpha, but never in a released 0.2.2 afaict) --- changes/bug5066 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/bug5066 b/changes/bug5066 new file mode 100644 index 0000000..ab339c8 --- /dev/null +++ b/changes/bug5066 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Use the correct CVE number for CVE-2011-4576 in our comments and + log messages. Found by "fermenthor". Resolves bug 5066; fix on + 0.2.3.11-alpha.

1 0

[tor/maint-0.2.2] Use correct CVE number for CVE-2011-4576. Found by fermenthor. bug 5066
by nickm＠torproject.org 10 Feb '12

10 Feb '12

commit 2da0efb547b70a7caed59097036d1e59859a4b35 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 10 10:55:39 2012 -0500 Use correct CVE number for CVE-2011-4576. Found by fermenthor. bug 5066 --- src/common/tortls.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index d766377..4c9d218 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -72,7 +72,7 @@ (OPENSSL_VERSION_NUMBER >= 0x00909000L && \ OPENSSL_VERSION_NUMBER < 0x1000006fL)) /* This is a version of OpenSSL before 0.9.8s/1.0.0f. It does not have - * the CVE-2011-4657 fix, and as such it can't use RELEASE_BUFFERS and + * the CVE-2011-4576 fix, and as such it can't use RELEASE_BUFFERS and * SSL3 safely at the same time. */ #define DISABLE_SSL3_HANDSHAKE @@ -797,9 +797,9 @@ tor_tls_context_new(crypto_pk_env_t *identity, unsigned int key_lifetime, SSLeay() < 0x0090813fL || (SSLeay() >= 0x00909000L && SSLeay() < 0x1000006fL)) { - /* And not SSL3 if it's subject to CVE-2011-4657. */ + /* And not SSL3 if it's subject to CVE-2011-4576. */ log_info(LD_NET, "Disabling SSLv3 because this OpenSSL version " - "might otherwise be vulnerable to CVE-2011-4657 " + "might otherwise be vulnerable to CVE-2011-4576 " "(compile-time version %08lx (%s); " "runtime version %08lx (%s))", (unsigned long)OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT,

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 10 Feb '12

10 Feb '12

commit 329c9f3256d98e504fa3085a4f414d574bb17e94 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 10 15:15:18 2012 +0000 Update translations for vidalia --- tr/vidalia_tr.po | 77 ++++++++++++++++++++++++++++------------------------- 1 files changed, 41 insertions(+), 36 deletions(-) diff --git a/tr/vidalia_tr.po b/tr/vidalia_tr.po index 6561bdb..116a85e 100644 --- a/tr/vidalia_tr.po +++ b/tr/vidalia_tr.po @@ -1,13 +1,14 @@ # # Translators: +# Deniz <>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2011-09-08 00:47+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2012-02-10 15:08+0000\n" +"Last-Translator: Deniz <>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -139,15 +140,15 @@ msgstr "Tor için kullanılacak kayıt klasörünü seç" msgctxt "AdvancedPage" msgid "Tor Control" -msgstr "" +msgstr "Tor Kontrolü" msgctxt "AdvancedPage" msgid "Use TCP connection (ControlPort)" -msgstr "" +msgstr "TCP bağlantısı kullan (ControlPort)" msgctxt "AdvancedPage" msgid "Path:" -msgstr "" +msgstr "Konum:" msgctxt "AdvancedPage" msgid "Use Unix domain socket (ControlSocket)" @@ -155,11 +156,11 @@ msgstr "" msgctxt "AdvancedPage" msgid "Edit current torrc" -msgstr "" +msgstr "Mevcut torrc'yi düzenle" msgctxt "AdvancedPage" msgid "NOTE: this will edit the currently loaded torrc" -msgstr "" +msgstr "Not: bu ayar şuan kullanılan torrc'yi düzenler." msgctxt "AdvancedPage" msgid "ControlSocket path doesn't exist." @@ -179,7 +180,7 @@ msgstr "" msgctxt "AdvancedPage" msgid "Warning" -msgstr "" +msgstr "Uyarı" msgctxt "AdvancedPage" msgid "You changed torrc path, would you like to restart Tor?" @@ -1165,7 +1166,7 @@ msgstr "Zimbabwe" msgctxt "CountryInfo" msgid "Zaire" -msgstr "" +msgstr "Demokratik Kongo Cumhuriyeti" msgctxt "CountryInfo" msgid "Albania" @@ -1265,29 +1266,31 @@ msgstr "Taiwan" msgctxt "CrashReportDialog" msgid "Submit a Crash Report" -msgstr "" +msgstr "Çökme Raporu Gönder" msgctxt "CrashReportDialog" msgid "Vidalia encountered an error and needed to close" -msgstr "" +msgstr "Vidalia bir sorunla karşılaştı ve kapanması gerekiyor." msgctxt "CrashReportDialog" msgid "Restart Vidalia" -msgstr "" +msgstr "Vidalia'yı yeniden başlat." msgctxt "CrashReportDialog" msgid "Don't Restart" -msgstr "" +msgstr "Yeniden Başlatma" msgctxt "CrashReportDialog" msgid "Unable to restart Vidalia" -msgstr "" +msgstr "Vidalia yeniden başlatılamadı." msgctxt "CrashReportDialog" msgid "" "We were unable to automatically restart Vidalia. Please restart Vidalia " "manually." msgstr "" +"Vidalia'yı yeniden otomatik olarak başlatamadık. Lütfen Vidalia'yı manuel " +"olarak başlatın." msgctxt "CrashReportDialog" msgid "Please fill a ticket in:" @@ -1592,27 +1595,27 @@ msgstr "Bilinmeyen" msgctxt "LogTreeItem" msgid "Debug" -msgstr "" +msgstr "Hata ayıkla" msgctxt "LogTreeItem" msgid "Info" -msgstr "" +msgstr "Bilgi" msgctxt "LogTreeItem" msgid "Notice" -msgstr "" +msgstr "Bildirim" msgctxt "LogTreeItem" msgid "Warning" -msgstr "" +msgstr "Uyarı" msgctxt "LogTreeItem" msgid "Error" -msgstr "" +msgstr "Hata" msgctxt "LogTreeItem" msgid "Unknown" -msgstr "" +msgstr "Bilinmeyen" msgctxt "MainWindow" msgid "Start Tor" @@ -2389,15 +2392,15 @@ msgstr "Yeni günlük mesajlarını otomatik kaydet" msgctxt "MessageLog" msgid "Basic" -msgstr "" +msgstr "Temel" msgctxt "MessageLog" msgid "Tor Status" -msgstr "" +msgstr "Tor Durumu" msgctxt "MessageLog" msgid "Advanced" -msgstr "" +msgstr "Gelişmiş" msgctxt "MessageLog" msgid "Always Save New Log Messages" @@ -2689,31 +2692,31 @@ msgstr "Yeni köprü bulmanın diğer yöntemlerini görmek için Yardım'a tık msgctxt "NetworkPage" msgid "Address:" -msgstr "" +msgstr "Adres:" msgctxt "NetworkPage" msgid "Type:" -msgstr "" +msgstr "Tür:" msgctxt "NetworkPage" msgid "You must select the proxy type." -msgstr "" +msgstr "Vekil sunucu türünü seçmelisiniz." msgctxt "NetworkPage" msgid "SOCKS 4" -msgstr "" +msgstr "SOCKS 4" msgctxt "NetworkPage" msgid "SOCKS 5" -msgstr "" +msgstr "SOCKS 5" msgctxt "NetworkPage" msgid "HTTP" -msgstr "" +msgstr "HTTP" msgctxt "NetworkPage" msgid "HTTP / HTTPS" -msgstr "" +msgstr "HTTP / HTTPS" msgctxt "Policy" msgid "accept" @@ -3150,7 +3153,7 @@ msgstr "" msgctxt "ServerPage" msgid "Automatically distribute my bridge address" -msgstr "" +msgstr "Köprü adresimi otomatik olarak dağıt" msgctxt "ServerPage" msgid "Mirror the Relay Directory" @@ -3250,15 +3253,15 @@ msgstr "Tor tarafından oluşuturuldu" msgctxt "StatusEventWidget" msgid "Copy to Clipboard" -msgstr "" +msgstr "Panoya kopyala." msgctxt "StatusEventWidget" msgid "The Tor Software is Running" -msgstr "" +msgstr "Tor yazılımı çalışıyor." msgctxt "StatusEventWidget" msgid "You are currently running version \"%1\" of the Tor software." -msgstr "" +msgstr "Şu anda Tor yazılımının \"%1\" versiyonunu kullanmaktasınız." msgctxt "StatusEventWidget" msgid "The Tor Software is not Running" @@ -3289,17 +3292,19 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Your Tor Software is Out-of-date" -msgstr "" +msgstr "Tor yazılımınızın tarihi geçmiş." msgctxt "StatusEventWidget" msgid "Connected to the Tor Network" -msgstr "" +msgstr "Tor ağına bağlanıldı." msgctxt "StatusEventWidget" msgid "" "We were able to successfully establish a connection to the Tor network. You " "can now configure your applications to use the Internet anonymously." msgstr "" +"Tor ağına bağlantıyı başarıyla gerçekleştirdik. Şimdi programlarınızı " +"Internet'i anonim olarak kullanmak uzere ayarlayabilirsiniz." msgctxt "StatusEventWidget" msgid "Tor Software Error"

1 0

[ooni-probe/master] Add obfsproxy support to BridgeT
by art＠torproject.org 10 Feb '12

10 Feb '12

commit 2b72638b5f1afea23348def754ce24beb9c11c75 Author: Arturo Filastò <hellais(a)gmail.com> Date: Fri Feb 10 15:06:23 2012 +0100 Add obfsproxy support to BridgeT --- refactor/tests/bridget.py | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/refactor/tests/bridget.py b/refactor/tests/bridget.py index 71d210a..12e3fa1 100644 --- a/refactor/tests/bridget.py +++ b/refactor/tests/bridget.py @@ -38,11 +38,22 @@ class BridgeT(Plugoo): socksport = random.randint(49152, 65535) randomname = "tor_"+str(random.randint(0, 424242424242)) datadir = "/tmp/" + randomname - torrc = """SocksPort %s + if bridge.startswith("obfs://"): + obfsbridge = bridge.split("/")[1] + torrc = """SocksPort %s +UseBridges 1 +DataDirectory %s +Bridge obfs2 %s +ClientTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed +""" % (socksport, obfsbridge, datadir) + + else: + torrc = """SocksPort %s UseBridges 1 bridge %s DataDirectory %s """ % (socksport, bridge, datadir) + try: f = open(randomname, "wb") f.write(torrc)

1 0