January 2015 - tor-commits - lists.torproject.org

[research-web/master] Add extrapolating-hidserv-stats report.
by karsten＠torproject.org 31 Jan '15

31 Jan '15

commit c105c99c6f2413a7e1307cac3106d933faae65ab Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Jan 31 19:39:55 2015 +0100 Add extrapolating-hidserv-stats report. --- techreports.bib | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/techreports.bib b/techreports.bib index f2a1c97..ddcd237 100644 --- a/techreports.bib +++ b/techreports.bib @@ -1,3 +1,13 @@ +@techreport{tor-2015-01-001, + author = {George Kadianakis and Karsten Loesing}, + title = {Extrapolating network totals from hidden-service statistics}, + institution = {The Tor Project}, + number = {2015-01-001}, + year = {2015}, + month = {January}, + url = {https://research.torproject.org/techreports/extrapolating-hidserv-stats-2015-01-31.pdf}, +} + @techreport{tor-2014-10-001, author = {Virgil Griffith}, title = {{Tor} growth rates and improving {Torperf} throughput},

1 0

[tor-messenger-build/master] Update the XMPP patch (add default server, remove upstream commit)
by sukhbir＠torproject.org 31 Jan '15

31 Jan '15

commit fa1416a25477352c9d1b485feeddd1fadee3298c Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Jan 31 11:52:39 2015 +0530 Update the XMPP patch (add default server, remove upstream commit) --- projects/instantbird/xmpp.patch | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/projects/instantbird/xmpp.patch b/projects/instantbird/xmpp.patch index 554f602..38cd4a3 100644 --- a/projects/instantbird/xmpp.patch +++ b/projects/instantbird/xmpp.patch @@ -1,20 +1,13 @@ -# HG changeset patch -# User Sukhbir Singh <sukhbir(a)torproject.org> -# Date 1413962112 -19800 -# Wed Oct 22 12:45:12 2014 +0530 -# Node ID 1172d3f8ed1dd3d7d6f892f4d123b109499e24d3 -# Parent bdb1f40bcd898f205de1f67b6947a9c77bbea651 -Ensure TLS/SSL is used by default for XMPP accounts - diff --git a/chat/protocols/xmpp/xmpp.js b/chat/protocols/xmpp/xmpp.js +index b05c77e..f8c829f 100644 --- a/chat/protocols/xmpp/xmpp.js +++ b/chat/protocols/xmpp/xmpp.js -@@ -39,7 +39,7 @@ - // "old_ssl" and "none" are also supported, but not exposed in the UI. - // Any unknown value will fallback to the opportunistic_tls behavior. +@@ -41,7 +41,7 @@ XMPPProtocol.prototype = { }, -- default: "opportunistic_tls" -+ default: "require_tls" + default: "require_tls" }, - server: {get label() _("options.connectServer"), default: ""}, +- server: {get label() _("options.connectServer"), default: ""}, ++ server: {get label() _("options.connectServer"), default: "jabber.ccc.de"}, port: {get label() _("options.connectPort"), default: 5222} + }, + get chatHasTopic() true,

1 0

[tor-messenger-build/master] Update TBB version to 4.0.3
by sukhbir＠torproject.org 31 Jan '15

31 Jan '15

commit 64fb1b68131fce7d0193c27045de883e23a2937d Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Jan 31 12:06:41 2015 +0530 Update TBB version to 4.0.3 --- projects/tor-browser/config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 3ee7f36..3358fb7 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -1,5 +1,5 @@ # vim: filetype=yaml -version: 4.0.2 +version: 4.0.3 filename: 'tor-browser-[% c("version") %]-[% c("var/osname") %].tar.xz' input_files: @@ -8,9 +8,9 @@ input_files: name: torbrowser targets: linux-x86_64: - sha256sum: b01e1248baba84c70cf6443c52876af5ed301bc830e9fb7a2bb93283ddbc2b0a + sha256sum: 85ac7e80d47e2996b63ef25510fc2a0e4811b215b86e666d4ce59fb211645274 linux-i686: - sha256sum: 3e4f9d08c4b194cbe9efd879e25c1581c6f58b6bd034ce037aae479edb9ab0b3 + sha256sum: 0a4291023123075459529c5013f10167d039c35341d6861779ec2590e043e71d targets: linux-x86_64:

1 0

[tor-messenger-build/master] Ensure correct formatting for makefile
by sukhbir＠torproject.org 30 Jan '15

30 Jan '15

commit f84928933c38faa995749aa986660899b7906f91 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Jan 31 02:30:13 2015 +0530 Ensure correct formatting for makefile --- projects/instantbird/installer.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/instantbird/installer.patch b/projects/instantbird/installer.patch index 24641cf..2c5697c 100644 --- a/projects/instantbird/installer.patch +++ b/projects/instantbird/installer.patch @@ -1,13 +1,13 @@ diff --git a/im/app/profile/Makefile.in b/im/app/profile/Makefile.in -index 4f48e97..bca1f17 100644 +index 4f48e97..4e02fdf 100644 --- a/im/app/profile/Makefile.in +++ b/im/app/profile/Makefile.in @@ -15,6 +15,7 @@ include $(topsrcdir)/config/rules.mk FILES := \ - mimeTypes.rdf \ - localstore.rdf \ -+ cert_override.txt - $(NULL) + mimeTypes.rdf \ + localstore.rdf \ ++ cert_override.txt \ + $(NULL) libs:: $(FILES) diff --git a/im/installer/Makefile.in b/im/installer/Makefile.in @@ -20,8 +20,8 @@ index 396d5f8..deca57e 100644 -NON_OMNIJAR_FILES = +NON_OMNIJAR_FILES = \ -+ defaults/profile/cert_override.txt \ -+ $(NULL) ++ defaults/profile/cert_override.txt \ ++ $(NULL) ifndef LIBXUL_SDK INSTALL_SDK = 1

1 0

[tor/master] Fix: check r < 0 before checking errno
by nickm＠torproject.org 30 Jan '15

30 Jan '15

commit 2c41f120481b7b14fcf0ef3aaf78d84f47178cb7 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Fri Jan 30 15:18:40 2015 -0500 Fix: check r < 0 before checking errno Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/common/compat_threads.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/compat_threads.c b/src/common/compat_threads.c index ff8dc1c..15648d2 100644 --- a/src/common/compat_threads.c +++ b/src/common/compat_threads.c @@ -174,7 +174,7 @@ pipe_drain(int fd) do { r = read_ni(fd, buf, sizeof(buf)); } while (r > 0); - if (errno != EAGAIN) + if (r < 0 && errno != EAGAIN) return -1; /* A value of r = 0 means EOF on the fd so successfully drained. */ return 0; @@ -198,7 +198,7 @@ sock_drain(tor_socket_t fd) do { r = recv_ni(fd, buf, sizeof(buf), 0); } while (r > 0); - if (!ERRNO_IS_EAGAIN(tor_socket_errno(fd))) + if (r < 0 && !ERRNO_IS_EAGAIN(tor_socket_errno(fd))) return -1; /* A value of r = 0 means EOF on the fd so successfully drained. */ return 0;

1 0

[tor/master] Fix possible infinite loop on pipe/sock_drain()
by nickm＠torproject.org 30 Jan '15

30 Jan '15

commit 51f793e37e55b29700f76ca9cdb3199e636bb51d Author: David Goulet <dgoulet(a)ev0ke.net> Date: Fri Jan 30 14:59:48 2015 -0500 Fix possible infinite loop on pipe/sock_drain() If the returned value of read/recv is 0 (meaning EOF), we'll end up in an infinite loop (active wait) until something is written on the pipe which is not really what we want here especially because those functions are called from the main thread. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- changes/bug14554 | 4 ++++ src/common/compat_threads.c | 16 ++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/changes/bug14554 b/changes/bug14554 new file mode 100644 index 0000000..ff2566f --- /dev/null +++ b/changes/bug14554 @@ -0,0 +1,4 @@ + o Major bugfix + - Possibility of an infinite loop if the returned value of the read/recv + was 0. A returned value of 0 means that we've reached the EOF thus the + pipe/sock is drained so return success not an error. diff --git a/src/common/compat_threads.c b/src/common/compat_threads.c index d2d929e..ff8dc1c 100644 --- a/src/common/compat_threads.c +++ b/src/common/compat_threads.c @@ -171,10 +171,12 @@ pipe_drain(int fd) { char buf[32]; ssize_t r; - while ((r = read_ni(fd, buf, sizeof(buf))) >= 0) - ; - if (r == 0 || errno != EAGAIN) + do { + r = read_ni(fd, buf, sizeof(buf)); + } while (r > 0); + if (errno != EAGAIN) return -1; + /* A value of r = 0 means EOF on the fd so successfully drained. */ return 0; } #endif @@ -193,10 +195,12 @@ sock_drain(tor_socket_t fd) { char buf[32]; ssize_t r; - while ((r = recv_ni(fd, buf, sizeof(buf), 0)) >= 0) - ; - if (r == 0 || !ERRNO_IS_EAGAIN(tor_socket_errno(fd))) + do { + r = recv_ni(fd, buf, sizeof(buf), 0); + } while (r > 0); + if (!ERRNO_IS_EAGAIN(tor_socket_errno(fd))) return -1; + /* A value of r = 0 means EOF on the fd so successfully drained. */ return 0; }

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug14554_026_v1'
by nickm＠torproject.org 30 Jan '15

30 Jan '15

commit aba90b2125725a2d870a847482e30d78a1a2582d Merge: 097286e 2c41f12 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 30 15:29:59 2015 -0500 Merge remote-tracking branch 'dgoulet/bug14554_026_v1' changes/bug14554 | 4 ++++ src/common/compat_threads.c | 16 ++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-)

1 0

[tor/master] Fix an uninitialized-variable warning.
by nickm＠torproject.org 30 Jan '15

30 Jan '15

commit bc9ade055e7a256e5d8a5be876806a8dd0bca7af Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 30 14:46:18 2015 -0500 Fix an uninitialized-variable warning. --- src/or/rendservice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 7028763..28d922a 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -336,7 +336,7 @@ parse_port_config(const char *string) { smartlist_t *sl; int virtport; - int realport; + int realport = 0; uint16_t p; tor_addr_t addr; const char *addrport;

1 0

[tor/master] Fix some unused-argument warnings
by nickm＠torproject.org 30 Jan '15

30 Jan '15

commit 097286e47665a32e54249f809c23e190be9d57e8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 30 14:47:56 2015 -0500 Fix some unused-argument warnings --- src/or/rendservice.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 28d922a..6ae569c 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -3503,12 +3503,16 @@ set_unix_port(edge_connection_t *conn, rend_service_port_config_t *p) static int set_unix_port(edge_connection_t *conn, rend_service_port_config_t *p) { + (void) conn; + (void) p; return -ENOSYS; } static int add_unix_port(smartlist_t *ports, rend_service_port_config_t *p) { + (void) ports; + (void) p; return -ENOSYS; }

1 0

[tor/master] Fix: test -ENOENT after config_parse_unix_port()
by nickm＠torproject.org 30 Jan '15

30 Jan '15

commit 44e9dafb67370aa6fb163cda150a80466f668111 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Fri Jan 30 14:12:30 2015 -0500 Fix: test -ENOENT after config_parse_unix_port() Check for -ENOENT instead of ENOENT after the HS port is parsed. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/or/rendservice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 69ea6a9..7028763 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -368,7 +368,7 @@ parse_port_config(const char *string) addrport = smartlist_get(sl,1); ret = config_parse_unix_port(addrport, &socket_path); - if (ret < 0 && ret != ENOENT) { + if (ret < 0 && ret != -ENOENT) { if (ret == -EINVAL) { log_warn(LD_CONFIG, "Empty socket path in hidden service port configuration.");

1 0