- tor-commits - lists.torproject.org

[tor/master] Free the global DH parameters in crypto_global_cleanup().
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 02708b7d8077801c44c944687d8c9f90321a4655 Author: George Kadianakis <desnacked(a)gmail.com> Date: Tue Nov 22 15:14:59 2011 +0100 Free the global DH parameters in crypto_global_cleanup(). --- src/common/crypto.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index a9d8b04..62b0bce 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -3069,6 +3069,13 @@ crypto_global_cleanup(void) ERR_remove_state(0); ERR_free_strings(); + if (dh_param_p) + BN_free(dh_param_p); + if (dh_param_p_tls) + BN_free(dh_param_p_tls); + if (dh_param_g) + BN_free(dh_param_g); + #ifndef DISABLE_ENGINES ENGINE_cleanup(); #endif

1 0

[tor/master] Merge branch 'bug4538_v2'
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 60b41cd435c0acef274209a2a9b494b5f42964f6 Merge: 29db095 02708b7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 30 13:18:56 2011 -0500 Merge branch 'bug4538_v2' src/common/crypto.c | 70 ++++++++++++++++++++++++++++---------------------- 1 files changed, 39 insertions(+), 31 deletions(-)

1 0

r25238: {website} link to the right README for TBB. fixes #4589. (website/trunk/projects/en)
by Andrew Lewman 30 Nov '11

30 Nov '11

Author: phobos Date: 2011-11-30 18:16:28 +0000 (Wed, 30 Nov 2011) New Revision: 25238 Modified: website/trunk/projects/en/torbrowser-details.wml Log: link to the right README for TBB. fixes #4589. Modified: website/trunk/projects/en/torbrowser-details.wml =================================================================== --- website/trunk/projects/en/torbrowser-details.wml 2011-11-26 08:59:52 UTC (rev 25237) +++ website/trunk/projects/en/torbrowser-details.wml 2011-11-30 18:16:28 UTC (rev 25238) @@ -32,7 +32,7 @@ href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>-src.tar.gz">source distribution</a> (<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>-src.tar.gz.asc">signature</a>). - See <a href="<tbbrepo>/README">README</a> for + See <a href="<tbbrepo>/README.dev">README</a> for the directory layout and changelog. Build instructions can be found in <a href="<tbbrepo>/build-scripts/INSTALL">build-scripts/INSTALL</a>. </div>

1 0

[tor/master] Detect tor_addr_to_str failure in tor_dup_addr.
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 3ebe960f3f734322ea3ea471ca6abceb245ca322 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 23 23:04:10 2011 -0500 Detect tor_addr_to_str failure in tor_dup_addr. This avoids a possible strdup of an uninitialized buffer. Fixes 4529; fix on 0.2.1.3-alpha; reported by troll_un. --- changes/bug4529 | 5 +++++ src/common/address.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/bug4529 b/changes/bug4529 new file mode 100644 index 0000000..89d10b2 --- /dev/null +++ b/changes/bug4529 @@ -0,0 +1,5 @@ + o Minor bufixes: + - If we had ever tried to call tor_addr_to_str on an address of + unknown type, we would have done a strdup on an uninitialized + buffer. Now we won't. Fixes bug 4529; bugfix on 0.2.1.3-alpha. + Reported by "troll_un". diff --git a/src/common/address.c b/src/common/address.c index 7fc7301..46ccb1f 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -945,8 +945,11 @@ char * tor_dup_addr(const tor_addr_t *addr) { char buf[TOR_ADDR_BUF_LEN]; - tor_addr_to_str(buf, addr, sizeof(buf), 0); - return tor_strdup(buf); + if (tor_addr_to_str(buf, addr, sizeof(buf), 0)) { + return tor_strdup(buf); + } else { + return tor_strdup("<unknown address type>"); + } } /** Return a string representing the address addr. This string is

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 29db095a35db715f1d84aacae24f00b54aad2507 Merge: 9da99b4 3ebe960 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 30 12:41:08 2011 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug4529 | 5 +++++ src/common/address.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.2] Detect tor_addr_to_str failure in tor_dup_addr.
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 3ebe960f3f734322ea3ea471ca6abceb245ca322 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 23 23:04:10 2011 -0500 Detect tor_addr_to_str failure in tor_dup_addr. This avoids a possible strdup of an uninitialized buffer. Fixes 4529; fix on 0.2.1.3-alpha; reported by troll_un. --- changes/bug4529 | 5 +++++ src/common/address.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/bug4529 b/changes/bug4529 new file mode 100644 index 0000000..89d10b2 --- /dev/null +++ b/changes/bug4529 @@ -0,0 +1,5 @@ + o Minor bufixes: + - If we had ever tried to call tor_addr_to_str on an address of + unknown type, we would have done a strdup on an uninitialized + buffer. Now we won't. Fixes bug 4529; bugfix on 0.2.1.3-alpha. + Reported by "troll_un". diff --git a/src/common/address.c b/src/common/address.c index 7fc7301..46ccb1f 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -945,8 +945,11 @@ char * tor_dup_addr(const tor_addr_t *addr) { char buf[TOR_ADDR_BUF_LEN]; - tor_addr_to_str(buf, addr, sizeof(buf), 0); - return tor_strdup(buf); + if (tor_addr_to_str(buf, addr, sizeof(buf), 0)) { + return tor_strdup(buf); + } else { + return tor_strdup("<unknown address type>"); + } } /** Return a string representing the address addr. This string is

1 0

[tor/master] Fix a memory leak in error path of my default-torrc code
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 9da99b4939b66b001cf73b1f12fb71c745461591 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 30 12:16:39 2011 -0500 Fix a memory leak in error path of my default-torrc code Fixes Coverity CID # 500 --- src/or/config.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index fb5b49a..391d290 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4399,7 +4399,8 @@ int options_init_from_torrc(int argc, char **argv) { char *cf=NULL, *cf_defaults=NULL; - int i, retval, command; + int i, command; + int retval = -1; static char **backup_argv; static int backup_argc; char *command_arg = NULL; @@ -4466,19 +4467,16 @@ options_init_from_torrc(int argc, char **argv) retval = options_init_from_string(cf_defaults, cf, command, command_arg, &errmsg); - tor_free(cf); - tor_free(cf_defaults); - if (retval < 0) - goto err; - - return 0; err: + + tor_free(cf); + tor_free(cf_defaults); if (errmsg) { log(LOG_WARN,LD_CONFIG,"%s", errmsg); tor_free(errmsg); } - return -1; + return retval < 0 ? -1 : 0; } /** Load the options from the configuration in cf, validate

1 0

[tor/master] Resolve a resource leak in test_util_split_lines
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit e83862a0ff7be42f5cbcb35c20b0405ca5bb27fd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 30 12:16:08 2011 -0500 Resolve a resource leak in test_util_split_lines Fixes coverity CID # 488 --- src/test/test_util.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 93f11cd..c762a8d 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1660,7 +1660,7 @@ test_util_split_lines(void *ptr) int i, j; char *orig_line; - smartlist_t *sl; + smartlist_t *sl=NULL; (void)ptr; @@ -1689,10 +1689,12 @@ test_util_split_lines(void *ptr) tt_assert(tests[i].split_line[j] == NULL); tor_free(orig_line); smartlist_free(sl); + sl = NULL; } done: - ; + tor_free(orig_line); + smartlist_free(sl); } static void

1 0

[tor/master] appease "make check-spaces"
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit c5e2bfa98341b6e91ee7543232ece9a86c77d2c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 30 12:09:53 2011 -0500 appease "make check-spaces" --- src/or/config.c | 3 ++- src/or/or.h | 3 ++- src/or/rendservice.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 40b6187..fb5b49a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4464,7 +4464,8 @@ options_init_from_torrc(int argc, char **argv) goto err; } - retval = options_init_from_string(cf_defaults, cf, command, command_arg, &errmsg); + retval = options_init_from_string(cf_defaults, cf, command, command_arg, + &errmsg); tor_free(cf); tor_free(cf_defaults); if (retval < 0) diff --git a/src/or/or.h b/src/or/or.h index c342880..46fead4 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2970,7 +2970,8 @@ typedef struct { config_line_t *TransPort; config_line_t *NATDPort; /**< Ports to listen on for transparent natd * connections. */ - config_line_t *ControlPort; /**< Port to listen on for control connections. */ + config_line_t *ControlPort; /**< Port to listen on for control + * connections. */ config_line_t *ControlSocket; /**< List of Unix Domain Sockets to listen on * for control connections. */ int ControlSocketsGroupWritable; /**< Boolean: Are control sockets g+rw? */ diff --git a/src/or/rendservice.c b/src/or/rendservice.c index b4ef8b4..1d0773e 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -2026,7 +2026,8 @@ rend_services_introduce(void) /* Find out which introduction points we have in progress for this service. */ - SMARTLIST_FOREACH_BEGIN(service->intro_nodes, rend_intro_point_t *, intro){ + SMARTLIST_FOREACH_BEGIN(service->intro_nodes, rend_intro_point_t *, + intro) { origin_circuit_t *intro_circ = find_intro_circuit(intro, service->pk_digest);

1 0

[tor/master] Initial support for simplest use of prop186 or-address lines
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 11d5a9f63d85adda25d1227befcebf249107a1bd Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 8 16:51:30 2011 -0500 Initial support for simplest use of prop186 or-address lines This lets a routerinfo_t have a single IPv6 or-address, and adds support for formatting and parsing those lines. --- src/or/or.h | 7 +++++++ src/or/router.c | 16 ++++++++++++++++ src/or/routerparse.c | 38 ++++++++++++++++++++++++++++++++++++++ src/test/test_dir.c | 3 +++ 4 files changed, 64 insertions(+), 0 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index c2db88a..2adaa22 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1722,6 +1722,13 @@ typedef struct { uint16_t or_port; /**< Port for TLS connections. */ uint16_t dir_port; /**< Port for HTTP directory connections. */ + /* DOCDOC */ + /* XXXXX187 Actually these should probably be part of a list of addresses, + * not just a special case. Use abstractions to access these; don't do it + * directly. */ + tor_addr_t ipv6_addr; + uint16_t ipv6_orport; + crypto_pk_env_t *onion_pkey; /**< Public RSA key for onions. */ crypto_pk_env_t *identity_pkey; /**< Public RSA key for signing. */ diff --git a/src/or/router.c b/src/or/router.c index 82e05db..2e9b256 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1903,6 +1903,7 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, int result=0; addr_policy_t *tmpe; char *family_line; + char *extra_or_address = NULL; const or_options_t *options = get_options(); /* Make sure the identity key matches the one in the routerinfo. */ @@ -1955,9 +1956,22 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, router->cache_info.extra_info_digest, DIGEST_LEN); } + if (router->ipv6_orport && + tor_addr_family(&router->ipv6_addr) == AF_INET6) { + char addr[TOR_ADDR_BUF_LEN]; + const char *a; + a = tor_addr_to_str(addr, &router->ipv6_addr, sizeof(addr), 1); + if (a) { + tor_asprintf(&extra_or_address, + "or-address %s:%d\n", a, router->ipv6_orport); + log_notice(LD_OR, "My line is <%s>", extra_or_address); + } + } + /* Generate the easy portion of the router descriptor. */ result = tor_snprintf(s, maxlen, "router %s %s %d 0 %d\n" + "%s" "platform %s\n" "opt protocols Link 1 2 Circuit 1\n" "published %s\n" @@ -1972,6 +1986,7 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, router->address, router->or_port, decide_to_advertise_dirport(options, router->dir_port), + extra_or_address ? extra_or_address : "", router->platform, published, fingerprint, @@ -1992,6 +2007,7 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, tor_free(family_line); tor_free(onion_pkey); tor_free(identity_pkey); + tor_free(extra_or_address); if (result < 0) { log_warn(LD_BUG,"descriptor snprintf #1 ran out of room!"); diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 4ea7b96..678b119 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -64,6 +64,7 @@ typedef enum { K_DIR_OPTIONS, K_CLIENT_VERSIONS, K_SERVER_VERSIONS, + K_OR_ADDRESS, K_P, K_R, K_S, @@ -286,6 +287,7 @@ static token_rule_t routerdesc_token_table[] = { T01("family", K_FAMILY, ARGS, NO_OBJ ), T01("caches-extra-info", K_CACHES_EXTRA_INFO, NO_ARGS, NO_OBJ ), + T0N("or-address", K_OR_ADDRESS, GE(1), NO_OBJ ), T0N("opt", K_OPT, CONCAT_ARGS, OBJ_OK ), T1( "bandwidth", K_BANDWIDTH, GE(3), NO_OBJ ), @@ -541,6 +543,7 @@ static int router_get_hashes_impl(const char *s, size_t s_len, const char *start_str, const char *end_str, char end_char); static void token_clear(directory_token_t *tok); +static smartlist_t *find_all_by_keyword(smartlist_t *s, directory_keyword k); static smartlist_t *find_all_exitpolicy(smartlist_t *s); static directory_token_t *_find_by_keyword(smartlist_t *s, directory_keyword keyword, @@ -1506,6 +1509,27 @@ router_parse_entry_from_string(const char *s, const char *end, "older Tors."); goto err; } + { + smartlist_t *or_addresses = find_all_by_keyword(tokens, K_OR_ADDRESS); + if (or_addresses) { + SMARTLIST_FOREACH_BEGIN(or_addresses, directory_token_t *, t) { + tor_addr_t a; + maskbits_t bits; + uint16_t port_min, port_max; + /* XXXX Prop186 the full spec allows much more than this. */ + if (tor_addr_parse_mask_ports(t->args[0], &a, &bits, &port_min, + &port_max) == AF_INET6 && + bits == 128 && + port_min == port_max) { + /* Okay, this is one we can understand. */ + tor_addr_copy(&router->ipv6_addr, &a); + router->ipv6_orport = port_min; + break; + } + } SMARTLIST_FOREACH_END(t); + smartlist_free(or_addresses); + } + } exit_policy_tokens = find_all_exitpolicy(tokens); if (!smartlist_len(exit_policy_tokens)) { log_warn(LD_DIR, "No exit policy tokens in descriptor."); @@ -4134,6 +4158,20 @@ _find_by_keyword(smartlist_t *s, directory_keyword keyword, return tok; } +/** DOCDOC */ +static smartlist_t * +find_all_by_keyword(smartlist_t *s, directory_keyword k) +{ + smartlist_t *out = NULL; + SMARTLIST_FOREACH(s, directory_token_t *, t, + if (t->tp == k) { + if (!out) + out = smartlist_create(); + smartlist_add(out, t); + }); + return out; +} + /** Return a newly allocated smartlist of all accept or reject tokens in * s. */ diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 5b7ce5c..046a1f2 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -96,6 +96,8 @@ test_dir_formats(void) r1->cache_info.published_on = 0; r1->or_port = 9000; r1->dir_port = 9003; + tor_addr_parse(&r1->ipv6_addr, "1:2:3:4::"); + r1->ipv6_orport = 9999; r1->onion_pkey = crypto_pk_dup_key(pk1); r1->identity_pkey = crypto_pk_dup_key(pk2); r1->bandwidthrate = 1000; @@ -141,6 +143,7 @@ test_dir_formats(void) test_assert(router_dump_router_to_string(buf, 2048, r1, pk2)>0); strlcpy(buf2, "router Magri 18.244.0.1 9000 0 9003\n" + "or-address [1:2:3:4::]:9999\n" "platform Tor "VERSION" on ", sizeof(buf2)); strlcat(buf2, get_uname(), sizeof(buf2)); strlcat(buf2, "\n"

1 0