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

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 30 May '15

30 May '15

commit 92cfd871a0dcdd9c610c87f63d8c79f10095c900 Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 30 15:45:37 2015 +0000 Update translations for tor-launcher-properties --- be/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/be/torlauncher.properties b/be/torlauncher.properties index 02be756..68ed6bf 100644 --- a/be/torlauncher.properties +++ b/be/torlauncher.properties @@ -29,7 +29,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) -torlauncher.connect=Connect +torlauncher.connect=Злучэнне torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit torlauncher.quit_win=Exit

1 0

[tor/master] Fix return-type gcc warning
by nickm＠torproject.org 30 May '15

30 May '15

commit 90e07ab338cd59caeaeb31a3d207bb34d433b8ab Author: Sharif Olorin <sio(a)tesser.org> Date: Sat May 30 06:03:50 2015 +0000 Fix return-type gcc warning find_dl_schedule_and_len caused gcc to spit up with -Werror. Signed-off-by: Sharif Olorin <sio(a)tesser.org> --- src/or/directory.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/or/directory.c b/src/or/directory.c index 9fe3052..549d95a 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3479,6 +3479,9 @@ find_dl_schedule_and_len(download_status_t *dls, int server) default: tor_assert(0); } + + /* Impossible, but gcc will fail with -Werror without a `return`. */ + return NULL; } /** Called when an attempt to download <b>dls</b> has failed with HTTP status

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 30 May '15

30 May '15

commit 6b8578d22dd0522b91437b7762327305ccdac461 Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 30 14:15:28 2015 +0000 Update translations for liveusb-creator_completed --- ja/ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ja/ja.po b/ja/ja.po index 61df9e3..9d616c2 100644 --- a/ja/ja.po +++ b/ja/ja.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-05-02 21:10+0200\n" -"PO-Revision-Date: 2015-05-22 16:11+0000\n" +"PO-Revision-Date: 2015-05-30 13:53+0000\n" "Last-Translator: ABE Tsunehiko\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/torproject/language/ja/)\n" "MIME-Version: 1.0\n" @@ -83,7 +83,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Upgrade an already installed Tails device from a new ISO image.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Talis をインストール済みのデバイスを新しい ISO いめーじからアップグレードします。</span></p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Talis をインストール済みのデバイスを新しい ISO イメージからアップグレードします。</span></p></body></html>" #: ../liveusb/dialog.py:154 msgid "Alt+B"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 30 May '15

30 May '15

commit 530f68ae5be45577584c0527dda23e7c8f5acdea Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 30 14:15:22 2015 +0000 Update translations for liveusb-creator --- ja/ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ja/ja.po b/ja/ja.po index 61df9e3..9d616c2 100644 --- a/ja/ja.po +++ b/ja/ja.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-05-02 21:10+0200\n" -"PO-Revision-Date: 2015-05-22 16:11+0000\n" +"PO-Revision-Date: 2015-05-30 13:53+0000\n" "Last-Translator: ABE Tsunehiko\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/torproject/language/ja/)\n" "MIME-Version: 1.0\n" @@ -83,7 +83,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Upgrade an already installed Tails device from a new ISO image.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Talis をインストール済みのデバイスを新しい ISO いめーじからアップグレードします。</span></p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Talis をインストール済みのデバイスを新しい ISO イメージからアップグレードします。</span></p></body></html>" #: ../liveusb/dialog.py:154 msgid "Alt+B"

1 0

[metrics-web/master] Update to latest metrics-lib.
by karsten＠torproject.org 30 May '15

30 May '15

commit 70c7d3ff83ddbe3ed8352391de2869fd9df62fdc Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat May 30 12:06:06 2015 +0200 Update to latest metrics-lib. --- deps/metrics-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/metrics-lib b/deps/metrics-lib index 73e5a69..bd18dd0 160000 --- a/deps/metrics-lib +++ b/deps/metrics-lib @@ -1 +1 @@ -Subproject commit 73e5a6989df19923775978428cd9bb21e0a96dc4 +Subproject commit bd18dd0d2f788d1d4ee7acbac5032e97264bb855

1 0

[onionoo/master] Avoid name clash with metrics-lib.
by karsten＠torproject.org 30 May '15

30 May '15

commit 15de42a51c5c7966bf86175e2538464e5be8f3d1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat May 30 11:53:53 2015 +0200 Avoid name clash with metrics-lib. --- build.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index 5986416..b10987b 100644 --- a/build.xml +++ b/build.xml @@ -17,7 +17,7 @@ <property name="webxml" value="${config}/web.xml"/> <property name="warfile" value="${dist}/onionoo-${release.version}.war"/> - <property name="jarfile" + <property name="onionoo.jarfile" value="${dist}/onionoo-${release.version}.jar"/> <property name="source-and-target-java-version" value="1.7" /> @@ -161,7 +161,7 @@ </target> <target name="jar" depends="compile"> - <jar destfile="${jarfile}" + <jar destfile="${onionoo.jarfile}" basedir="${classes}"> <zipgroupfileset dir="/usr/share/java"> <include name="commons-codec-1.6.jar"/>

1 0

[tor/master] Another memory leak bytes the dust.
by nickm＠torproject.org 29 May '15

29 May '15

commit 12a2321501753d1872daed2e036db05845ecc416 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 29 16:17:54 2015 -0400 Another memory leak bytes the dust. --- src/or/routerkeys.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c index 91de4db..a76bf99 100644 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@ -312,12 +312,14 @@ load_ed_keys(const or_options_t *options, time_t now) check_signing_cert = signing_key_cert; use_signing = master_signing_key; } else { + char *fname = options_get_datadir_fname2(options, "keys", "ed25519_signing"); sign = ed_key_init_from_file( - options_get_datadir_fname2(options, "keys", "ed25519_signing"), + fname, INIT_ED_KEY_NEEDCERT| INIT_ED_KEY_INCLUDE_SIGNING_KEY_IN_CERT, LOG_INFO, NULL, 0, 0, CERT_TYPE_ID_SIGNING, &sign_cert); + tor_free(fname); check_signing_cert = sign_cert; use_signing = sign; } @@ -338,10 +340,12 @@ load_ed_keys(const or_options_t *options, time_t now) if (! want_new_signing_key) flags |= INIT_ED_KEY_OMIT_SECRET; + char *fname = options_get_datadir_fname2(options, "keys", "ed25519_master_id"); id = ed_key_init_from_file( - options_get_datadir_fname2(options, "keys", "ed25519_master_id"), + fname, flags, LOG_WARN, NULL, 0, 0, 0, NULL); + tor_free(fname); if (!id) FAIL("Missing identity key"); if (tor_mem_is_zero((char*)id->seckey.seckey, sizeof(id->seckey))) @@ -359,12 +363,13 @@ load_ed_keys(const or_options_t *options, time_t now) INIT_ED_KEY_EXTRA_STRONG| INIT_ED_KEY_NEEDCERT| INIT_ED_KEY_INCLUDE_SIGNING_KEY_IN_CERT); - sign = ed_key_init_from_file( - options_get_datadir_fname2(options, "keys", "ed25519_signing"), + char *fname = options_get_datadir_fname2(options, "keys", "ed25519_signing"); + sign = ed_key_init_from_file(fname, flags, LOG_WARN, sign_signing_key_with_id, now, options->SigningKeyLifetime, CERT_TYPE_ID_SIGNING, &sign_cert); + tor_free(fname); if (!sign) FAIL("Missing signing key"); use_signing = sign;

1 0

[tor/master] Attempt to fix keypinning on Windows
by nickm＠torproject.org 29 May '15

29 May '15

commit a6e3db5f7241e28641feffadccbfb9e60e936208 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 29 14:38:59 2015 -0400 Attempt to fix keypinning on Windows Not that I would countenance a directory authority on Windows, but it would be nice if the unit tests passed. --- src/or/keypin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/keypin.c b/src/or/keypin.c index 7b0c0c7..a5b4cf7 100644 --- a/src/or/keypin.c +++ b/src/or/keypin.c @@ -202,7 +202,7 @@ int keypin_open_journal(const char *fname) { /* O_SYNC ??*/ - int fd = tor_open_cloexec(fname, O_WRONLY|O_CREAT, 0600); + int fd = tor_open_cloexec(fname, O_WRONLY|O_CREAT|O_BINARY, 0600); if (fd < 0) goto err;

1 0

[tor/master] Fix another int-to-ptr cast.
by nickm＠torproject.org 29 May '15

29 May '15

commit ba17968534ea51bbf5e3a0ab0cf4da97ef895252 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 29 14:09:11 2015 -0400 Fix another int-to-ptr cast. --- src/test/test_scheduler.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/src/test/test_scheduler.c b/src/test/test_scheduler.c index 73a4220..79a5534 100644 --- a/src/test/test_scheduler.c +++ b/src/test/test_scheduler.c @@ -38,9 +38,9 @@ static circuitmux_t *mock_ccm_tgt_1 = NULL; static circuitmux_t *mock_ccm_tgt_2 = NULL; static circuitmux_t *mock_cgp_tgt_1 = NULL; -static const circuitmux_policy_t *mock_cgp_val_1 = NULL; +static circuitmux_policy_t *mock_cgp_val_1 = NULL; static circuitmux_t *mock_cgp_tgt_2 = NULL; -static const circuitmux_policy_t *mock_cgp_val_2 = NULL; +static circuitmux_policy_t *mock_cgp_val_2 = NULL; static int scheduler_compare_channels_mock_ctr = 0; static int scheduler_run_mock_ctr = 0; @@ -457,13 +457,19 @@ test_scheduler_compare_channels(void *arg) /* Configure circuitmux_get_policy() mock */ mock_cgp_tgt_1 = cm1; + mock_cgp_tgt_2 = cm2; + /* * This is to test the different-policies case, which uses the policy * cast to an intptr_t as an arbitrary but definite thing to compare. */ - mock_cgp_val_1 = (const circuitmux_policy_t *)(1); - mock_cgp_tgt_2 = cm2; - mock_cgp_val_2 = (const circuitmux_policy_t *)(2); + mock_cgp_val_1 = tor_malloc_zero(16); + mock_cgp_val_2 = tor_malloc_zero(16); + if ( ((intptr_t) mock_cgp_val_1) > ((intptr_t) mock_cgp_val_2) ) { + void *tmp = mock_cgp_val_1; + mock_cgp_val_1 = mock_cgp_val_2; + mock_cgp_val_2 = tmp; + } MOCK(circuitmux_get_policy, circuitmux_get_policy_mock); @@ -483,6 +489,7 @@ test_scheduler_compare_channels(void *arg) tt_int_op(result, ==, 1); /* Distinct channels, same policy */ + tor_free(mock_cgp_val_2); mock_cgp_val_2 = mock_cgp_val_1; result = scheduler_compare_channels(&c1, &c2); tt_int_op(result, ==, -1); @@ -497,13 +504,17 @@ test_scheduler_compare_channels(void *arg) UNMOCK(circuitmux_get_policy); mock_cgp_tgt_1 = NULL; - mock_cgp_val_1 = NULL; mock_cgp_tgt_2 = NULL; - mock_cgp_val_2 = NULL; tor_free(cm1); tor_free(cm2); + if (mock_cgp_val_1 != mock_cgp_val_2) + tor_free(mock_cgp_val_1); + tor_free(mock_cgp_val_2); + mock_cgp_val_1 = NULL; + mock_cgp_val_2 = NULL; + return; }

1 0

[tor/master] Fix a warning from the clangalyzer.
by nickm＠torproject.org 29 May '15

29 May '15

commit 10dd50dfcb19069465480c9cfdf57372123a0b3b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 29 14:08:51 2015 -0400 Fix a warning from the clangalyzer. --- src/or/dirvote.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index e037794..0f3b77f 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -1143,6 +1143,7 @@ networkstatus_compute_consensus(smartlist_t *votes, dircollator_t *collator = NULL; tor_assert(flavor == FLAV_NS || flavor == FLAV_MICRODESC); tor_assert(total_authorities >= smartlist_len(votes)); + tor_assert(total_authorities > 0); flavor_name = networkstatus_get_flavor_name(flavor); @@ -1535,7 +1536,7 @@ networkstatus_compute_consensus(smartlist_t *votes, /* Okay, go through all the entries for this digest. */ for (int voter_idx = 0; voter_idx < smartlist_len(votes); ++voter_idx) { if (vrs_lst[voter_idx] == NULL) - continue; /* This voter had nothig to say about this entry. */ + continue; /* This voter had nothing to say about this entry. */ rs = vrs_lst[voter_idx]; ++n_listing; @@ -1579,6 +1580,10 @@ networkstatus_compute_consensus(smartlist_t *votes, if (n_listing <= total_authorities/2) continue; + /* The clangalyzer can't figure out that this will never be NULL + * if n_listing is at least 1 */ + tor_assert(current_rsa_id); + /* Figure out the most popular opinion of what the most recent * routerinfo and its contents are. */ memset(microdesc_digest, 0, sizeof(microdesc_digest));

1 0