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

[tor/maint-0.2.5] When decoding a base-{16, 32, 64} value, clear the target buffer first
by nickm＠torproject.org 22 Dec '14

22 Dec '14

commit 47760c7ba5f1c87c945f4a018e3b3da6d127a8b9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 22 12:56:35 2014 -0500 When decoding a base-{16,32,64} value, clear the target buffer first This is a good idea in case the caller stupidly doesn't check the return value from baseX_decode(), and as a workaround for the current inconsistent API of base16_decode. Prevents any fallout from bug 14013. --- src/common/crypto.c | 6 ++++++ src/common/util.c | 3 +++ 2 files changed, 9 insertions(+) diff --git a/src/common/crypto.c b/src/common/crypto.c index 925beb3..6327614 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -2678,6 +2678,8 @@ base64_decode(char *dest, size_t destlen, const char *src, size_t srclen) if (destlen > SIZE_T_CEILING) return -1; + memset(dest, 0, destlen); + EVP_DecodeInit(&ctx); EVP_DecodeUpdate(&ctx, (unsigned char*)dest, &len, (unsigned char*)src, srclen); @@ -2699,6 +2701,8 @@ base64_decode(char *dest, size_t destlen, const char *src, size_t srclen) if (destlen > SIZE_T_CEILING) return -1; + memset(dest, 0, destlen); + /* Iterate over all the bytes in src. Each one will add 0 or 6 bits to the * value we're decoding. Accumulate bits in <b>n</b>, and whenever we have * 24 bits, batch them into 3 bytes and flush those bytes to dest. @@ -2878,6 +2882,8 @@ base32_decode(char *dest, size_t destlen, const char *src, size_t srclen) tor_assert((nbits/8) <= destlen); /* We need enough space. */ tor_assert(destlen < SIZE_T_CEILING); + memset(dest, 0, destlen); + /* Convert base32 encoded chars to the 5-bit values that they represent. */ tmp = tor_malloc_zero(srclen); for (j = 0; j < srclen; ++j) { diff --git a/src/common/util.c b/src/common/util.c index 5eb0f9a..036fd25 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1076,6 +1076,9 @@ base16_decode(char *dest, size_t destlen, const char *src, size_t srclen) return -1; if (destlen < srclen/2 || destlen > SIZE_T_CEILING) return -1; + + memset(dest, 0, destlen); + end = src+srclen; while (src<end) { v1 = hex_decode_digit_(*src);

1 0

[tor/maint-0.2.5] Merge remote-tracking branch 'public/bug14013_024' into maint-0.2.5
by nickm＠torproject.org 22 Dec '14

22 Dec '14

commit 6d728ba8801031b27937436cbcad033f4406a8b5 Merge: 5b55778 47760c7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 22 15:58:49 2014 -0500 Merge remote-tracking branch 'public/bug14013_024' into maint-0.2.5 src/common/crypto.c | 6 ++++++ src/common/util.c | 3 +++ 2 files changed, 9 insertions(+)

1 0

[tor-browser-spec/master] Documenting our key generation process.
by mikeperry＠torproject.org 22 Dec '14

22 Dec '14

commit 7eb3c0a0a5aee7d8336a5c1e36552b7c8da4fb1c Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 18 12:26:45 2014 +0000 Documenting our key generation process. --- processes/KeyGeneration | 65 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/processes/KeyGeneration b/processes/KeyGeneration new file mode 100644 index 0000000..2192f8b --- /dev/null +++ b/processes/KeyGeneration @@ -0,0 +1,65 @@ +Tor Browser Signing Key +======================= + +Preparations: +------------- + +1) Go offline (ideally use TAILS) +2) Mount your encrypted offline storage device +3) If not already done prepare the gpg.conf used for that device + (See: https://help.riseup.net/en/security/message-security/openpgp/best-practices + for help) +4) `exp rt nGNUPGHOME=/path/to/offline/storage/.gnupg` + +Key Creation Incantations and Instructions +------------------------------------------ + +1) `gpg --gen-key --expert` +2) Choose "(8) RSA (set your own capabilities)a" +3) Choose "(S) Toggle the sign capability" +4) Choose "(E) Toggle the encrypt capability" +5) Choose "(Q) Finished" +6) Choose 4096 bit +7) Choose "0 = key does not expire" +8) Choose "Tor Browser Developers" as real name +9) Choose "torbrowser(a)torproject.org" as email address +10) Choose "signing key" as comment +11) Choose a strong passphrase to protect your keys +12) `gpg --edit-key YOURMASTERKEYID` +13) At the gpg> prompt enter: addkey +14) Choose "(4) RSA (sign only)" +15) Repeat step 6, 7, 13 and 14 as often as needed +16) At the gpg> prompt enter: save +16) Check whether the keys look good, e.g. with + `hkt export-pubkeys YOURMASTERKEYID | hokey lint` +17) `gpg --export-secret-subkeys SUBKEYID_N! > subkeys_n` +18) `gpg --export YOURMASTERKEYID > pubkeys` +19) Repeat 17) as needed +20) Send subkeys_n and pubkeys to recipients +21) `gpg --output revoke.asc --gen-revoke YOURMASTERKEYID` + +MAR Signing Key +=============== + +Preparations +------------ + +1) Go offline (ideally use TAILS) +2) Mount your encrypted offline storage device +3) `cd /path/to/offline/storage` +4) make sure you have libnss3-tools installed (for certutil) + (or use the one we built ourselves which is included in mar-tools) + +Key Creation Incantations and Instructions +------------------------------------------ + +1) `mkdir nssdb` +2) `certutils -d nssdb -N` +3) Choose a strong passphrase to protect the keys +4) `certutil -d .nss -S -x -g 4096 -Z SHA512 -n marsigner -s "CN=Tor Browser MAR signing key" -t,,` +5) If there should be additional keys in the database repeat step 4. Note, you + need a different CN and ideally a different nickname ("marsigner" in the + example above). +6) `certutil -d .nss -L -r -n marsigner -o marsigner.der` +7) If you want to export more than one certificate repeat step 6 adjusting the + certificate nickname and the name of the output file

1 0

[tor/master] Fix a bunch of memory leaks in the unit tests. Found with valgrind
by nickm＠torproject.org 22 Dec '14

22 Dec '14

commit 03d2df62f614f97d2b5cf52518565ce91333ba87 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 22 12:27:26 2014 -0500 Fix a bunch of memory leaks in the unit tests. Found with valgrind --- src/or/channel.c | 3 +-- src/or/channel.h | 2 ++ src/or/transports.c | 4 +--- src/or/transports.h | 2 ++ src/test/fakechans.h | 1 + src/test/test_channel.c | 45 ++++++++++++++++++++++++++++++++------------ src/test/test_channeltls.c | 7 ++++--- src/test/test_config.c | 3 +++ src/test/test_dir.c | 13 +++++++++---- src/test/test_relay.c | 9 ++++----- 10 files changed, 60 insertions(+), 29 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index 4826bdd..cc609b5 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -147,7 +147,6 @@ HT_GENERATE2(channel_idmap, channel_idmap_entry_s, node, channel_idmap_hash, channel_idmap_eq, 0.5, tor_reallocarray_, tor_free_); static cell_queue_entry_t * cell_queue_entry_dup(cell_queue_entry_t *q); -static void cell_queue_entry_free(cell_queue_entry_t *q, int handed_off); #if 0 static int cell_queue_entry_is_padding(cell_queue_entry_t *q); #endif @@ -1569,7 +1568,7 @@ cell_queue_entry_dup(cell_queue_entry_t *q) * them) or not (we should free). */ -static void +STATIC void cell_queue_entry_free(cell_queue_entry_t *q, int handed_off) { if (!q) return; diff --git a/src/or/channel.h b/src/or/channel.h index ec7a15f..c4b909c 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -380,6 +380,8 @@ struct cell_queue_entry_s { /* Cell queue functions for benefit of test suite */ STATIC int chan_cell_queue_len(const chan_cell_queue_t *queue); + +STATIC void cell_queue_entry_free(cell_queue_entry_t *q, int handed_off); #endif /* Channel operations for subclasses and internal use only */ diff --git a/src/or/transports.c b/src/or/transports.c index 2623f80..7999be3 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -112,8 +112,6 @@ static void parse_method_error(const char *line, int is_server_method); #define parse_server_method_error(l) parse_method_error(l, 1) #define parse_client_method_error(l) parse_method_error(l, 0) -static INLINE void free_execve_args(char **arg); - /** Managed proxy protocol strings */ #define PROTO_ENV_ERROR "ENV-ERROR" #define PROTO_NEG_SUCCESS "VERSION" @@ -1502,7 +1500,7 @@ pt_kickstart_proxy, (const smartlist_t *transport_list, /** Frees the array of pointers in <b>arg</b> used as arguments to execve(2). */ -static INLINE void +STATIC void free_execve_args(char **arg) { char **tmp = arg; diff --git a/src/or/transports.h b/src/or/transports.h index 2958d5e..8f60760 100644 --- a/src/or/transports.h +++ b/src/or/transports.h @@ -131,6 +131,8 @@ STATIC int configure_proxy(managed_proxy_t *mp); STATIC char* get_pt_proxy_uri(void); +STATIC void free_execve_args(char **arg); + #endif #endif diff --git a/src/test/fakechans.h b/src/test/fakechans.h index b129ab4..230abe4 100644 --- a/src/test/fakechans.h +++ b/src/test/fakechans.h @@ -12,6 +12,7 @@ void make_fake_cell(cell_t *c); void make_fake_var_cell(var_cell_t *c); channel_t * new_fake_channel(void); +void free_fake_channel(channel_t *c); /* Also exposes some a mock used by both test_channel.c and test_relay.c */ void scheduler_channel_has_waiting_cells_mock(channel_t *ch); diff --git a/src/test/test_channel.c b/src/test/test_channel.c index b1f1bdb..0766415 100644 --- a/src/test/test_channel.c +++ b/src/test/test_channel.c @@ -430,6 +430,27 @@ new_fake_channel(void) return chan; } +void +free_fake_channel(channel_t *chan) +{ + cell_queue_entry_t *cell, *cell_tmp; + + if (! chan) + return; + + if (chan->cmux) + circuitmux_free(chan->cmux); + + TOR_SIMPLEQ_FOREACH_SAFE(cell, &chan->incoming_queue, next, cell_tmp) { + cell_queue_entry_free(cell, 0); + } + TOR_SIMPLEQ_FOREACH_SAFE(cell, &chan->outgoing_queue, next, cell_tmp) { + cell_queue_entry_free(cell, 0); + } + + tor_free(chan); +} + /** * Counter query for scheduler_channel_has_waiting_cells_mock() */ @@ -610,7 +631,7 @@ test_channel_dumpstats(void *arg) done: tor_free(cell); - tor_free(ch); + free_fake_channel(ch); UNMOCK(scheduler_channel_doesnt_want_writes); UNMOCK(scheduler_release_channel); @@ -748,6 +769,8 @@ test_channel_flushmux(void *arg) test_cmux_cells = 0; done: + if (ch) + circuitmux_free(ch->cmux); tor_free(ch); UNMOCK(channel_flush_from_first_active_circuit); @@ -831,7 +854,7 @@ test_channel_incoming(void *arg) ch = NULL; done: - tor_free(ch); + free_fake_channel(ch); tor_free(cell); tor_free(var_cell); @@ -944,8 +967,8 @@ test_channel_lifecycle(void *arg) tt_int_op(test_releases_count, ==, init_releases_count + 4); done: - tor_free(ch1); - tor_free(ch2); + free_fake_channel(ch1); + free_fake_channel(ch2); UNMOCK(scheduler_channel_doesnt_want_writes); UNMOCK(scheduler_release_channel); @@ -1214,6 +1237,7 @@ test_channel_multi(void *arg) cell = tor_malloc_zero(sizeof(cell_t)); make_fake_cell(cell); channel_write_cell(ch2, cell); + cell = NULL; /* Check the estimates */ channel_update_xmit_queue_size(ch1); @@ -1248,8 +1272,8 @@ test_channel_multi(void *arg) UNMOCK(scheduler_release_channel); done: - tor_free(ch1); - tor_free(ch2); + free_fake_channel(ch1); + free_fake_channel(ch2); return; } @@ -1279,9 +1303,6 @@ test_channel_queue_impossible(void *arg) init_cell_pool(); #endif /* ENABLE_MEMPOOLS */ - packed_cell = packed_cell_new(); - tt_assert(packed_cell); - ch = new_fake_channel(); tt_assert(ch); @@ -1403,7 +1424,7 @@ test_channel_queue_impossible(void *arg) tt_int_op(chan_cell_queue_len(&(ch->outgoing_queue)), ==, 0); done: - tor_free(ch); + free_fake_channel(ch); #ifdef ENABLE_MEMPOOLS free_cell_pool(); #endif /* ENABLE_MEMPOOLS */ @@ -1532,7 +1553,7 @@ test_channel_queue_size(void *arg) UNMOCK(scheduler_release_channel); done: - tor_free(ch); + free_fake_channel(ch); return; } @@ -1654,7 +1675,7 @@ test_channel_write(void *arg) #endif /* ENABLE_MEMPOOLS */ done: - tor_free(ch); + free_fake_channel(ch); tor_free(var_cell); tor_free(cell); packed_cell_free(packed_cell); diff --git a/src/test/test_channeltls.c b/src/test/test_channeltls.c index 45e24df..89c75d8 100644 --- a/src/test/test_channeltls.c +++ b/src/test/test_channeltls.c @@ -80,7 +80,7 @@ test_channeltls_create(void *arg) */ ch->close = tlschan_fake_close_method; channel_mark_for_close(ch); - tor_free(ch); + free_fake_channel(ch); UNMOCK(scheduler_release_channel); } @@ -167,7 +167,7 @@ test_channeltls_num_bytes_queued(void *arg) */ ch->close = tlschan_fake_close_method; channel_mark_for_close(ch); - tor_free(ch); + free_fake_channel(ch); UNMOCK(scheduler_release_channel); } @@ -241,7 +241,7 @@ test_channeltls_overhead_estimate(void *arg) */ ch->close = tlschan_fake_close_method; channel_mark_for_close(ch); - tor_free(ch); + free_fake_channel(ch); UNMOCK(scheduler_release_channel); } @@ -304,6 +304,7 @@ tlschan_fake_close_method(channel_t *chan) tt_assert(tlschan != NULL); /* Just free the fake orconn */ + tor_free(tlschan->conn->base_.address); tor_free(tlschan->conn); channel_closed(chan); diff --git a/src/test/test_config.c b/src/test/test_config.c index dcb4e92..ea0c397 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -6,6 +6,7 @@ #include "orconfig.h" #define CONFIG_PRIVATE +#define PT_PRIVATE #include "or.h" #include "addressmap.h" #include "config.h" @@ -578,6 +579,8 @@ pt_kickstart_proxy_mock(const smartlist_t *transport_list, /* XXXX check that args are as expected. */ ++pt_kickstart_proxy_mock_call_count; + + free_execve_args(proxy_argv); } static int diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 2659fbc..4cd8aa8 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -388,6 +388,12 @@ test_dir_routerparse_bad(void *arg) #include "example_extrainfo.inc" static void +routerinfo_free_wrapper_(void *arg) +{ + routerinfo_free(arg); +} + +static void test_dir_extrainfo_parsing(void *arg) { (void) arg; @@ -455,9 +461,9 @@ test_dir_extrainfo_parsing(void *arg) #undef CHECK_FAIL done: + extrainfo_free(ei); routerinfo_free(ri); - /* XXXX elements should get freed too */ - digestmap_free((digestmap_t*)map, NULL); + digestmap_free((digestmap_t*)map, routerinfo_free_wrapper_); } static void @@ -552,9 +558,8 @@ test_dir_parse_router_list(void *arg) SMARTLIST_FOREACH(chunks, char *, cp, tor_free(cp)); smartlist_free(chunks); routerinfo_free(ri); - /* XXXX this leaks: */ if (map) { - digestmap_free((digestmap_t*)map, NULL); + digestmap_free((digestmap_t*)map, routerinfo_free_wrapper_); router_get_routerlist()->identity_map = (struct digest_ri_map_t*)digestmap_new(); } diff --git a/src/test/test_relay.c b/src/test/test_relay.c index 38d1d96..fbe7faf 100644 --- a/src/test/test_relay.c +++ b/src/test/test_relay.c @@ -111,15 +111,14 @@ test_relay_append_cell_to_circuit_queue(void *arg) /* Shut down channels */ channel_free_all(); - nchan = pchan = NULL; done: tor_free(cell); + cell_queue_clear(&orcirc->base_.n_chan_cells); + cell_queue_clear(&orcirc->p_chan_cells); tor_free(orcirc); - if (nchan && nchan->cmux) circuitmux_free(nchan->cmux); - tor_free(nchan); - if (pchan && pchan->cmux) circuitmux_free(pchan->cmux); - tor_free(pchan); + free_fake_channel(nchan); + free_fake_channel(pchan); #ifdef ENABLE_MEMPOOLS free_cell_pool(); #endif /* ENABLE_MEMPOOLS */

1 0

[metrics-web/master] Support bandwidth histories using longer intervals.
by karsten＠torproject.org 22 Dec '14

22 Dec '14

commit 9af6db14c89ad37d74fb57b31c25cc2b54a00376 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Dec 22 14:13:27 2014 +0100 Support bandwidth histories using longer intervals. The bandwidth history interval may soon change from 900 seconds to something else. Make sure that this doesn't break statistics. Related to #13838 and 13988. --- .../cron/RelayDescriptorDatabaseImporter.java | 27 +++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/modules/legacy/src/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java b/modules/legacy/src/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java index b5c55c8..59e6740 100644 --- a/modules/legacy/src/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java +++ b/modules/legacy/src/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java @@ -630,10 +630,30 @@ public final class RelayDescriptorDatabaseImporter { + "Ignoring this line."); continue; } - if (intervalLength != 900L) { - this.logger.fine("Bandwidth history line does not consist of " - + "15-minute intervals. Ignoring this line."); + String[] values = parts[5].split(","); + if (intervalLength % 900L != 0L) { + this.logger.fine("Bandwidth history line does not contain " + + "multiples of 15-minute intervals. Ignoring this line."); continue; + } else if (intervalLength != 900L) { + /* This is a really dirty hack to support bandwidth history + * intervals that are longer than 15 minutes by linearly + * distributing reported bytes to 15 minute intervals. The + * alternative would have been to modify the database schema. */ + try { + long factor = intervalLength / 900L; + String[] newValues = new String[values.length * (int) factor]; + for (int i = 0; i < newValues.length; i++) { + newValues[i] = String.valueOf( + Long.parseLong(values[i / (int) factor]) / factor); + } + values = newValues; + intervalLength = 900L; + } catch (NumberFormatException e) { + this.logger.fine("Number format exception while parsing " + + "bandwidth history line. Ignoring this line."); + continue; + } } String type = parts[0]; String intervalEndTime = parts[1] + " " + parts[2]; @@ -657,7 +677,6 @@ public final class RelayDescriptorDatabaseImporter { } long currentIntervalEnd = intervalEnd; StringBuilder sb = new StringBuilder(); - String[] values = parts[5].split(","); SortedSet<String> newHistoryLines = new TreeSet<String>(); try { for (int i = values.length - 1; i >= -1; i--) {

1 0

[tor/master] Coverity complained that we were not checking this return value
by nickm＠torproject.org 22 Dec '14

22 Dec '14

commit b94cb401d2185566e7fb52b78c5a5a6747987f99 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 22 11:13:11 2014 -0500 Coverity complained that we were not checking this return value --- src/or/scheduler.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/or/scheduler.c b/src/or/scheduler.c index d1a15aa..5b4dff2 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -156,7 +156,9 @@ scheduler_free_all(void) log_debug(LD_SCHED, "Shutting down scheduler"); if (run_sched_ev) { - event_del(run_sched_ev); + if (event_del(run_sched_ev) < 0) { + log_warn(LD_BUG, "Problem deleting run_sched_ev"); + } tor_event_free(run_sched_ev); run_sched_ev = NULL; }

1 0

[tor/master] Fix some coverity issues in the unit tests
by nickm＠torproject.org 22 Dec '14

22 Dec '14

commit 13f26f41e469ae2fa5d2249c532f7f515195a2a0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 22 11:13:01 2014 -0500 Fix some coverity issues in the unit tests --- src/test/test_channel.c | 10 +++++++++- src/test/test_dir.c | 8 ++++++-- src/test/test_microdesc.c | 3 +-- src/test/test_relay.c | 1 + 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/test/test_channel.c b/src/test/test_channel.c index f882b99..b1f1bdb 100644 --- a/src/test/test_channel.c +++ b/src/test/test_channel.c @@ -1566,12 +1566,15 @@ test_channel_write(void *arg) old_count = test_cells_written; channel_write_cell(ch, cell); + cell = NULL; tt_assert(test_cells_written == old_count + 1); channel_write_var_cell(ch, var_cell); + var_cell = NULL; tt_assert(test_cells_written == old_count + 2); channel_write_packed_cell(ch, packed_cell); + packed_cell = NULL; tt_assert(test_cells_written == old_count + 3); /* Now we test queueing; tell it not to accept cells */ @@ -1632,15 +1635,18 @@ test_channel_write(void *arg) cell = tor_malloc_zero(sizeof(cell_t)); make_fake_cell(cell); channel_write_cell(ch, cell); + cell = NULL; tt_assert(test_cells_written == old_count); var_cell = tor_malloc_zero(sizeof(var_cell_t) + CELL_PAYLOAD_SIZE); make_fake_var_cell(var_cell); channel_write_var_cell(ch, var_cell); + var_cell = NULL; tt_assert(test_cells_written == old_count); packed_cell = packed_cell_new(); channel_write_packed_cell(ch, packed_cell); + packed_cell = NULL; tt_assert(test_cells_written == old_count); #ifdef ENABLE_MEMPOOLS @@ -1649,7 +1655,9 @@ test_channel_write(void *arg) done: tor_free(ch); - + tor_free(var_cell); + tor_free(cell); + packed_cell_free(packed_cell); return; } diff --git a/src/test/test_dir.c b/src/test/test_dir.c index e5328fe..2659fbc 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -605,6 +605,7 @@ test_dir_load_routers(void *arg) smartlist_t *wanted = smartlist_new(); char buf[DIGEST_LEN]; char *mem_op_hex_tmp = NULL; + char *list = NULL; #define ADD(str) \ do { \ @@ -630,7 +631,7 @@ test_dir_load_routers(void *arg) /* Not ADDing BAD_PORTS */ ADD(EX_RI_BAD_TOKENS); - char *list = smartlist_join_strings(chunks, "", 0, NULL); + list = smartlist_join_strings(chunks, "", 0, NULL); tt_int_op(1, OP_EQ, router_load_routers_from_string(list, NULL, SAVED_IN_JOURNAL, wanted, 1, NULL)); @@ -670,6 +671,7 @@ test_dir_load_routers(void *arg) smartlist_free(chunks); SMARTLIST_FOREACH(wanted, char *, cp, tor_free(cp)); smartlist_free(wanted); + tor_free(list); } static int mock_get_by_ei_dd_calls = 0; @@ -722,6 +724,7 @@ test_dir_load_extrainfo(void *arg) smartlist_t *wanted = smartlist_new(); char buf[DIGEST_LEN]; char *mem_op_hex_tmp = NULL; + char *list = NULL; #define ADD(str) \ do { \ @@ -746,7 +749,7 @@ test_dir_load_extrainfo(void *arg) ADD(EX_EI_BAD_TOKENS); ADD(EX_EI_BAD_SIG2); - char *list = smartlist_join_strings(chunks, "", 0, NULL); + list = smartlist_join_strings(chunks, "", 0, NULL); router_load_extrainfo_from_string(list, NULL, SAVED_IN_JOURNAL, wanted, 1); /* The "maximal" router was added. */ @@ -788,6 +791,7 @@ test_dir_load_extrainfo(void *arg) smartlist_free(chunks); SMARTLIST_FOREACH(wanted, char *, cp, tor_free(cp)); smartlist_free(wanted); + tor_free(list); } static void diff --git a/src/test/test_microdesc.c b/src/test/test_microdesc.c index 4a7c29b..31ed93b 100644 --- a/src/test/test_microdesc.c +++ b/src/test/test_microdesc.c @@ -703,8 +703,7 @@ test_md_reject_cache(void *arg) done: UNMOCK(networkstatus_get_latest_consensus_by_flavor); UNMOCK(router_get_mutable_consensus_status_by_descriptor_digest); - if (options) - tor_free(options->DataDirectory); + tor_free(options->DataDirectory); microdesc_free_all(); smartlist_free(added); SMARTLIST_FOREACH(wanted, char *, cp, tor_free(cp)); diff --git a/src/test/test_relay.c b/src/test/test_relay.c index 6907597..38d1d96 100644 --- a/src/test/test_relay.c +++ b/src/test/test_relay.c @@ -114,6 +114,7 @@ test_relay_append_cell_to_circuit_queue(void *arg) nchan = pchan = NULL; done: + tor_free(cell); tor_free(orcirc); if (nchan && nchan->cmux) circuitmux_free(nchan->cmux); tor_free(nchan);

1 0

[tor/master] Rewrite some changelog entries
by nickm＠torproject.org 22 Dec '14

22 Dec '14

commit fe0ecdcfed67791f248a164c9906da7b4ce45594 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 22 10:53:52 2014 -0500 Rewrite some changelog entries --- ChangeLog | 126 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/ChangeLog b/ChangeLog index 03b59a8..7b39f5b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,31 +1,39 @@ Changes in version 0.2.6.2-alpha - 2014-12-?? Tor 0.2.6.2-alpha is the second alpha release in the 0.2.6.x series. + o Major features (relay, infrastructure): + + - Completely revision of the code that relays use to decide which cell to + send next. Formerly, we selected the best circuit to write on each + channel, but we didn't select among channels in any sophisticated way. + Now, we choose the best circuits globally from among those whose + channels are ready to deliver traffic. + + This patch implements a new inter-cmux comparison API, a global high/low + watermark mechanism and a global scheduler loop for transmission + prioritization across all channels as well as among circuits on + one channel. This schedule is currently tuned to (tolerantly) + avoid making changes in the current network performance, but it + should form the basis for major circuit performance increases. + Code by Andrea; tuning by Rob Jansen; implements ticket 9262. + o Major features (hidden services): - Add a HiddenServiceStatistics option that allows Tor relays to - gather and publish statistics about hidden service usage, to - better understand the size and volume of the hidden service - network. Specifically, if a Tor relay is an HSDir it will publish - the approximate number of hidden services that have published + gather and publish statistics the overall size and volume of hidden + service usage. + Specifically, when this option is turned on, an HSDir will publish + an approximate number of hidden services that have published descriptors to it the past 24 hours. Also, if a relay has acted as a hidden service rendezvous point, it will publish the approximate amount of rendezvous cells it has relayed the past 24 hours. The statistics themselves are obfuscated so that the exact values - cannot be derived. For more details see proposal 238 "Better + cannot be derived. For more details see proposal 238, "Better hidden service stats from Tor relays". This feature is currently disabled by default. Implements feature 13192. - o Major features (relay, infrastructure): - - Implement a new inter-cmux comparison API, a global high/low - watermark mechanism and a global scheduler loop for transmission - prioritization across all channels as well as among circuits on - one channel. This schedule is currently tuned to (tolerantly) - avoid making changes in the current network performance, but it - should form the basis for major circuit performance increases. - Code by Andrea; implements ticket 9262. - o Major bugfixes (hidden services): - - When closing an introduction circuit that was opened in parallel, + - When closing an introduction circuit that was opened in parallel with + others, don't mark the introduction point as unreachable. Previously, the first successful connection to an introduction point would make the other introduction points get marked as having timed out. @@ -37,14 +45,12 @@ Changes in version 0.2.6.2-alpha - 2014-12-?? Resolves ticket 13315. o Minor features (controller): - - Add a "SIGNAL HEARTBEAT" Tor controller command that provokes - writing unscheduled heartbeat message to the log. Implements + - Add a "SIGNAL HEARTBEAT" Tor controller command that tells Tor to + write an unscheduled heartbeat message to the log. Implements feature 9503. o Minor features (geoip): - - Update geoip to the November 15 2014 Maxmind GeoLite2 - Country database. - - Update geoip6 to the November 15 2014 Maxmind GeoLite2 + - Update geoip and geoip6 to the November 15 2014 Maxmind GeoLite2 Country database. o Minor features (hidden services): @@ -52,19 +58,18 @@ Changes in version 0.2.6.2-alpha - 2014-12-?? circuits until we have successfully built a circuit. This makes hidden services come up faster when the network is re-enabled. Patch from "akwizgran". Closes ticket 13447. - - Inform Tor controller about nature of failure to retrieve hidden - service descriptor by sending reason string with HS_DESC FAILED + - Inform Tor controller about nature of a failure to retrieve hidden + service descriptor by sending reason string with "HS_DESC FAILED" controller event. Implements feature 13212. - New HiddenServiceDirGroupReadable option to cause hidden service directories and hostname files to be created group-readable. Patch from "anon", David Stainton, and "meejah". Closes ticket 11291. o Minor features (transparent firewall): - - OS X uses ipfw (FreeBSD) or pf (OpenBSD). Update the transparent - proxy option checks to allow for both ipfw and pf on OS X. Closes - ticket 14002. + - Update the transparent proxy option checks to allow for both ipfw and + pf on OS X. Closes ticket 14002. - o Minor bugfixes (client): + o Minor bugfixes (client, micordescriptors): - Use a full 256 bits of the SHA256 digest of a microdescriptor when computing which microdescriptors to download. This keeps us from erroneous download behavior if two microdescriptor digests ever @@ -76,29 +81,25 @@ Changes in version 0.2.6.2-alpha - 2014-12-?? o Minor bugfixes (compilation): - Silence clang warnings under --enable-expensive-hardening, - including: implicit truncation of 64 bit values to 32 bit; const - char assignment to self; tautological compare; and additional + including implicit truncation of 64 bit values to 32 bit, const + char assignment to self, tautological compare, and additional parentheses around equality tests. Fixes bug 13577; bugfix on 0.2.5.4-alpha. - - The address of an array in the middle of a structure will always - be non-NULL. clang recognises this and complains. Disable the - tautologous and redundant check to silence this warning. Fixes bug + - Fix a clang warning about checking whether an address in the middle of a + structure is NULL. Fixes bug 14001; bugfix on 0.2.1.2-alpha. o Minor bugfixes (hidden services): - - Use circuit_has_opened() instead of - rend_client_rendcirc_has_opened() when a rendezvous circuit is - opened because circuit_has_opened() jobs is to call a specialized - function depending on the circuit purpose. Furthermore, a - controller event will be triggered here where the former did not. + - Correctly send a controller event when we find that a rendezvous + circuit has finished. Fixes bug 13936; bugfix on 0.1.1.5-alpha. - Pre-check directory permissions for new hidden-services to avoid at least one case of "Bug: Acting on config options left us in a broken state. Dying." Fixes bug 13942; bugfix on 0.0.6pre1. - - When adding a new hidden-service (for example, via SETCONF) Tor no - longer logs a congratulations for running a relay. Fixes bug + - When adding a new hidden service (for example, via SETCONF), Tor no + longer congratulates the user for running a relay. Fixes bug 13941; bugfix on 0.2.6.1-alpha. - - When fetching hidden service descriptors, check not only for + - When fetching hidden service descriptors, we now check not only for whether we got the hidden service we had in mind, but also whether we got the particular descriptors we wanted. This prevents a class of inefficient but annoying DoS attacks by hidden service @@ -110,26 +111,19 @@ Changes in version 0.2.6.2-alpha - 2014-12-?? Emit a warning when extra info document is found incompatible with a corresponding router descriptor. Fixes bug 9812; bugfix on 0.0.6rc3. - - Log the circuit identifier correctly in + - Log the circuit ID correctly in connection_ap_handshake_attach_circuit(). Fixes bug 13701; bugfix on 0.0.6. o Minor bugfixes (misc): - - Stop allowing invalid address patterns containing both a wildcard - address and a bit prefix length. This affects all our address- - range parsing code. Fixes bug 7484; bugfix on 0.0.2pre14. + + - Stop allowing invalid address patterns like "*/24" that contain both a wildcard + address and a bit prefix length. This + affects all our address-range parsing code. Fixes bug 7484; bugfix on 0.0.2pre14. o Code simplification and refactoring: - Stop using can_complete_circuits as a global variable; access it with a function instead. - - Remove our old, non-weighted bandwidth-based node selection code. - Previously, we used it as a fallback when we couldn't perform - weighted bandwidth-based node selection. But that would only - happen in the cases where we had no consensus, or when we had a - consensus generated by buggy or ancient directory authorities. In - either case, it's better to use the more modern, better maintained - algorithm, with reasonable defaults for the weights. Closes - ticket 13126. - Avoid using operators directly as macro arguments: this lets us apply coccinelle transformations to our codebase more directly. Closes ticket 13172. @@ -163,7 +157,7 @@ Changes in version 0.2.6.2-alpha - 2014-12-?? all parts of the manual for options that take a list of nodes. Closes ticket 13381. - o Removed features: + o Major removed features: - Tor clients no longer support connecting to hidden services running on Tor 0.2.2.x and earlier; the Support022HiddenServices option has been removed. (There shouldn't be any hidden services @@ -448,7 +442,7 @@ Changes in version 0.2.6.1-alpha - 2014-10-30 ticket 12202. - Refactor and unit-test entry_is_time_to_retry() in entrynodes.c. Resolves ticket 12205. - - Use calloc and reallocarray functions in preference to multiply- + - Use calloc and reallocarray functions instead of multiply- then-malloc. This makes it less likely for us to fall victim to an integer overflow attack when allocating. Resolves ticket 12855. - Use the standard macro name SIZE_MAX, instead of our @@ -457,7 +451,7 @@ Changes in version 0.2.6.1-alpha - 2014-10-30 functions which take them as arguments. Replace 0 with NO_DIRINFO in a function call for clarity. Seeks to prevent future issues like 13163. - - Avoid 4 null pointer errors under clang shallow analysis by using + - Avoid 4 null pointer errors under clang static analysis by using tor_assert() to prove that the pointers aren't null. Fixes bug 13284. - Rework the API of policies_parse_exit_policy() to use a bitmask to @@ -473,23 +467,23 @@ Changes in version 0.2.6.1-alpha - 2014-10-30 operating system is allowing to use simultaneously. Resolves ticket 9708. - o Removed code: + o Removed features: - We no longer remind the user about configuration options that have been obsolete since 0.2.3.x or earlier. Patch by Adrien Bak. - - o Removed features: + - Remove our old, non-weighted bandwidth-based node selection code. + Previously, we used it as a fallback when we couldn't perform + weighted bandwidth-based node selection. But that would only + happen in the cases where we had no consensus, or when we had a + consensus generated by buggy or ancient directory authorities. In + either case, it's better to use the more modern, better maintained + algorithm, with reasonable defaults for the weights. Closes + ticket 13126. - Remove the --disable-curve25519 configure option. Relays and clients now are required to support curve25519 and the ntor handshake. - The old "StrictEntryNodes" and "StrictExitNodes" options, which used to be deprecated synonyms for "StrictNodes", are now marked obsolete. Resolves ticket 12226. - - The "AuthDirRejectUnlisted" option no longer has any effect, as - the fingerprints file (approved-routers) has been deprecated. - - Directory authorities do not support being Naming dirauths anymore. - The "NamingAuthoritativeDir" config option is now obsolete. - - Directory authorities do not support giving out the BadDirectory - flag anymore. - Clients don't understand the BadDirectory flag in the consensus anymore, and ignore it. @@ -526,6 +520,12 @@ Changes in version 0.2.6.1-alpha - 2014-10-30 affected by CVE-2011-2769 as guards. These relays are already rejected altogether due to the minimum version requirement of 0.2.3.16-alpha. Closes ticket 13152. + - The "AuthDirRejectUnlisted" option no longer has any effect, as + the fingerprints file (approved-routers) has been deprecated. + - Directory authorities do not support being Naming dirauths anymore. + The "NamingAuthoritativeDir" config option is now obsolete. + - Directory authorities do not support giving out the BadDirectory + flag anymore. - Directory authorities no longer advertise or support consensus methods 1 through 12 inclusive. These consensus methods were obsolete and/or insecure: maintaining the ability to support them

1 0

[tor/master] Reflow the changelog again
by nickm＠torproject.org 22 Dec '14

22 Dec '14

commit ec07c3c5c5c4afe19816b1d5363d9b9acd4c484c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 22 10:54:09 2014 -0500 Reflow the changelog again --- ChangeLog | 93 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 45 insertions(+), 48 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b39f5b..d7c9430 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,42 +2,40 @@ Changes in version 0.2.6.2-alpha - 2014-12-?? Tor 0.2.6.2-alpha is the second alpha release in the 0.2.6.x series. o Major features (relay, infrastructure): - - - Completely revision of the code that relays use to decide which cell to - send next. Formerly, we selected the best circuit to write on each - channel, but we didn't select among channels in any sophisticated way. - Now, we choose the best circuits globally from among those whose - channels are ready to deliver traffic. - - This patch implements a new inter-cmux comparison API, a global high/low - watermark mechanism and a global scheduler loop for transmission - prioritization across all channels as well as among circuits on - one channel. This schedule is currently tuned to (tolerantly) - avoid making changes in the current network performance, but it - should form the basis for major circuit performance increases. - Code by Andrea; tuning by Rob Jansen; implements ticket 9262. + - Completely revision of the code that relays use to decide which + cell to send next. Formerly, we selected the best circuit to write + on each channel, but we didn't select among channels in any + sophisticated way. Now, we choose the best circuits globally from + among those whose channels are ready to deliver traffic. + + This patch implements a new inter-cmux comparison API, a global + high/low watermark mechanism and a global scheduler loop for + transmission prioritization across all channels as well as among + circuits on one channel. This schedule is currently tuned to + (tolerantly) avoid making changes in the current network + performance, but it should form the basis for major circuit + performance increases. Code by Andrea; tuning by Rob Jansen; + implements ticket 9262. o Major features (hidden services): - Add a HiddenServiceStatistics option that allows Tor relays to - gather and publish statistics the overall size and volume of hidden - service usage. - Specifically, when this option is turned on, an HSDir will publish - an approximate number of hidden services that have published - descriptors to it the past 24 hours. Also, if a relay has acted as - a hidden service rendezvous point, it will publish the approximate - amount of rendezvous cells it has relayed the past 24 hours. The - statistics themselves are obfuscated so that the exact values - cannot be derived. For more details see proposal 238, "Better - hidden service stats from Tor relays". This feature is currently - disabled by default. Implements feature 13192. + gather and publish statistics the overall size and volume of + hidden service usage. Specifically, when this option is turned on, + an HSDir will publish an approximate number of hidden services + that have published descriptors to it the past 24 hours. Also, if + a relay has acted as a hidden service rendezvous point, it will + publish the approximate amount of rendezvous cells it has relayed + the past 24 hours. The statistics themselves are obfuscated so + that the exact values cannot be derived. For more details see + proposal 238, "Better hidden service stats from Tor relays". This + feature is currently disabled by default. Implements feature 13192. o Major bugfixes (hidden services): - - When closing an introduction circuit that was opened in parallel with - others, - don't mark the introduction point as unreachable. Previously, the - first successful connection to an introduction point would make - the other introduction points get marked as having timed out. - Fixes bug 13698; bugfix on 0.0.6rc2. + - When closing an introduction circuit that was opened in parallel + with others, don't mark the introduction point as unreachable. + Previously, the first successful connection to an introduction + point would make the other introduction points get marked as + having timed out. Fixes bug 13698; bugfix on 0.0.6rc2. o Minor features (client): - Validate hostnames in SOCKS5 requests more strictly. If SafeSocks @@ -66,8 +64,8 @@ Changes in version 0.2.6.2-alpha - 2014-12-?? from "anon", David Stainton, and "meejah". Closes ticket 11291. o Minor features (transparent firewall): - - Update the transparent proxy option checks to allow for both ipfw and - pf on OS X. Closes ticket 14002. + - Update the transparent proxy option checks to allow for both ipfw + and pf on OS X. Closes ticket 14002. o Minor bugfixes (client, micordescriptors): - Use a full 256 bits of the SHA256 digest of a microdescriptor when @@ -85,24 +83,23 @@ Changes in version 0.2.6.2-alpha - 2014-12-?? char assignment to self, tautological compare, and additional parentheses around equality tests. Fixes bug 13577; bugfix on 0.2.5.4-alpha. - - Fix a clang warning about checking whether an address in the middle of a - structure is NULL. Fixes bug - 14001; bugfix on 0.2.1.2-alpha. + - Fix a clang warning about checking whether an address in the + middle of a structure is NULL. Fixes bug 14001; bugfix + on 0.2.1.2-alpha. o Minor bugfixes (hidden services): - Correctly send a controller event when we find that a rendezvous - circuit has finished. - Fixes bug 13936; bugfix on 0.1.1.5-alpha. + circuit has finished. Fixes bug 13936; bugfix on 0.1.1.5-alpha. - Pre-check directory permissions for new hidden-services to avoid at least one case of "Bug: Acting on config options left us in a broken state. Dying." Fixes bug 13942; bugfix on 0.0.6pre1. - - When adding a new hidden service (for example, via SETCONF), Tor no - longer congratulates the user for running a relay. Fixes bug + - When adding a new hidden service (for example, via SETCONF), Tor + no longer congratulates the user for running a relay. Fixes bug 13941; bugfix on 0.2.6.1-alpha. - - When fetching hidden service descriptors, we now check not only for - whether we got the hidden service we had in mind, but also whether - we got the particular descriptors we wanted. This prevents a class - of inefficient but annoying DoS attacks by hidden service + - When fetching hidden service descriptors, we now check not only + for whether we got the hidden service we had in mind, but also + whether we got the particular descriptors we wanted. This prevents + a class of inefficient but annoying DoS attacks by hidden service directories. Fixes bug 13214; bugfix on 0.2.1.6-alpha. Reported by "special". @@ -116,10 +113,10 @@ Changes in version 0.2.6.2-alpha - 2014-12-?? on 0.0.6. o Minor bugfixes (misc): - - - Stop allowing invalid address patterns like "*/24" that contain both a wildcard - address and a bit prefix length. This - affects all our address-range parsing code. Fixes bug 7484; bugfix on 0.0.2pre14. + - Stop allowing invalid address patterns like "*/24" that contain + both a wildcard address and a bit prefix length. This affects all + our address-range parsing code. Fixes bug 7484; bugfix + on 0.0.2pre14. o Code simplification and refactoring: - Stop using can_complete_circuits as a global variable; access it

1 0

[tor/release-0.2.5] Merge remote-tracking branch 'karsten/geoip6-nov2014' into maint-0.2.4
by nickm＠torproject.org 22 Dec '14

22 Dec '14

commit 137982f955b297b41a89086d672baf761825c152 Merge: 8d5f1e6 5441c73 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 24 09:18:36 2014 -0500 Merge remote-tracking branch 'karsten/geoip6-nov2014' into maint-0.2.4 changes/geoip6-november2014 | 3 + src/config/geoip6 | 5649 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 5509 insertions(+), 143 deletions(-)

1 0