- tor-commits - lists.torproject.org

[tor/master] Downgrade "EVP ctr128 is ok" message to info
by nickm＠torproject.org 10 Sep '12

10 Sep '12

commit 7ff5c3f2322217a0fe5d24ba26a0192106594e0f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 10 10:38:22 2012 -0400 Downgrade "EVP ctr128 is ok" message to info Part of 6736 effort to try to make startup quieter. --- src/common/aes.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/aes.c b/src/common/aes.c index dd89d5d..c6a997f 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -134,8 +134,8 @@ int evaluate_evp_for_aes(int force_val) { (void) force_val; - log_notice(LD_CRYPTO, "This version of OpenSSL has a known-good EVP " - "counter-mode implementation. Using it."); + log_info(LD_CRYPTO, "This version of OpenSSL has a known-good EVP " + "counter-mode implementation. Using it."); return 0; } int

1 0

[tor/master] Merge remote-tracking branch 'linus/bug6797'
by nickm＠torproject.org 10 Sep '12

10 Sep '12

commit 0ab7716b9ec0deebfa3124ffc2c7a7f0b0d705e6 Merge: 344bb1d 93ee622 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 10 10:19:57 2012 -0400 Merge remote-tracking branch 'linus/bug6797' changes/bug6797 | 3 +++ src/or/dirserv.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/master] Don't follow the NULL pointer.
by nickm＠torproject.org 10 Sep '12

10 Sep '12

commit 93ee62297ff24fcd01f97c87d76953f4d5fb377c Author: Linus Nordberg <linus(a)torproject.org> Date: Wed Sep 5 14:00:55 2012 +0200 Don't follow the NULL pointer. If dirvote_create_microdescriptor() returns NULL, don't use md. Found by "f. tp.". Fixes bug 6797. --- changes/bug6797 | 3 +++ src/or/dirserv.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bug6797 b/changes/bug6797 new file mode 100644 index 0000000..f52f899 --- /dev/null +++ b/changes/bug6797 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Don't follow the NULL pointer. Found by "f. tp.". Fixes bug + 6797; bugfix on 0.2.4.1-alpha. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 7f46906..e7a2623 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2800,9 +2800,9 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, h->microdesc_hash_line = tor_strdup(buf); h->next = vrs->microdesc; vrs->microdesc = h; + md->last_listed = now; + smartlist_add(microdescriptors, md); } - md->last_listed = now; - smartlist_add(microdescriptors, md); } smartlist_add(routerstatuses, vrs);

1 0

[tor/master] Be more clear in changes file for 6797.
by nickm＠torproject.org 10 Sep '12

10 Sep '12

commit 3e8058f9edb592479d84181343ae8d47bb745d2c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 10 10:21:46 2012 -0400 Be more clear in changes file for 6797. --- changes/bug6797 | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/changes/bug6797 b/changes/bug6797 index f52f899..95c889d 100644 --- a/changes/bug6797 +++ b/changes/bug6797 @@ -1,3 +1,5 @@ o Minor bugfixes: - - Don't follow the NULL pointer. Found by "f. tp.". Fixes bug - 6797; bugfix on 0.2.4.1-alpha. + - Don't follow the NULL pointer if microdescriptor generation fails. + (This does not appear to be triggerable, but it's best to be safe.) + Found by "f. tp.". Fixes bug 6797; bugfix on 0.2.4.1-alpha. +

1 0

[tor/master] Fix tab introduced in f43946829ce037
by nickm＠torproject.org 10 Sep '12

10 Sep '12

commit cb8f64cdc80195af4c62c17db1dabebbd48b0ec1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 10 10:22:40 2012 -0400 Fix tab introduced in f43946829ce037 --- src/or/config.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index f38e686..8f79c44 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -7310,7 +7310,7 @@ getinfo_helper_config(control_connection_t *conn, const char *type; /* don't tell controller about triple-underscore options */ if (!strncmp(_option_vars[i].name, "___", 3)) - continue; + continue; switch (var->type) { case CONFIG_TYPE_STRING: type = "String"; break; case CONFIG_TYPE_FILENAME: type = "Filename"; break;

1 0

[tor/master] rename _UsingTestNetworkDefaults to start with triple-underscore
by nickm＠torproject.org 10 Sep '12

10 Sep '12

commit 65838f48832df8c5c4333358106e86b5db38899f Author: meejah <meejah(a)meejah.ca> Date: Sun Mar 18 23:59:13 2012 -0600 rename _UsingTestNetworkDefaults to start with triple-underscore --- src/or/config.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 61fd993..6ee1ce0 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -459,7 +459,7 @@ static config_var_t _option_vars[] = { VAR("__OwningControllerProcess",STRING,OwningControllerProcess, NULL), V(MinUptimeHidServDirectoryV2, INTERVAL, "25 hours"), V(VoteOnHidServDirectoriesV2, BOOL, "1"), - V(_UsingTestNetworkDefaults, BOOL, "0"), + VAR("___UsingTestNetworkDefaults", BOOL, _UsingTestNetworkDefaults, "0"), { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL } }; @@ -487,7 +487,7 @@ static const config_var_t testing_tor_network_defaults[] = { V(TestingAuthDirTimeToLearnReachability, INTERVAL, "0 minutes"), V(TestingEstimatedDescriptorPropagationTime, INTERVAL, "0 minutes"), V(MinUptimeHidServDirectoryV2, INTERVAL, "0 minutes"), - V(_UsingTestNetworkDefaults, BOOL, "1"), + VAR("___UsingTestNetworkDefaults", BOOL, _UsingTestNetworkDefaults, "1"), { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL } };

1 0

[tor/master] Hide options beginning with "___" from GETINFO config/names
by nickm＠torproject.org 10 Sep '12

10 Sep '12

commit f43946829ce037462fd9dd852553ccfe86c88d01 Author: meejah <meejah(a)meejah.ca> Date: Mon Mar 19 00:00:10 2012 -0600 Hide options beginning with "___" from GETINFO config/names --- src/or/config.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 6ee1ce0..78f8659 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -7307,6 +7307,9 @@ getinfo_helper_config(control_connection_t *conn, for (i = 0; _option_vars[i].name; ++i) { const config_var_t *var = &_option_vars[i]; const char *type; + /* don't tell controller about triple-underscore options */ + if (!strncmp(_option_vars[i].name, "___", 3)) + continue; switch (var->type) { case CONFIG_TYPE_STRING: type = "String"; break; case CONFIG_TYPE_FILENAME: type = "Filename"; break;

1 0

[tor/master] bug3155 changes file
by nickm＠torproject.org 10 Sep '12

10 Sep '12

commit 38f3f3baf9e2e2e76b804afa635f94fb466babc8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 10 10:04:30 2012 -0400 bug3155 changes file --- changes/bug3155 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/bug3155 b/changes/bug3155 new file mode 100644 index 0000000..a0ebd53 --- /dev/null +++ b/changes/bug3155 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Rename the (internal-use-only) UsingTestingNetworkDefaults option + to start with a triple-underscore so the controller won't touch it. + Patch by Meejah. Fixes bug 3155. Bugfix on 0.2.2.23-alpha.

1 0

[tor/master] Rename _UseFilteringSSLBufferevents to lose its _. Bug 3155
by nickm＠torproject.org 10 Sep '12

10 Sep '12

commit 20e0e7d9d128af80c1af3b8b83214236387ba88f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 10 10:09:19 2012 -0400 Rename _UseFilteringSSLBufferevents to lose its _. Bug 3155 --- changes/bug3155 | 2 ++ src/or/config.c | 3 ++- src/or/connection_or.c | 2 +- src/or/or.h | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/changes/bug3155 b/changes/bug3155 index a0ebd53..d2e0918 100644 --- a/changes/bug3155 +++ b/changes/bug3155 @@ -2,3 +2,5 @@ - Rename the (internal-use-only) UsingTestingNetworkDefaults option to start with a triple-underscore so the controller won't touch it. Patch by Meejah. Fixes bug 3155. Bugfix on 0.2.2.23-alpha. + - Rename the (testing-use-only) _UseFilteringSSLBufferevents option + so it doesn't start with _. Fixes bug3155. Bugfix on 0.2.3.1-alpha. diff --git a/src/or/config.c b/src/or/config.c index 78f8659..f38e686 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -130,6 +130,7 @@ static config_abbrev_t _option_abbrevs[] = { { "HashedControlPassword", "__HashedControlSessionPassword", 1, 0}, { "StrictEntryNodes", "StrictNodes", 0, 1}, { "StrictExitNodes", "StrictNodes", 0, 1}, + { "_UseFilteringSSLBufferevents", "UseFilteringSSLBufferevents", 0, 1}, { NULL, NULL, 0, 0}, }; @@ -449,7 +450,7 @@ static config_var_t _option_vars[] = { VAR("VersioningAuthoritativeDirectory",BOOL,VersioningAuthoritativeDir, "0"), V(VirtualAddrNetwork, STRING, "127.192.0.0/10"), V(WarnPlaintextPorts, CSV, "23,109,110,143"), - V(_UseFilteringSSLBufferevents, BOOL, "0"), + V(UseFilteringSSLBufferevents, BOOL, "0"), VAR("__ReloadTorrcOnSIGHUP", BOOL, ReloadTorrcOnSIGHUP, "1"), VAR("__AllDirActionsPrivate", BOOL, AllDirActionsPrivate, "0"), VAR("__DisablePredictedCircuits",BOOL,DisablePredictedCircuits, "0"), diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 5a3b620..02345f9 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1152,7 +1152,7 @@ connection_tls_start_handshake(or_connection_t *conn, int receiving) #ifdef USE_BUFFEREVENTS if (connection_type_uses_bufferevent(TO_CONN(conn))) { - const int filtering = get_options()->_UseFilteringSSLBufferevents; + const int filtering = get_options()->UseFilteringSSLBufferevents; struct bufferevent *b = tor_tls_init_bufferevent(conn->tls, conn->_base.bufev, conn->_base.s, receiving, filtering); diff --git a/src/or/or.h b/src/or/or.h index 3609d32..ec27184 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3578,8 +3578,8 @@ typedef struct { /** If true, do not enable IOCP on windows with bufferevents, even if * we think we could. */ int DisableIOCP; - /** For testing only: will go away in 0.2.3.x. */ - int _UseFilteringSSLBufferevents; + /** For testing only: will go away eventually. */ + int UseFilteringSSLBufferevents; /** Set to true if the TestingTorNetwork configuration option is set. * This is used so that options_validate() has a chance to realize that

1 0

[tor/master] Merge branch 'bug3155'
by nickm＠torproject.org 10 Sep '12

10 Sep '12

commit 344bb1d64c539ca66cd377350065e9486397d1eb Merge: e1e34ee 20e0e7d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 10 10:09:29 2012 -0400 Merge branch 'bug3155' changes/bug3155 | 6 ++++++ src/or/config.c | 10 +++++++--- src/or/connection_or.c | 2 +- src/or/or.h | 4 ++-- 4 files changed, 16 insertions(+), 6 deletions(-)

1 0