tor-commits November 2013

tor-commits@lists.torproject.org

17 participants
1171 discussions

[torbirdy/master] We will release today
by sukhbir＠torproject.org 22 Nov '13

22 Nov '13

commit 506556af104350eff42020edd968af496f82e639 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Mon Nov 4 12:40:06 2013 +0100 We will release today --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 902b626..86a6437 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -0.1.2, 02 Nov 2013 +0.1.2, 04 Nov 2013 New options: restore default TorBirdy settings toggle checking of new messages automatically for all accounts

1 0

[torbirdy/master] Use SKS server Hidden Service run by Daniel Kahn Gillmor by default in TorBirdy
by sukhbir＠torproject.org 22 Nov '13

22 Nov '13

commit fd4362dc614512fccc41f03ed4807414a8d280ad Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Nov 22 00:05:25 2013 +0100 Use SKS server Hidden Service run by Daniel Kahn Gillmor by default in TorBirdy --- chrome/content/preferences.js | 2 +- components/torbirdy.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js index 80a192b..5ec06b8 100644 --- a/chrome/content/preferences.js +++ b/chrome/content/preferences.js @@ -7,7 +7,7 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() { pub.prefBranch = "extensions.torbirdy."; pub.customBranch = "extensions.torbirdy.custom."; - pub.torKeyserver = "hkp://2eghzlv2wwcq7u7y.onion"; + pub.torKeyserver = "hkp://qdigse2yzvuglcix.onion"; pub.jondoKeyserver = "hkp://pool.sks-keyservers.net"; pub.prefs = Components.classes["@mozilla.org/preferences-service;1"] diff --git a/components/torbirdy.js b/components/torbirdy.js index a88a19b..7a0acfb 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -214,7 +214,7 @@ const TorBirdyPrefs = { "--keyserver-options http-proxy=http://127.0.0.1:8118 ", // The default key server should be a hidden service and this is the only known one (it's part of the normal SKS network) - "extensions.enigmail.keyserver": "hkp://2eghzlv2wwcq7u7y.onion", + "extensions.enigmail.keyserver": "hkp://qdigse2yzvuglcix.onion", // Force GnuPG to use SHA512. "extensions.enigmail.mimeHashAlgorithm": 5,

1 0

[tor/master] Fix another unit test memory leak. CID1087949, CID1087950.
by nickm＠torproject.org 22 Nov '13

22 Nov '13

commit 569dbcc615959fc48aae5736f5ec89a2bd336488 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 22 12:27:41 2013 -0500 Fix another unit test memory leak. CID1087949,CID1087950. --- src/test/test.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/test/test.c b/src/test/test.c index 752f8d7..6ea41b1 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -31,6 +31,7 @@ const char tor_git_revision[] = ""; #define GEOIP_PRIVATE #define ROUTER_PRIVATE #define CIRCUITSTATS_PRIVATE +#define CIRCUITLIST_PRIVATE /* * Linux doesn't provide lround in math.h by default, but mac os does... @@ -426,10 +427,12 @@ test_onion_queues(void) test_eq(0, onion_num_pending(ONION_HANDSHAKE_TYPE_TAP)); test_eq(0, onion_pending_add(circ1, create1)); + create1 = NULL; test_eq(1, onion_num_pending(ONION_HANDSHAKE_TYPE_TAP)); test_eq(0, onion_num_pending(ONION_HANDSHAKE_TYPE_NTOR)); test_eq(0, onion_pending_add(circ2, create2)); + create2 = NULL; test_eq(1, onion_num_pending(ONION_HANDSHAKE_TYPE_NTOR)); test_eq_ptr(circ2, onion_next_task(&onionskin)); @@ -441,11 +444,10 @@ test_onion_queues(void) test_eq(0, onion_num_pending(ONION_HANDSHAKE_TYPE_NTOR)); done: - ; -// circuit_free(circ1); -// circuit_free(circ2); - /* and free create1 and create2 */ - /* XXX leaks everything here */ + circuit_free(TO_CIRCUIT(circ1)); + circuit_free(TO_CIRCUIT(circ2)); + tor_free(create1); + tor_free(create2); } static void

1 0

[tor/master] Remove needless fd var from test. CID 1130989.
by nickm＠torproject.org 22 Nov '13

22 Nov '13

commit 6f7eb7a0a535a287fdb838d83e7ff9c7aac6fd6c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 22 12:16:17 2013 -0500 Remove needless fd var from test. CID 1130989. --- src/test/test_util.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index ab5928f..376e3aa 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -112,7 +112,6 @@ test_util_write_chunks_to_file(void *arg) char *tempname = NULL; char *str = NULL; int r; - int fd = -1; struct stat st; /* These should be two different sizes to ensure the data is different @@ -155,7 +154,6 @@ test_util_write_chunks_to_file(void *arg) tt_int_op(st.st_size, ==, data_str_len); test_mem_op(data_str, ==, str, data_str_len); tor_free(str); - close(fd); // assert that the tempfile is removed (should not leave artifacts) str = read_file_to_str(tempname, RFTS_BIN|RFTS_IGNORE_MISSING, &st); @@ -187,7 +185,6 @@ test_util_write_chunks_to_file(void *arg) tt_int_op(st.st_size, ==, data_str_len); test_mem_op(data_str, ==, str, data_str_len); tor_free(str); - close(fd); // assert the tempfile still contains the known string str = read_file_to_str(tempname, RFTS_BIN, &st); @@ -204,8 +201,6 @@ test_util_write_chunks_to_file(void *arg) tor_free(str); tor_free(data_str); tor_free(temp_str); - if (fd >= 0) - close(fd); } static void

1 0

[tor/master] Handle unlikely negative time in tor_log_err_sigsafe
by nickm＠torproject.org 22 Nov '13

22 Nov '13

commit 6cbd17470d383616c3b34310ad5716a7c8c8990a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 22 12:14:11 2013 -0500 Handle unlikely negative time in tor_log_err_sigsafe Coverity wants this; CID 1130990. --- src/common/log.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/common/log.c b/src/common/log.c index dffda45..9c67de3 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -474,7 +474,7 @@ tor_log_err_sigsafe(const char *m, ...) { va_list ap; const char *x; - char timebuf[32]; + char timebuf[33]; time_t now = time(NULL); if (!m) @@ -483,8 +483,10 @@ tor_log_err_sigsafe(const char *m, ...) int g = log_time_granularity / 1000; now -= now % g; } - timebuf[0] = '\0'; - format_dec_number_sigsafe(now, timebuf, sizeof(timebuf)); + timebuf[0] = now < 0 ? '-' : ' '; + if (now < 0) now = -now; + timebuf[1] = '\0'; + format_dec_number_sigsafe(now, timebuf+1, sizeof(timebuf)-1); tor_log_err_sigsafe_write("\n==========================================" "================== T="); tor_log_err_sigsafe_write(timebuf);

1 0

[tor/master] Fix a bunch of coverity-spotted unit test resource leaks
by nickm＠torproject.org 22 Nov '13

22 Nov '13

commit 7c76fd5a8289ffa38507a67c6323f6e7d9ef732b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 22 12:21:14 2013 -0500 Fix a bunch of coverity-spotted unit test resource leaks CIDs: 1130994, 1130993, 1130992, 1130991 --- src/test/test_controller_events.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/test/test_controller_events.c b/src/test/test_controller_events.c index 04a04de..3a9aeca 100644 --- a/src/test/test_controller_events.c +++ b/src/test/test_controller_events.c @@ -105,9 +105,10 @@ test_cntev_sum_up_cell_stats(void *arg) { or_circuit_t *or_circ; circuit_t *circ; - cell_stats_t *cell_stats; + cell_stats_t *cell_stats = NULL; (void)arg; + /* This circuit is fake. */ or_circ = tor_malloc_zero(sizeof(or_circuit_t)); or_circ->base_.magic = OR_CIRCUIT_MAGIC; or_circ->base_.purpose = CIRCUIT_PURPOSE_OR; @@ -139,7 +140,8 @@ test_cntev_sum_up_cell_stats(void *arg) tt_int_op(1, ==, cell_stats->removed_cells_exitward[CELL_RELAY]); done: - ; + tor_free(cell_stats); + tor_free(or_circ); } static void @@ -193,10 +195,10 @@ test_cntev_append_cell_stats(void *arg) static void test_cntev_format_cell_stats(void *arg) { - char *event_string; + char *event_string = NULL; origin_circuit_t *ocirc; or_circuit_t *or_circ; - cell_stats_t *cell_stats; + cell_stats_t *cell_stats = NULL; channel_tls_t *n_chan, *p_chan; (void)arg; @@ -214,12 +216,14 @@ test_cntev_format_cell_stats(void *arg) cell_stats = tor_malloc_zero(sizeof(cell_stats_t)); format_cell_stats(&event_string, TO_CIRCUIT(ocirc), cell_stats); tt_str_op("ID=2 OutboundQueue=3 OutboundConn=1", ==, event_string); + tor_free(event_string); /* Origin circuit had 4 RELAY cells added to its exitward queue. */ cell_stats->added_cells_exitward[CELL_RELAY] = 4; format_cell_stats(&event_string, TO_CIRCUIT(ocirc), cell_stats); tt_str_op("ID=2 OutboundQueue=3 OutboundConn=1 OutboundAdded=relay:4", ==, event_string); + tor_free(event_string); /* Origin circuit also had 5 CREATE2 cells added to its exitward * queue. */ @@ -227,6 +231,7 @@ test_cntev_format_cell_stats(void *arg) format_cell_stats(&event_string, TO_CIRCUIT(ocirc), cell_stats); tt_str_op("ID=2 OutboundQueue=3 OutboundConn=1 OutboundAdded=relay:4," "create2:5", ==, event_string); + tor_free(event_string); /* Origin circuit also had 7 RELAY cells removed from its exitward queue * which together spent 6 msec in the queue. */ @@ -236,6 +241,7 @@ test_cntev_format_cell_stats(void *arg) tt_str_op("ID=2 OutboundQueue=3 OutboundConn=1 OutboundAdded=relay:4," "create2:5 OutboundRemoved=relay:7 OutboundTime=relay:6", ==, event_string); + tor_free(event_string); p_chan = tor_malloc_zero(sizeof(channel_tls_t)); p_chan->base_.global_identifier = 2; @@ -248,17 +254,21 @@ test_cntev_format_cell_stats(void *arg) or_circ->base_.n_circ_id = 9; or_circ->base_.n_chan = &(n_chan->base_); + tor_free(cell_stats); + /* OR circuit was idle. */ cell_stats = tor_malloc_zero(sizeof(cell_stats_t)); format_cell_stats(&event_string, TO_CIRCUIT(or_circ), cell_stats); tt_str_op("InboundQueue=8 InboundConn=2 OutboundQueue=9 OutboundConn=1", ==, event_string); + tor_free(event_string); /* OR circuit had 3 RELAY cells added to its appward queue. */ cell_stats->added_cells_appward[CELL_RELAY] = 3; format_cell_stats(&event_string, TO_CIRCUIT(or_circ), cell_stats); tt_str_op("InboundQueue=8 InboundConn=2 InboundAdded=relay:3 " "OutboundQueue=9 OutboundConn=1", ==, event_string); + tor_free(event_string); /* OR circuit had 7 RELAY cells removed from its appward queue which * together spent 6 msec in the queue. */ @@ -270,7 +280,8 @@ test_cntev_format_cell_stats(void *arg) "OutboundQueue=9 OutboundConn=1", ==, event_string); done: - ; + tor_free(cell_stats); + tor_free(event_string); } #define TEST(name, flags) \

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 22 Nov '13

22 Nov '13

commit 0a39cf8dfbf0fd90ff1d7da1be6c1ee32d8d8e61 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 22 13:45:55 2013 +0000 Update translations for liveusb-creator --- gl/gl.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gl/gl.po b/gl/gl.po index 4dfe77d..feeffa5 100644 --- a/gl/gl.po +++ b/gl/gl.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-11-12 13:29+0100\n" -"PO-Revision-Date: 2013-11-22 13:10+0000\n" +"PO-Revision-Date: 2013-11-22 13:40+0000\n" "Last-Translator: manuel meixide <m.meixide(a)gmail.com>\n" "Language-Team: Galician (http://www.transifex.com/projects/p/torproject/language/gl/)\n" "MIME-Version: 1.0\n" @@ -419,7 +419,7 @@ msgstr "" #: ../liveusb/gui.py:693 msgid "Unable to mount device" -msgstr "" +msgstr "Non foi posíbel montar o dispositivo" #: ../liveusb/creator.py:793 #, python-format @@ -538,7 +538,7 @@ msgid "" "Warning: The Master Boot Record on your device does not match your system's " "syslinux MBR. If you have trouble booting this stick, try running the " "liveusb-creator with the --reset-mbr option." -msgstr "" +msgstr "Atención: O Registro Maestro de Arranque, MRB ou Master Boot Record do seu dispositivo non se corresponde co MBR do seu sistema syslinux. Se ten problemas ao iniciar este dispositivo, probe executar o liveusb-creator coa opción --reset-mbr." #: ../liveusb/gui.py:392 msgid ""

1 0

[flashproxy/master] node-flashproxy: read unix-style command line options using optimist
by infinity0＠torproject.org 22 Nov '13

22 Nov '13

commit 293987a90a7bd2aaa19aeac90ad076788b6e73c4 Author: Ximin Luo <infinity0(a)gmx.com> Date: Thu Nov 21 23:19:59 2013 +0000 node-flashproxy: read unix-style command line options using optimist - this is backwards-compatible; non-hyphenated args are concatenated to the querystring --- proxy/modules/nodejs/INSTALL | 2 +- proxy/modules/nodejs/main.js | 41 +++++++++++++++++++++++++++++++------ proxy/modules/nodejs/package.json | 1 + 3 files changed, 37 insertions(+), 7 deletions(-) diff --git a/proxy/modules/nodejs/INSTALL b/proxy/modules/nodejs/INSTALL index 9f6f677..adef21a 100644 --- a/proxy/modules/nodejs/INSTALL +++ b/proxy/modules/nodejs/INSTALL @@ -10,7 +10,7 @@ a plain copy. If your distribution contains both the following packages (newer suites of Debian and Ubuntu), you can run main.js directly: - # apt-get install node-xmlhttprequest node-ws + # apt-get install node-optimist node-xmlhttprequest node-ws $ nodejs main.js Otherwise, you can use npm to install it as a package, along with all its diff --git a/proxy/modules/nodejs/main.js b/proxy/modules/nodejs/main.js index 64e50b9..cfadff5 100755 --- a/proxy/modules/nodejs/main.js +++ b/proxy/modules/nodejs/main.js @@ -1,14 +1,42 @@ #!/usr/bin/env node -var path = require("path"); var fs = require("fs"); +var path = require("path"); +var querystring = require("querystring") + +var meta = require("./package.json") // Get a querystring from the command line -var location_search = "debug=1&initial_facilitator_poll_interval=10"; -if (process.argv[2] != null) - location_search = process.argv[2]; +var argv = require("optimist") + .default("debug", 1) + .default("initial_facilitator_poll_interval", 10) + .argv + +if ("v" in argv || "version" in argv) { + console.log(meta.version) + process.exit() +} +if ("h" in argv || "help" in argv) { + console.log("Usage: %s [-h|-v] [--param[=val]] ... [extra querystring]\n\ +\n\ +Run flashproxy on the node.js server. You can give querystring parameters as \n\ +command line options; see the main flashproxy.js program for documentation on \n\ +which parameters are accepted. For example: \n\ +\n\ +%s --debug --initial_facilitator_poll_interval=10\n\ +", argv.$0, argv.$0) + process.exit() +} + +var extra = argv._.join("&") +delete argv._ +delete argv.$0 +var location_search = querystring.stringify(argv) +if (extra) { + location_search += "&" + extra +} -// Setup environment variables for node.js +// Setup global variables that flashproxy.js expects var XMLHttpRequest = require("xmlhttprequest").XMLHttpRequest; var window = { location: { search: "?" + location_search }, @@ -16,7 +44,8 @@ var window = { WebSocket: require("ws") }; -// Include flashproxy.js using eval to avoid modifying it. +// Include flashproxy.js using eval to run it in the scope of this script +// so we don't need to make non-browser adjustments to flashproxy.js var file = path.join(__dirname, "flashproxy.js"); try { var data = fs.readFileSync(file, "utf8"); diff --git a/proxy/modules/nodejs/package.json b/proxy/modules/nodejs/package.json index 1de1157..079865c 100644 --- a/proxy/modules/nodejs/package.json +++ b/proxy/modules/nodejs/package.json @@ -11,6 +11,7 @@ "flashproxy": "main.js" }, "dependencies": { + "optimist": "0.3.5", "xmlhttprequest": "1.5.0", "ws": "0.4.27" },

1 0

[flashproxy/master] node-flashproxy: be looser in the version requirements
by infinity0＠torproject.org 22 Nov '13

22 Nov '13

commit 5cdc3a59a7133fa7c4ac398b12225712ae30a851 Author: Ximin Luo <infinity0(a)gmx.com> Date: Thu Nov 21 23:20:30 2013 +0000 node-flashproxy: be looser in the version requirements --- proxy/modules/nodejs/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/proxy/modules/nodejs/package.json b/proxy/modules/nodejs/package.json index 079865c..a63a689 100644 --- a/proxy/modules/nodejs/package.json +++ b/proxy/modules/nodejs/package.json @@ -11,9 +11,9 @@ "flashproxy": "main.js" }, "dependencies": { - "optimist": "0.3.5", - "xmlhttprequest": "1.5.0", - "ws": "0.4.27" + "optimist": ">= 0.3.5", + "xmlhttprequest": ">= 1.5.0", + "ws": ">= 0.4.27" }, "repository": { "type": "git",

1 0

[flashproxy/master] Use tilde version range for dependencies.
by infinity0＠torproject.org 22 Nov '13

22 Nov '13

commit b36824550642af90386eb214952fc8365f0ced3a Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Nov 21 16:19:37 2013 -0800 Use tilde version range for dependencies. Keeps them reasonably close with less chance for breaking changes. --- proxy/modules/nodejs/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/proxy/modules/nodejs/package.json b/proxy/modules/nodejs/package.json index a63a689..39b9710 100644 --- a/proxy/modules/nodejs/package.json +++ b/proxy/modules/nodejs/package.json @@ -11,9 +11,9 @@ "flashproxy": "main.js" }, "dependencies": { - "optimist": ">= 0.3.5", - "xmlhttprequest": ">= 1.5.0", - "ws": ">= 0.4.27" + "optimist": "~0.3.5", + "xmlhttprequest": "~1.5.0", + "ws": "~0.4.27" }, "repository": { "type": "git",

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2013