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

[tor/master] Merge branch '13642_offline_master_v2_squashed'
by nickm＠torproject.org 17 Jun '15

17 Jun '15

commit d68133c745ccecf2baf86fad08bfd40070c7368c Merge: a5b5d4b b6eee53 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 17 10:12:37 2015 -0400 Merge branch '13642_offline_master_v2_squashed' configure.ac | 3 ++ src/common/compat.c | 33 ++++++++++++ src/common/compat.h | 2 + src/or/config.c | 5 +- src/or/main.c | 3 ++ src/or/or.h | 3 +- src/or/routerkeys.c | 149 +++++++++++++++++++++++++++++++++++++++++++++++++-- src/or/routerkeys.h | 6 +++ 8 files changed, 199 insertions(+), 5 deletions(-) diff --cc src/or/routerkeys.c index e79204c,63d61c3..277dc6e --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@@ -342,14 -478,13 +483,16 @@@ load_ed_keys(const or_options_t *option flags |= INIT_ED_KEY_MISSING_SECRET_OK; if (! want_new_signing_key) flags |= INIT_ED_KEY_OMIT_SECRET; + if (options->command == CMD_KEYGEN) + flags |= INIT_ED_KEY_TRY_ENCRYPTED; + 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)))

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 17 Jun '15

17 Jun '15

commit f8ed71642ac76df3cd8354c51f1419e5095e2239 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 17 13:45:45 2015 +0000 Update translations for tails-misc_completed --- es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es.po b/es.po index 4fbfa5b..0bc0a78 100644 --- a/es.po +++ b/es.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-05-02 23:47+0200\n" -"PO-Revision-Date: 2015-06-16 13:07+0000\n" +"PO-Revision-Date: 2015-06-17 13:32+0000\n" "Last-Translator: el buve\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 17 Jun '15

17 Jun '15

commit 0aef9b0814f9efdc8dc7cf889000e45f0d4b1fee Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 17 13:45:41 2015 +0000 Update translations for tails-misc --- es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es.po b/es.po index 4fbfa5b..0bc0a78 100644 --- a/es.po +++ b/es.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-05-02 23:47+0200\n" -"PO-Revision-Date: 2015-06-16 13:07+0000\n" +"PO-Revision-Date: 2015-06-17 13:32+0000\n" "Last-Translator: el buve\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n"

1 0

[tor-browser-bundle/master] Bug 16283: Bump VM_MEMORY to 4000 by default
by gk＠torproject.org 17 Jun '15

17 Jun '15

commit 8b3ad7a6dd53a263a1bee8c9ddf0d304e59d856f Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 3 13:50:07 2015 +0000 Bug 16283: Bump VM_MEMORY to 4000 by default Firefox is not happy with 2000 MiB RAM which is the current default. The build crashes randomly in this case. --- gitian/README.build | 6 +++--- gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gitian/README.build b/gitian/README.build index 8d8f008..4b211a0 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -35,10 +35,10 @@ QuickStart: $ export NUM_PROCS=4 - To set the amount of RAM to use inside the VMs to 4000 MiB (the default is - 2000 MiB), use: + To set the amount of RAM to use inside the VMs to 8000 MiB (the default is + 4000 MiB), use: - $ export VM_MEMORY=4000 + $ export VM_MEMORY=8000 Detailed Explanation of Scripts: diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 15e1384..cb80214 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -35,7 +35,7 @@ fi if [ -z "$VM_MEMORY" ]; then - export VM_MEMORY=2000 + export VM_MEMORY=4000 fi ./make-vms.sh diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 01a9d1b..ea547e9 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -35,7 +35,7 @@ fi if [ -z "$VM_MEMORY" ]; then - export VM_MEMORY=2000 + export VM_MEMORY=4000 fi ./make-vms.sh diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index e7bdc87..4de847b 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -35,7 +35,7 @@ fi if [ -z "$VM_MEMORY" ]; then - export VM_MEMORY=2000 + export VM_MEMORY=4000 fi ./make-vms.sh

1 0

[tor-browser-bundle/master] Merge branch 'bug_16283'
by gk＠torproject.org 17 Jun '15

17 Jun '15

commit f35744d076aa2aeceeb5fd64faf1945b58ba435e Merge: f0f7fdb 8b3ad7a Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 17 13:43:47 2015 +0000 Merge branch 'bug_16283' gitian/README.build | 6 +++--- gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)

1 0

[tor/master] Extend intro point to a 4th hop on cannibalization
by nickm＠torproject.org 17 Jun '15

17 Jun '15

commit a5b5d4bd2ea08c2db84aa53f44111f8492af1f62 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Tue Jun 16 10:29:29 2015 -0400 Extend intro point to a 4th hop on cannibalization Fixes #16260 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- changes/bug16260 | 11 +++++++++++ src/or/circuituse.c | 2 +- src/or/rendservice.c | 19 ++++--------------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/changes/bug16260 b/changes/bug16260 new file mode 100644 index 0000000..a75cb1d --- /dev/null +++ b/changes/bug16260 @@ -0,0 +1,11 @@ + o Minor bugfix (Hidden service) + - When cannibalizing a circuit for an introduction point, always extend + to the chosen exit node creating a 4 hop circuit instead of using the + current circuit exit node which resulted in changing the original + intro point choice. This resulted in the hidden service skipping + excluded nodes like for instance reconnecting to an expired intro + point.; Fixes #16260; bugfixes on tor-0.1.0.1-rc~460. + + This is particularly important for the introduction point retry + behavior (#8239) since cannibalization is allowed, which is desired, + so it's important to pin the chosen exit point. diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 28c70ad..69d0f76 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1766,12 +1766,12 @@ circuit_launch_by_extend_info(uint8_t purpose, switch (purpose) { case CIRCUIT_PURPOSE_C_ESTABLISH_REND: - case CIRCUIT_PURPOSE_S_ESTABLISH_INTRO: /* it's ready right now */ break; case CIRCUIT_PURPOSE_C_INTRODUCING: case CIRCUIT_PURPOSE_S_CONNECT_REND: case CIRCUIT_PURPOSE_C_GENERAL: + case CIRCUIT_PURPOSE_S_ESTABLISH_INTRO: /* need to add a new hop */ tor_assert(extend_info); if (circuit_extend_to_new_exit(circ, extend_info) < 0) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index c857d4c..89f95d7 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -2765,21 +2765,10 @@ rend_service_launch_establish_intro(rend_service_t *service, safe_str_client(extend_info_describe(intro->extend_info))); return -1; } - - if (tor_memneq(intro->extend_info->identity_digest, - launched->build_state->chosen_exit->identity_digest, DIGEST_LEN)) { - char cann[HEX_DIGEST_LEN+1], orig[HEX_DIGEST_LEN+1]; - base16_encode(cann, sizeof(cann), - launched->build_state->chosen_exit->identity_digest, - DIGEST_LEN); - base16_encode(orig, sizeof(orig), - intro->extend_info->identity_digest, DIGEST_LEN); - log_info(LD_REND, "The intro circuit we just cannibalized ends at $%s, " - "but we requested an intro circuit to $%s. Updating " - "our service.", cann, orig); - extend_info_free(intro->extend_info); - intro->extend_info = extend_info_dup(launched->build_state->chosen_exit); - } + /* We must have the same exit node even if cannibalized. */ + tor_assert(tor_memeq(intro->extend_info->identity_digest, + launched->build_state->chosen_exit->identity_digest, + DIGEST_LEN)); launched->rend_data = rend_data_service_create(service->service_id, service->pk_digest, NULL,

1 0

[tor/master] Correctly handle failed crypto_early_init
by nickm＠torproject.org 17 Jun '15

17 Jun '15

commit 75388f67c07d1a48c6fb9c5d1c4441ab66b644c0 Author: teor <teor2345(a)gmail.com> Date: Sat Jun 13 21:28:02 2015 +1000 Correctly handle failed crypto_early_init If crypto_early_init fails, a typo in a return value from tor_init means that tor_main continues running, rather than returning an error value. Fixes bug 16360; bugfix on d3fb846d8c98 in 0.2.5.2-alpha, introduced when implementing #4900. Patch by "teor". --- changes/bug16360-failed-crypto-early-init | 7 +++++++ src/or/main.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug16360-failed-crypto-early-init b/changes/bug16360-failed-crypto-early-init new file mode 100644 index 0000000..21972bc --- /dev/null +++ b/changes/bug16360-failed-crypto-early-init @@ -0,0 +1,7 @@ + o Minor bugfixes (crypto error-handling): + - If crypto_early_init fails, a typo in a return value from tor_init + means that tor_main continues running, rather than returning + an error value. + Fixes bug 16360; bugfix on d3fb846d8c98 in 0.2.5.2-alpha, + introduced when implementing #4900. + Patch by "teor". diff --git a/src/or/main.c b/src/or/main.c index 9c1cabf..031f758 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2346,7 +2346,7 @@ tor_init(int argc, char *argv[]) /* Set up the crypto nice and early */ if (crypto_early_init() < 0) { log_err(LD_GENERAL, "Unable to initialize the crypto subsystem!"); - return 1; + return -1; } /* Initialize the history structures. */

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 17 Jun '15

17 Jun '15

commit c8cb55659acca96530a1d7f54bb96cac84626e17 Merge: 59fa0c2 75388f6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 17 09:18:45 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 changes/bug16360-failed-crypto-early-init | 7 +++++++ src/or/main.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'
by nickm＠torproject.org 17 Jun '15

17 Jun '15

commit 43a98c7da6183e6e2e20784faed9f1c8aea5086e Merge: 8092ae0 c8cb556 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 17 09:19:11 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' changes/bug16360-failed-crypto-early-init | 7 +++++++ src/or/main.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.6] Correctly handle failed crypto_early_init
by nickm＠torproject.org 17 Jun '15

17 Jun '15

commit 75388f67c07d1a48c6fb9c5d1c4441ab66b644c0 Author: teor <teor2345(a)gmail.com> Date: Sat Jun 13 21:28:02 2015 +1000 Correctly handle failed crypto_early_init If crypto_early_init fails, a typo in a return value from tor_init means that tor_main continues running, rather than returning an error value. Fixes bug 16360; bugfix on d3fb846d8c98 in 0.2.5.2-alpha, introduced when implementing #4900. Patch by "teor". --- changes/bug16360-failed-crypto-early-init | 7 +++++++ src/or/main.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug16360-failed-crypto-early-init b/changes/bug16360-failed-crypto-early-init new file mode 100644 index 0000000..21972bc --- /dev/null +++ b/changes/bug16360-failed-crypto-early-init @@ -0,0 +1,7 @@ + o Minor bugfixes (crypto error-handling): + - If crypto_early_init fails, a typo in a return value from tor_init + means that tor_main continues running, rather than returning + an error value. + Fixes bug 16360; bugfix on d3fb846d8c98 in 0.2.5.2-alpha, + introduced when implementing #4900. + Patch by "teor". diff --git a/src/or/main.c b/src/or/main.c index 9c1cabf..031f758 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2346,7 +2346,7 @@ tor_init(int argc, char *argv[]) /* Set up the crypto nice and early */ if (crypto_early_init() < 0) { log_err(LD_GENERAL, "Unable to initialize the crypto subsystem!"); - return 1; + return -1; } /* Initialize the history structures. */

1 0