October 2011 - tor-commits - lists.torproject.org

[tor/maint-0.2.1] Don't send a certificate chain on outgoing TLS connections from non-relays
by arma＠torproject.org 28 Oct '11

28 Oct '11

commit 638fdedcf16cf7d6f7c586d36f7ef335c1c9714f Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Oct 23 16:06:06 2011 +0000 Don't send a certificate chain on outgoing TLS connections from non-relays --- changes/issue-2011-10-19L | 12 ++++++ src/common/tortls.c | 93 ++++++++++++++++++++++++++------------------- 2 files changed, 66 insertions(+), 39 deletions(-) diff --git a/changes/issue-2011-10-19L b/changes/issue-2011-10-19L new file mode 100644 index 0000000..972823e --- /dev/null +++ b/changes/issue-2011-10-19L @@ -0,0 +1,12 @@ + o Security fixes: + + - Don't send TLS certificate chains on outgoing OR connections + from clients and bridges. Previously, each client or bridge + would use a single cert chain for all outgoing OR connections + for up to 24 hours, which allowed any relay connected to by a + client or bridge to determine which entry guards it is using. + This is a potential user-tracing bug for *all* users; everyone + who uses Tor's client or hidden service functionality should + upgrade. Fixes CVE-2011-2768. Bugfix on FIXME; found by + frosty_un. + diff --git a/src/common/tortls.c b/src/common/tortls.c index c78a9ec..cc805f8 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -186,9 +186,11 @@ static X509* tor_tls_create_certificate(crypto_pk_env_t *rsa, static void tor_tls_unblock_renegotiation(tor_tls_t *tls); static int tor_tls_context_init_one(tor_tls_context_t **ppcontext, crypto_pk_env_t *identity, - unsigned int key_lifetime); + unsigned int key_lifetime, + int is_client); static tor_tls_context_t *tor_tls_context_new(crypto_pk_env_t *identity, - unsigned int key_lifetime); + unsigned int key_lifetime, + int is_client); /** Global TLS contexts. We keep them here because nobody else needs * to touch them. */ @@ -624,7 +626,7 @@ tor_tls_context_init(int is_public_server, rv1 = tor_tls_context_init_one(&server_tls_context, server_identity, - key_lifetime); + key_lifetime, 0); if (rv1 >= 0) { new_ctx = server_tls_context; @@ -640,7 +642,8 @@ tor_tls_context_init(int is_public_server, if (server_identity != NULL) { rv1 = tor_tls_context_init_one(&server_tls_context, server_identity, - key_lifetime); + key_lifetime, + 0); } else { tor_tls_context_t *old_ctx = server_tls_context; server_tls_context = NULL; @@ -652,7 +655,8 @@ tor_tls_context_init(int is_public_server, rv2 = tor_tls_context_init_one(&client_tls_context, client_identity, - key_lifetime); + key_lifetime, + 1); } return rv1 < rv2 ? rv1 : rv2; @@ -669,10 +673,12 @@ tor_tls_context_init(int is_public_server, static int tor_tls_context_init_one(tor_tls_context_t **ppcontext, crypto_pk_env_t *identity, - unsigned int key_lifetime) + unsigned int key_lifetime, + int is_client) { tor_tls_context_t *new_ctx = tor_tls_context_new(identity, - key_lifetime); + key_lifetime, + is_client); tor_tls_context_t *old_ctx = *ppcontext; if (new_ctx != NULL) { @@ -694,7 +700,8 @@ tor_tls_context_init_one(tor_tls_context_t **ppcontext, * certificate. */ static tor_tls_context_t * -tor_tls_context_new(crypto_pk_env_t *identity, unsigned int key_lifetime) +tor_tls_context_new(crypto_pk_env_t *identity, unsigned int key_lifetime, + int is_client) { crypto_pk_env_t *rsa = NULL; EVP_PKEY *pkey = NULL; @@ -711,22 +718,26 @@ tor_tls_context_new(crypto_pk_env_t *identity, unsigned int key_lifetime) goto error; if (crypto_pk_generate_key(rsa)<0) goto error; - /* Create certificate signed by identity key. */ - cert = tor_tls_create_certificate(rsa, identity, nickname, nn2, - key_lifetime); - /* Create self-signed certificate for identity key. */ - idcert = tor_tls_create_certificate(identity, identity, nn2, nn2, - IDENTITY_CERT_LIFETIME); - if (!cert || !idcert) { - log(LOG_WARN, LD_CRYPTO, "Error creating certificate"); - goto error; + if (!is_client) { + /* Create certificate signed by identity key. */ + cert = tor_tls_create_certificate(rsa, identity, nickname, nn2, + key_lifetime); + /* Create self-signed certificate for identity key. */ + idcert = tor_tls_create_certificate(identity, identity, nn2, nn2, + IDENTITY_CERT_LIFETIME); + if (!cert || !idcert) { + log(LOG_WARN, LD_CRYPTO, "Error creating certificate"); + goto error; + } } result = tor_malloc_zero(sizeof(tor_tls_context_t)); result->refcnt = 1; - result->my_cert = X509_dup(cert); - result->my_id_cert = X509_dup(idcert); - result->key = crypto_pk_dup_key(rsa); + if (!is_client) { + result->my_cert = X509_dup(cert); + result->my_id_cert = X509_dup(idcert); + result->key = crypto_pk_dup_key(rsa); + } #ifdef EVERYONE_HAS_AES /* Tell OpenSSL to only use TLS1 */ @@ -758,27 +769,31 @@ tor_tls_context_new(crypto_pk_env_t *identity, unsigned int key_lifetime) #ifdef SSL_MODE_RELEASE_BUFFERS SSL_CTX_set_mode(result->ctx, SSL_MODE_RELEASE_BUFFERS); #endif - if (cert && !SSL_CTX_use_certificate(result->ctx,cert)) - goto error; - X509_free(cert); /* We just added a reference to cert. */ - cert=NULL; - if (idcert) { - X509_STORE *s = SSL_CTX_get_cert_store(result->ctx); - tor_assert(s); - X509_STORE_add_cert(s, idcert); - X509_free(idcert); /* The context now owns the reference to idcert */ - idcert = NULL; + if (! is_client) { + if (cert && !SSL_CTX_use_certificate(result->ctx,cert)) + goto error; + X509_free(cert); /* We just added a reference to cert. */ + cert=NULL; + if (idcert) { + X509_STORE *s = SSL_CTX_get_cert_store(result->ctx); + tor_assert(s); + X509_STORE_add_cert(s, idcert); + X509_free(idcert); /* The context now owns the reference to idcert */ + idcert = NULL; + } } SSL_CTX_set_session_cache_mode(result->ctx, SSL_SESS_CACHE_OFF); - tor_assert(rsa); - if (!(pkey = _crypto_pk_env_get_evp_pkey(rsa,1))) - goto error; - if (!SSL_CTX_use_PrivateKey(result->ctx, pkey)) - goto error; - EVP_PKEY_free(pkey); - pkey = NULL; - if (!SSL_CTX_check_private_key(result->ctx)) - goto error; + if (!is_client) { + tor_assert(rsa); + if (!(pkey = _crypto_pk_env_get_evp_pkey(rsa,1))) + goto error; + if (!SSL_CTX_use_PrivateKey(result->ctx, pkey)) + goto error; + EVP_PKEY_free(pkey); + pkey = NULL; + if (!SSL_CTX_check_private_key(result->ctx)) + goto error; + } { crypto_dh_env_t *dh = crypto_dh_new(DH_TYPE_TLS); SSL_CTX_set_tmp_dh(result->ctx, _crypto_dh_env_get_dh(dh));

1 0

[tor/maint-0.2.1] Mark which OR connections are outgoing
by arma＠torproject.org 28 Oct '11

28 Oct '11

commit c05bb53508f5fe3e570a285e6c9ead452ded0e43 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun Oct 23 14:58:00 2011 -0700 Mark which OR connections are outgoing --- src/or/connection_or.c | 2 ++ src/or/or.h | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 35f6da9..f019c79 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -776,6 +776,8 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port, conn->_base.state = OR_CONN_STATE_CONNECTING; control_event_or_conn_status(conn, OR_CONN_EVENT_LAUNCHED, 0); + conn->is_outgoing = 1; + if (options->HttpsProxy) { /* we shouldn't connect directly. use the https proxy instead. */ tor_addr_from_ipv4h(&addr, options->HttpsProxyAddr); diff --git a/src/or/or.h b/src/or/or.h index 72e4c63..edbb73c 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1035,6 +1035,8 @@ typedef struct or_connection_t { * is a client. Connections with this flag set should never be used * to satisfy an EXTEND request. */ unsigned int is_connection_with_client:1; + /** True iff this is an outgoing connection. */ + unsigned int is_outgoing:1; uint8_t link_proto; /**< What protocol version are we using? 0 for * "none negotiated yet." */ circid_t next_circ_id; /**< Which circ_id do we try to use next on

1 0

[tor/maint-0.2.1] Reject create cells on outgoing OR connections from bridges
by arma＠torproject.org 28 Oct '11

28 Oct '11

commit a74e7fd40f1a77eb4000d8216bb5b80cdd8a6193 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun Oct 23 15:21:49 2011 -0700 Reject create cells on outgoing OR connections from bridges --- changes/issue-2011-10-23G | 9 +++++++++ src/or/command.c | 7 +++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/changes/issue-2011-10-23G b/changes/issue-2011-10-23G new file mode 100644 index 0000000..45f8675 --- /dev/null +++ b/changes/issue-2011-10-23G @@ -0,0 +1,9 @@ + o Security fixes: + + - Reject CREATE and CREATE_FAST cells on outgoing OR connections + from a bridge to a relay. Previously, we would accept them and + handle them normally, thereby allowing a malicious relay to + easily distinguish bridges which connect to it from clients. + Fixes CVE-2011-2769. Bugfix on 0.2.0.3-alpha, when bridges were + implemented; found by frosty_un. + diff --git a/src/or/command.c b/src/or/command.c index a17a3a6..54f23bb 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -219,6 +219,7 @@ static void command_process_create_cell(cell_t *cell, or_connection_t *conn) { or_circuit_t *circ; + or_options_t *options = get_options(); int id_is_high; if (we_are_hibernating()) { @@ -230,9 +231,11 @@ command_process_create_cell(cell_t *cell, or_connection_t *conn) return; } - if (!server_mode(get_options())) { + if (!server_mode(options) || + (!public_server_mode(options) && conn->is_outgoing)) { log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, - "Received create cell (type %d) from %s:%d, but we're a client. " + "Received create cell (type %d) from %s:%d, but we're connected " + "to it as a client. " "Sending back a destroy.", (int)cell->command, conn->_base.address, conn->_base.port); connection_or_send_destroy(cell->circ_id, conn,

1 0

[torbrowser/maint-2.2] update recommended versions
by erinn＠torproject.org 28 Oct '11

28 Oct '11

commit c6b322664af9ff04ff660069bad373469c04acab Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Oct 27 23:56:08 2011 +0100 update recommended versions --- build-scripts/recommended-versions | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 8fb3ecd..4173073 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -8,5 +8,10 @@ "2.2.33-3-Linux-x86_64", "2.2.33-3-MacOS-i386", "2.2.33-3-MacOS-x86_64", -"2.2.33-3-Windows" +"2.2.33-3-Windows", +"2.2.34-1-Linux-i686", +"2.2.34-1-Linux-x86_64", +"2.2.34-1-MacOS-i386", +"2.2.34-1-MacOS-x86_64", +"2.2.34-1-Windows" ]

1 0

[torbrowser/maint-2.3] update recommended versions
by erinn＠torproject.org 28 Oct '11

28 Oct '11

commit c6b322664af9ff04ff660069bad373469c04acab Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Oct 27 23:56:08 2011 +0100 update recommended versions --- build-scripts/recommended-versions | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 8fb3ecd..4173073 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -8,5 +8,10 @@ "2.2.33-3-Linux-x86_64", "2.2.33-3-MacOS-i386", "2.2.33-3-MacOS-x86_64", -"2.2.33-3-Windows" +"2.2.33-3-Windows", +"2.2.34-1-Linux-i686", +"2.2.34-1-Linux-x86_64", +"2.2.34-1-MacOS-i386", +"2.2.34-1-MacOS-x86_64", +"2.2.34-1-Windows" ]

1 0

[torbrowser/master] update recommended versions
by erinn＠torproject.org 28 Oct '11

28 Oct '11

commit c6b322664af9ff04ff660069bad373469c04acab Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Oct 27 23:56:08 2011 +0100 update recommended versions --- build-scripts/recommended-versions | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 8fb3ecd..4173073 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -8,5 +8,10 @@ "2.2.33-3-Linux-x86_64", "2.2.33-3-MacOS-i386", "2.2.33-3-MacOS-x86_64", -"2.2.33-3-Windows" +"2.2.33-3-Windows", +"2.2.34-1-Linux-i686", +"2.2.34-1-Linux-x86_64", +"2.2.34-1-MacOS-i386", +"2.2.34-1-MacOS-x86_64", +"2.2.34-1-Windows" ]

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 28 Oct '11

28 Oct '11

commit 571287c63416bde78d92fea3a4a23a0cb9531b58 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 27 19:15:33 2011 +0000 Update translations for orbot --- values-sv/strings.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/values-sv/strings.xml b/values-sv/strings.xml index 2ad858d..0f96e32 100644 --- a/values-sv/strings.xml +++ b/values-sv/strings.xml @@ -30,10 +30,10 @@ <string name="button_help">Hjälp</string> <string name="button_close">Stäng</string> <string name="button_about">Om</string> - <string name="button_clear_log"></string> + <string name="button_clear_log">Rensa logg</string> <string name="menu_verify"></string> <string name="menu_exit"></string> - <string name="powered_by"></string> + <string name="powered_by">drivs av Tor-projektet</string> <string name="press_to_start"></string> <string name="pref_trans_proxy_group"></string> <string name="pref_trans_proxy_title"></string>

1 0

r25189: {website} update download-easy to handle 32/64bit choices from ticket (in website/trunk: download/en include)
by Andrew Lewman 28 Oct '11

28 Oct '11

Author: phobos Date: 2011-10-27 18:36:51 +0000 (Thu, 27 Oct 2011) New Revision: 25189 Modified: website/trunk/download/en/download-easy.wml website/trunk/include/dlhead.wmi Log: update download-easy to handle 32/64bit choices from ticket 4231. Modified: website/trunk/download/en/download-easy.wml =================================================================== --- website/trunk/download/en/download-easy.wml 2011-10-27 16:15:58 UTC (rev 25188) +++ website/trunk/download/en/download-easy.wml 2011-10-27 18:36:51 UTC (rev 25189) @@ -13,9 +13,9 @@ <define-tag button-win-tbb32>Tor Browser Bundle</define-tag> <define-tag button-win-tbb64>Currently Unused</define-tag> <define-tag button-osx-tbb32>Tor Browser Bundle (Beta)</define-tag> -<define-tag button-osx-tbb64>64-bit (Beta)</define-tag> +<define-tag button-osx-tbb64>Mac 64-bit (Beta)</define-tag> <define-tag button-lin-tbb32>Tor Browser Bundle (Beta)</define-tag> -<define-tag button-lin-tbb64>64-bit (Beta)</define-tag> +<define-tag button-lin-tbb64>Linux 64-bit (Beta)</define-tag> #include "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" @@ -56,13 +56,13 @@ <div class="easy mac"> <div class="package" style="padding-top: 13px; border-top: 0px;"> <form class="downloads"> - <a class="button mac-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a> - <select name="language" id="mac-tbb" class="lang"> + <a class="button osx-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a> + <select name="language" id="osx-tbb" class="lang"> #include <lang.wmi> </select> <div class="sig" style="margin-bottom: 5px;"> <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a> - (<a class="mac-tbb-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + (<a class="osx-tbb-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> </form> <div class="desc"> @@ -73,6 +73,27 @@ <p class="alt-dl">Not Using Mac? Download for <a class="win-alt" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe">Windows</a> or <a class="lin-alt" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz">Linux</a></p> </div> </div> + + <div class="easy mac"> + <div class="package" style="padding-top: 13px; border-top: 0px;"> + <form class="downloads"> + <a class="button osx-tbb64" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a> + <select name="language" id="osx-tbb64" class="lang"> +#include <lang.wmi> + </select> + <div class="sig" style="margin-bottom: 5px;"> + <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a> + (<a class="osx-tbb64-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + </div> + </form> + <div class="desc"> + <h2>Tor Browser Bundle for 64-Bit Mac</h2> + <em>Version <version-torbrowserbundleosx> - OS X (64-Bit)</em> + <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></p> + </div> + <p class="alt-dl">Not Using Mac? Download for <a class="win-alt64" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe">Windows</a> or <a class="lin-alt64" href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz">Linux</a></p> + </div> + </div>  <div class="easy linux"> <div class="package" style="padding-top: 13px; border-top: 0px;"> @@ -94,6 +115,27 @@ <p class="alt-dl">Not Using Linux? Download for <a class="mac-alt" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip">Mac</a> or <a class="win-alt" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe">Windows</a></p> </div> </div> + + <div class="easy linux"> + <div class="package" style="padding-top: 13px; border-top: 0px;"> + <form class="downloads"> + <a class="button lin-tbb64" href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a> + <select name="language" id="lin-tbb64" class="lang"> +#include <lang.wmi> + </select> + <div class="sig" style="margin-bottom: 5px;"> + <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a> + (<a class="lin-tbb64-sig" href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + </div> + </form> + <div class="desc"> + <h2>Tor Browser Bundle for 64-Bit Linux</h2> + <em>Version <version-torbrowserbundlelinux32> - Linux, Unix, BSD (64-Bit)</em> + <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></p> + </div> + <p class="alt-dl">Not Using Linux? Download for <a class="mac-alt64" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-<lang>.zip">Mac</a> or <a class="win-alt64" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe">Windows</a></p> + </div> + </div> <p class="all-dl">Looking For Something Else? <a href="<page download/download>">View All Downloads</a></p> <br>  Modified: website/trunk/include/dlhead.wmi =================================================================== --- website/trunk/include/dlhead.wmi 2011-10-27 16:15:58 UTC (rev 25188) +++ website/trunk/include/dlhead.wmi 2011-10-27 18:36:51 UTC (rev 25189) @@ -77,6 +77,8 @@ }else if(pkg == 'osx-tbb64'){ $('.'+pkg).replaceWith('<a class="button osx-tbb64" href="'+osxtbb64+'"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a>'); $('.'+pkg+'-sig').replaceWith('<a class="osx-tbb64-sig" href="'+osxtbb64+'.asc">sig</a>'); + $('.win-alt64').replaceWith('<a class="win-alt64" href="'+wintbb+'">Windows</a>'); + $('.lin-alt64').replaceWith('<a class="lin-alt64" href="'+lintbb64+'">Linux</a>'); }else if(pkg == 'lin-tbb32'){ $('.'+pkg).replaceWith('<a class="button lin-tbb32" href="'+lintbb32+'"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a>'); $('.'+pkg+'-sig').replaceWith('<a class="lin-tbb32-sig" href="'+lintbb32+'.asc">sig</a>'); @@ -85,6 +87,8 @@ }else if(pkg == 'lin-tbb64'){ $('.'+pkg).replaceWith('<a class="button lin-tbb64" href="'+lintbb64+'"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a>'); $('.'+pkg+'-sig').replaceWith('<a class="lin-tbb64-sig" href="'+lintbb64+'.asc">sig</a>'); + $('.mac-alt64').replaceWith('<a class="mac-alt64" href="'+osxtbb64+'">Mac</a>'); + $('.win-alt64').replaceWith('<a class="win-alt64" href="'+wintbb+'">Windows</a>'); } }

1 0

[stem/master] Requirement check for the config-text test
by atagar＠torproject.org 28 Oct '11

28 Oct '11

commit 7766cb79fff29020b72b5fe45fc43d184abada23 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Oct 27 07:16:06 2011 -0700 Requirement check for the config-text test An integration test requires 'GETINFO config-text' requires tor version 0.2.2.7 so adding a check for it. --- stem/types.py | 2 ++ test/integ/message.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/stem/types.py b/stem/types.py index a83a7c2..630df9e 100644 --- a/stem/types.py +++ b/stem/types.py @@ -291,3 +291,5 @@ class Version: return cmp(my_status, other_status) +REQ_GETINFO_CONFIG_TEXT = get_version("0.2.2.7") + diff --git a/test/integ/message.py b/test/integ/message.py index ad5417a..2f10ed4 100644 --- a/test/integ/message.py +++ b/test/integ/message.py @@ -140,8 +140,8 @@ class TestMessageFunctions(unittest.TestCase): Parses the 'GETINFO config-text' response. """ - # TODO: add a 0.2.2.7-alpha version check for this test (that was when - # 'GETINFO config-text' was added) + if stem.process.get_version() < stem.types.REQ_GETINFO_CONFIG_TEXT: + return # We can't be certain of the order, and there may be extra config-text # entries as per...

1 0

[stem/master] Caching for stem.process.get_version()
by atagar＠torproject.org 28 Oct '11

28 Oct '11

commit 11b2a71d3a6ae24365ebd1e9a30c323a6a3ce275 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Oct 27 09:17:26 2011 -0700 Caching for stem.process.get_version() Caching results of the stem.process.get_version() function to avoid unnecessary lookups. --- stem/process.py | 48 +++++++++++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 21 deletions(-) diff --git a/stem/process.py b/stem/process.py index 0baa5dd..934a9c1 100644 --- a/stem/process.py +++ b/stem/process.py @@ -15,6 +15,9 @@ from stem.util import system # number of seconds before we time out our attempt to start a tor instance DEFAULT_INIT_TIMEOUT = 90 +# cache for the get_version function +VERSION_CACHE = {} + def get_version(tor_cmd = "tor"): """ Provides the version of tor. @@ -29,29 +32,32 @@ def get_version(tor_cmd = "tor"): IOError if unable to query or parse the version """ - try: - version_cmd = "%s --version" % tor_cmd - version_output = system.call(version_cmd) - except OSError, exc: - raise IOError(exc) - - if version_output: - # output example: - # Oct 21 07:19:27.438 [notice] Tor v0.2.1.30. This is experimental software. Do not rely on it for strong anonymity. (Running on Linux i686) - # Tor version 0.2.1.30. + if not tor_cmd in VERSION_CACHE: + try: + version_cmd = "%s --version" % tor_cmd + version_output = system.call(version_cmd) + except OSError, exc: + raise IOError(exc) - last_line = version_output[-1] - - if last_line.startswith("Tor version ") and last_line.endswith("."): - try: - version_str = last_line[12:-1] - return stem.types.get_version(version_str) - except ValueError, exc: - raise IOError(exc) + if version_output: + # output example: + # Oct 21 07:19:27.438 [notice] Tor v0.2.1.30. This is experimental software. Do not rely on it for strong anonymity. (Running on Linux i686) + # Tor version 0.2.1.30. + + last_line = version_output[-1] + + if last_line.startswith("Tor version ") and last_line.endswith("."): + try: + version_str = last_line[12:-1] + VERSION_CACHE[tor_cmd] = stem.types.get_version(version_str) + except ValueError, exc: + raise IOError(exc) + else: + raise IOError("Unexpected response from '%s': %s" % (version_cmd, last_line)) else: - raise IOError("Unexpected response from '%s': %s" % (version_cmd, last_line)) - else: - raise IOError("'%s' didn't have any output" % version_cmd) + raise IOError("'%s' didn't have any output" % version_cmd) + + return VERSION_CACHE[tor_cmd] def launch_tor(torrc_path, completion_percent = 100, init_msg_handler = None, timeout = DEFAULT_INIT_TIMEOUT): """

1 0