March 2013 - tor-commits - lists.torproject.org

[tor/maint-0.2.4] Give an #error when we want threads and OpenSSL has disabled threads
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit fdafe11a25ad3e7ca8893c8630f86973431217b9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 13:23:10 2013 -0400 Give an #error when we want threads and OpenSSL has disabled threads Fixes ticket 6673. --- changes/bug6673 | 4 ++++ src/common/crypto.c | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/changes/bug6673 b/changes/bug6673 new file mode 100644 index 0000000..506b449 --- /dev/null +++ b/changes/bug6673 @@ -0,0 +1,4 @@ + o Minor features (build): + - Detect and reject attempts to build Tor with threading support + when OpenSSL have been compiled with threading support disabled. + Fixes bug 6673. diff --git a/src/common/crypto.c b/src/common/crypto.c index 22d57c7..3d8b1ba 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -3000,6 +3000,12 @@ memwipe(void *mem, uint8_t byte, size_t sz) } #ifdef TOR_IS_MULTITHREADED + +#ifndef OPENSSL_THREADS +#error OpenSSL has been built without thread support. Tor requires an \ + OpenSSL library with thread support enabled. +#endif + /** Helper: OpenSSL uses this callback to manipulate mutexes. */ static void openssl_locking_cb_(int mode, int n, const char *file, int line)

1 0

[tor/master] Fix some wide lines
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit ad8a27a3939be92e94d95fd7bb0f4e4b1e03382b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:39:11 2013 -0400 Fix some wide lines --- src/or/dnsserv.c | 3 ++- src/or/dnsserv.h | 3 ++- src/or/entrynodes.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index e877b18..a1275cf 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -170,7 +170,8 @@ evdns_server_callback(struct evdns_server_request *req, void *data_) * response; -1 if we couldn't launch the request. */ int -dnsserv_launch_request(const char *name, int reverse, control_connection_t *control_conn) +dnsserv_launch_request(const char *name, int reverse, + control_connection_t *control_conn) { entry_connection_t *entry_conn; edge_connection_t *conn; diff --git a/src/or/dnsserv.h b/src/or/dnsserv.h index 8462841..687a77e 100644 --- a/src/or/dnsserv.h +++ b/src/or/dnsserv.h @@ -20,7 +20,8 @@ void dnsserv_resolved(entry_connection_t *conn, const char *answer, int ttl); void dnsserv_reject_request(entry_connection_t *conn); -int dnsserv_launch_request(const char *name, int is_reverse, control_connection_t *control_conn); +int dnsserv_launch_request(const char *name, int is_reverse, + control_connection_t *control_conn); #endif diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index de80e88..e92c0c1 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -367,7 +367,7 @@ add_an_entry_guard(const node_t *chosen, int reset_status, int prepend, } else { const routerstatus_t *rs; rs = router_pick_directory_server(MICRODESC_DIRINFO|V3_DIRINFO, - PDS_PREFER_TUNNELED_DIR_CONNS_|PDS_FOR_GUARD); + PDS_PREFER_TUNNELED_DIR_CONNS_|PDS_FOR_GUARD); if (!rs) return NULL; node = node_get_by_id(rs->identity_digest);

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit 5124bc251a2ee7d17a52cb00865467a36f4cea9d Merge: a88f3e2 ad8a27a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:39:21 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' src/or/dnsserv.c | 3 ++- src/or/dnsserv.h | 3 ++- src/or/entrynodes.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-)

1 0

[tor/master] Fix a double-newline
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit c8c86c9b231af2eebd9ee62396228ac946fd814f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:39:47 2013 -0400 Fix a double-newline --- src/test/test_addr.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 106f921..4bc602d 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -864,7 +864,6 @@ test_addr_localname(void *arg) tt_assert(tor_addr_hostname_is_local("here.now.local")); tt_assert(tor_addr_hostname_is_local("here.now.LOCAL")); - tt_assert(!tor_addr_hostname_is_local(" localhost")); tt_assert(!tor_addr_hostname_is_local("www.torproject.org")); done:

1 0

[tor/maint-0.2.4] Fix some wide lines
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit ad8a27a3939be92e94d95fd7bb0f4e4b1e03382b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:39:11 2013 -0400 Fix some wide lines --- src/or/dnsserv.c | 3 ++- src/or/dnsserv.h | 3 ++- src/or/entrynodes.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index e877b18..a1275cf 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -170,7 +170,8 @@ evdns_server_callback(struct evdns_server_request *req, void *data_) * response; -1 if we couldn't launch the request. */ int -dnsserv_launch_request(const char *name, int reverse, control_connection_t *control_conn) +dnsserv_launch_request(const char *name, int reverse, + control_connection_t *control_conn) { entry_connection_t *entry_conn; edge_connection_t *conn; diff --git a/src/or/dnsserv.h b/src/or/dnsserv.h index 8462841..687a77e 100644 --- a/src/or/dnsserv.h +++ b/src/or/dnsserv.h @@ -20,7 +20,8 @@ void dnsserv_resolved(entry_connection_t *conn, const char *answer, int ttl); void dnsserv_reject_request(entry_connection_t *conn); -int dnsserv_launch_request(const char *name, int is_reverse, control_connection_t *control_conn); +int dnsserv_launch_request(const char *name, int is_reverse, + control_connection_t *control_conn); #endif diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index de80e88..e92c0c1 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -367,7 +367,7 @@ add_an_entry_guard(const node_t *chosen, int reset_status, int prepend, } else { const routerstatus_t *rs; rs = router_pick_directory_server(MICRODESC_DIRINFO|V3_DIRINFO, - PDS_PREFER_TUNNELED_DIR_CONNS_|PDS_FOR_GUARD); + PDS_PREFER_TUNNELED_DIR_CONNS_|PDS_FOR_GUARD); if (!rs) return NULL; node = node_get_by_id(rs->identity_digest);

1 0

[tor/master] Make sure that [::1] is recognized as a private address
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit b528aaef035213dee93663599dc46b1898ae3f8e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 1 12:22:57 2013 -0500 Make sure that [::1] is recognized as a private address Fixes bug 8377; bugfix on 0.2.1.3-alpha. --- changes/bug8377 | 3 +++ src/common/address.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/bug8377 b/changes/bug8377 new file mode 100644 index 0000000..c9ad151 --- /dev/null +++ b/changes/bug8377 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Correctly recognize that [::1] is a loopback address. Fixes bug #8377; + bugfix on 0.2.1.3-alpha. diff --git a/src/common/address.c b/src/common/address.c index e88869f..df26f61 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -779,7 +779,8 @@ tor_addr_is_loopback(const tor_addr_t *addr) case AF_INET6: { /* ::1 */ uint32_t *a32 = tor_addr_to_in6_addr32(addr); - return (a32[0] == 0) && (a32[1] == 0) && (a32[2] == 0) && (a32[3] == 1); + return (a32[0] == 0) && (a32[1] == 0) && (a32[2] == 0) && + (ntohl(a32[3]) == 1); } case AF_INET: /* 127.0.0.1 */

1 0

[tor/master] Add unit test for tor_addr_is_loopback
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit 165b2c0123f0ffb1f9507aaa31cdd536b91bccdf Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 1 12:40:41 2013 -0500 Add unit test for tor_addr_is_loopback --- src/test/test_addr.c | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 9007a23..e3f3807 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -623,12 +623,48 @@ test_addr_ip6_helpers(void) ; } +static void +test_addr_is_loopback(void *data) +{ + static const struct loopback_item { + const char *name; + int is_loopback; + } loopback_items[] = { + { "::1", 1 }, + { "127.0.0.1", 1 }, + { "127.99.100.101", 1 }, + { "128.99.100.101", 0 }, + { "8.8.8.8", 0 }, + { "0.0.0.0", 0 }, + { "::2", 0 }, + { "::", 0 }, + { "::1.0.0.0", 0 }, + { NULL, 0 } + }; + + int i; + tor_addr_t addr; + (void)data; + + for (i=0; loopback_items[i].name; ++i) { + tt_int_op(tor_addr_parse(&addr, loopback_items[i].name), >=, 0); + tt_int_op(tor_addr_is_loopback(&addr), ==, loopback_items[i].is_loopback); + } + + tor_addr_make_unspec(&addr); + tt_int_op(tor_addr_is_loopback(&addr), ==, 0); + + done: + ; +} + #define ADDR_LEGACY(name) \ { #name, legacy_test_helper, 0, &legacy_setup, test_addr_ ## name } struct testcase_t addr_tests[] = { ADDR_LEGACY(basic), ADDR_LEGACY(ip6_helpers), + { "is_loopback", test_addr_is_loopback, 0, NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit 2ac66e59f7b32bb7f975803c9d483848e755a08f Merge: 5959d1c ebb95d0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:28:39 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 Conflicts: src/test/test_addr.c changes/bug8377 | 3 +++ src/common/address.c | 3 ++- src/test/test_addr.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletions(-) diff --cc src/test/test_addr.c index 890dfe4,e3f3807..fec85a4 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@@ -723,134 -623,48 +723,170 @@@ test_addr_ip6_helpers(void ; } +/** Test tor_addr_port_parse(). */ +static void +test_addr_parse(void) +{ + int r; + tor_addr_t addr; + char buf[TOR_ADDR_BUF_LEN]; + uint16_t port = 0; + + /* Correct call. */ + r= tor_addr_port_parse(LOG_DEBUG, + "192.0.2.1:1234", + &addr, &port); + test_assert(r == 0); + tor_addr_to_str(buf, &addr, sizeof(buf), 0); + test_streq(buf, "192.0.2.1"); + test_eq(port, 1234); + + /* Domain name. */ + r= tor_addr_port_parse(LOG_DEBUG, + "torproject.org:1234", + &addr, &port); + test_assert(r == -1); + + /* Only IP. */ + r= tor_addr_port_parse(LOG_DEBUG, + "192.0.2.2", + &addr, &port); + test_assert(r == -1); + + /* Bad port. */ + r= tor_addr_port_parse(LOG_DEBUG, + "192.0.2.2:66666", + &addr, &port); + test_assert(r == -1); + + /* Only domain name */ + r= tor_addr_port_parse(LOG_DEBUG, + "torproject.org", + &addr, &port); + test_assert(r == -1); + + /* Bad IP address */ + r= tor_addr_port_parse(LOG_DEBUG, + "192.0.2:1234", + &addr, &port); + test_assert(r == -1); + + done: + ; +} + +static void +update_difference(int ipv6, uint8_t *d, + const tor_addr_t *a, const tor_addr_t *b) +{ + const int n_bytes = ipv6 ? 16 : 4; + uint8_t a_tmp[4], b_tmp[4]; + const uint8_t *ba, *bb; + int i; + + if (ipv6) { + ba = tor_addr_to_in6_addr8(a); + bb = tor_addr_to_in6_addr8(b); + } else { + set_uint32(a_tmp, tor_addr_to_ipv4n(a)); + set_uint32(b_tmp, tor_addr_to_ipv4n(b)); + ba = a_tmp; bb = b_tmp; + } + + for (i = 0; i < n_bytes; ++i) { + d[i] |= ba[i] ^ bb[i]; + } +} + +static void +test_virtaddrmap(void *data) +{ + /* Let's start with a bunch of random addresses. */ + int ipv6, bits, iter, b; + virtual_addr_conf_t cfg[2]; + uint8_t bytes[16]; + + (void)data; + + tor_addr_parse(&cfg[0].addr, "64.65.0.0"); + tor_addr_parse(&cfg[1].addr, "3491:c0c0::"); + + for (ipv6 = 0; ipv6 <= 1; ++ipv6) { + for (bits = 0; bits < 18; ++bits) { + tor_addr_t last_a; + cfg[ipv6].bits = bits; + memset(bytes, 0, sizeof(bytes)); + tor_addr_copy(&last_a, &cfg[ipv6].addr); + /* Generate 128 addresses with each addr/bits combination. */ + for (iter = 0; iter < 128; ++iter) { + tor_addr_t a; + + get_random_virtual_addr(&cfg[ipv6], &a); + //printf("%s\n", fmt_addr(&a)); + /* Make sure that the first b bits match the configured network */ + tt_int_op(0, ==, tor_addr_compare_masked(&a, &cfg[ipv6].addr, + bits, CMP_EXACT)); + + /* And track which bits have been different between pairs of + * addresses */ + update_difference(ipv6, bytes, &last_a, &a); + } + + /* Now make sure all but the first 'bits' bits of bytes are true */ + for (b = bits+1; b < (ipv6?128:32); ++b) { + tt_assert(1 & (bytes[b/8] >> (7-(b&7)))); + } + } + } + + done: + ; +} + + static void + test_addr_is_loopback(void *data) + { + static const struct loopback_item { + const char *name; + int is_loopback; + } loopback_items[] = { + { "::1", 1 }, + { "127.0.0.1", 1 }, + { "127.99.100.101", 1 }, + { "128.99.100.101", 0 }, + { "8.8.8.8", 0 }, + { "0.0.0.0", 0 }, + { "::2", 0 }, + { "::", 0 }, + { "::1.0.0.0", 0 }, + { NULL, 0 } + }; + + int i; + tor_addr_t addr; + (void)data; + + for (i=0; loopback_items[i].name; ++i) { + tt_int_op(tor_addr_parse(&addr, loopback_items[i].name), >=, 0); + tt_int_op(tor_addr_is_loopback(&addr), ==, loopback_items[i].is_loopback); + } + + tor_addr_make_unspec(&addr); + tt_int_op(tor_addr_is_loopback(&addr), ==, 0); + + done: + ; + } + #define ADDR_LEGACY(name) \ { #name, legacy_test_helper, 0, &legacy_setup, test_addr_ ## name } struct testcase_t addr_tests[] = { ADDR_LEGACY(basic), ADDR_LEGACY(ip6_helpers), + ADDR_LEGACY(parse), + { "virtaddr", test_virtaddrmap, 0, NULL, NULL }, + { "is_loopback", test_addr_is_loopback, 0, NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/master] Merge remote-tracking branch 'public/bug8377' into maint-0.2.3
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit ebb95d0f781e21a694a8de386ed0b75984b247d4 Merge: c6ca199 165b2c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:27:50 2013 -0400 Merge remote-tracking branch 'public/bug8377' into maint-0.2.3 changes/bug8377 | 3 +++ src/common/address.c | 3 ++- src/test/test_addr.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit a88f3e24eaf2180ac2f374df81b0261661774c5f Merge: 6770939 2ac66e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:29:32 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' Conflicts: src/test/test_addr.c changes/bug8377 | 3 +++ src/common/address.c | 3 ++- src/test/test_addr.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletions(-) diff --cc src/test/test_addr.c index f182bca,fec85a4..106f921 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@@ -853,90 -844,40 +853,125 @@@ test_virtaddrmap(void *data } static void +test_addr_localname(void *arg) +{ + (void)arg; + tt_assert(tor_addr_hostname_is_local("localhost")); + tt_assert(tor_addr_hostname_is_local("LOCALHOST")); + tt_assert(tor_addr_hostname_is_local("LocalHost")); + tt_assert(tor_addr_hostname_is_local("local")); + tt_assert(tor_addr_hostname_is_local("LOCAL")); + tt_assert(tor_addr_hostname_is_local("here.now.local")); + tt_assert(tor_addr_hostname_is_local("here.now.LOCAL")); + + + tt_assert(!tor_addr_hostname_is_local(" localhost")); + tt_assert(!tor_addr_hostname_is_local("www.torproject.org")); + done: + ; +} + +static void +test_addr_dup_ip(void *arg) +{ + char *v = NULL; + (void)arg; +#define CHECK(ip, s) do { \ + v = tor_dup_ip(ip); \ + tt_str_op(v,==,(s)); \ + tor_free(v); \ + } while (0) + + CHECK(0xffffffff, "255.255.255.255"); + CHECK(0x00000000, "0.0.0.0"); + CHECK(0x7f000001, "127.0.0.1"); + CHECK(0x01020304, "1.2.3.4"); + +#undef CHECK + done: + tor_free(v); +} + +static void +test_addr_sockaddr_to_str(void *arg) +{ + char *v = NULL; + struct sockaddr_in sin; + struct sockaddr_in6 sin6; + struct sockaddr_storage ss; +#ifdef HAVE_SYS_UN_H + struct sockaddr_un sun; +#endif +#define CHECK(sa, s) do { \ + v = tor_sockaddr_to_str((const struct sockaddr*) &(sa)); \ + tt_str_op(v,==,(s)); \ + tor_free(v); \ + } while (0) + (void)arg; + + memset(&ss,0,sizeof(ss)); + ss.ss_family = AF_UNSPEC; + CHECK(ss, "unspec"); + + memset(&sin,0,sizeof(sin)); + sin.sin_family = AF_INET; + sin.sin_addr.s_addr = htonl(0x7f808001); + sin.sin_port = htons(1234); + CHECK(sin, "127.128.128.1:1234"); + +#ifdef HAVE_SYS_UN_H + memset(&sun,0,sizeof(sun)); + sun.sun_family = AF_UNIX; + strlcpy(sun.sun_path, "/here/is/a/path", sizeof(sun.sun_path)); + CHECK(sun, "unix:/here/is/a/path"); +#endif + + memset(&sin6,0,sizeof(sin6)); + sin6.sin6_family = AF_INET6; + memcpy(sin6.sin6_addr.s6_addr, "\x20\x00\x00\x00\x00\x00\x00\x00" + "\x00\x1a\x2b\x3c\x4d\x5e\x00\x01", 16); + sin6.sin6_port = htons(1234); + CHECK(sin6, "[2000::1a:2b3c:4d5e:1]:1234"); + + done: + tor_free(v); +} + ++static void + test_addr_is_loopback(void *data) + { + static const struct loopback_item { + const char *name; + int is_loopback; + } loopback_items[] = { + { "::1", 1 }, + { "127.0.0.1", 1 }, + { "127.99.100.101", 1 }, + { "128.99.100.101", 0 }, + { "8.8.8.8", 0 }, + { "0.0.0.0", 0 }, + { "::2", 0 }, + { "::", 0 }, + { "::1.0.0.0", 0 }, + { NULL, 0 } + }; + + int i; + tor_addr_t addr; + (void)data; + + for (i=0; loopback_items[i].name; ++i) { + tt_int_op(tor_addr_parse(&addr, loopback_items[i].name), >=, 0); + tt_int_op(tor_addr_is_loopback(&addr), ==, loopback_items[i].is_loopback); + } + + tor_addr_make_unspec(&addr); + tt_int_op(tor_addr_is_loopback(&addr), ==, 0); + + done: + ; + } + #define ADDR_LEGACY(name) \ { #name, legacy_test_helper, 0, &legacy_setup, test_addr_ ## name } @@@ -945,9 -886,7 +980,10 @@@ struct testcase_t addr_tests[] = ADDR_LEGACY(ip6_helpers), ADDR_LEGACY(parse), { "virtaddr", test_virtaddrmap, 0, NULL, NULL }, + { "localname", test_addr_localname, 0, NULL, NULL }, + { "dup_ip", test_addr_dup_ip, 0, NULL, NULL }, + { "sockaddr_to_str", test_addr_sockaddr_to_str, 0, NULL, NULL }, + { "is_loopback", test_addr_is_loopback, 0, NULL, NULL }, END_OF_TESTCASES };

1 0