November 2016 - tor-commits - lists.torproject.org

[tor/master] bump version to 0.2.9.5-alpha
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 3dfecffa7d6a3ab268983b9477cf36a01e7353f6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 16:38:53 2016 -0500 bump version to 0.2.9.5-alpha --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index d35f83c..58eab73 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.9.4-alpha-dev]) +AC_INIT([tor],[0.2.9.5-alpha]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 94bbfe2..05d5a6c 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.9.4-alpha-dev" +!define VERSION "0.2.9.5-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index d902423..db6c07b 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.9.4-alpha-dev" +#define VERSION "0.2.9.5-alpha"

1 0

[tor/maint-0.2.9] bump version to 0.2.9.5-alpha
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 3dfecffa7d6a3ab268983b9477cf36a01e7353f6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 16:38:53 2016 -0500 bump version to 0.2.9.5-alpha --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index d35f83c..58eab73 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.9.4-alpha-dev]) +AC_INIT([tor],[0.2.9.5-alpha]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 94bbfe2..05d5a6c 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.9.4-alpha-dev" +!define VERSION "0.2.9.5-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index d902423..db6c07b 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.9.4-alpha-dev" +#define VERSION "0.2.9.5-alpha"

1 0

[tor/release-0.2.9] bump version to 0.2.9.5-alpha
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 3dfecffa7d6a3ab268983b9477cf36a01e7353f6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 16:38:53 2016 -0500 bump version to 0.2.9.5-alpha --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index d35f83c..58eab73 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.9.4-alpha-dev]) +AC_INIT([tor],[0.2.9.5-alpha]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 94bbfe2..05d5a6c 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.9.4-alpha-dev" +!define VERSION "0.2.9.5-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index d902423..db6c07b 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.9.4-alpha-dev" +#define VERSION "0.2.9.5-alpha"

1 0

[tor/master] Merge branch 'maint-0.2.9'
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 0d6ee26af9aa75777fccd81b00a853bc72f8bf76 Merge: e0311f6 3dfecff Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 16:39:15 2016 -0500 Merge branch 'maint-0.2.9' This is an "ours" merge to avoid taking the version bump.

1 0

[tor/release-0.2.9] Small changelog tweaks
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 528d3e12ff853f69fe0e76156448519d4839a4b9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 16:36:06 2016 -0500 Small changelog tweaks --- ChangeLog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 83cc6ba..d041841 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ Changes in version 0.2.9.5-alpha - 2016-11-07 - Tor 0.2.9.5alpha fixes numerous bugs discovered in the previous alpha + Tor 0.2.9.5-alpha fixes numerous bugs discovered in the previous alpha version. We believe one or two probably remain, and we encourage everyone to test this release. @@ -43,7 +43,7 @@ Changes in version 0.2.9.5-alpha - 2016-11-07 o Minor bugfixes (client directory scheduling): - Treat "relay too busy to answer request" as a failed request and a reason to back off on our retry frequency. This is safe now that - exponential backups retry indefinitely, and avoids a bug where we + exponential backoffs retry indefinitely, and avoids a bug where we would reset our download schedule erroneously. Fixes bug 20593; bugfix on 0.2.9.1-alpha. @@ -57,7 +57,7 @@ Changes in version 0.2.9.5-alpha - 2016-11-07 o Minor bugfixes (hidden services): - When configuring hidden services, check every hidden service directory's permissions. Previously, we only checked the last - hidden service. Fixes bug 20529; bugfix on 13942 commit 85bfad1 + hidden service. Fixes bug 20529; bugfix the work to fix 13942 in 0.2.6.2-alpha. o Minor bugfixes (portability):

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 50db1e825d0508e983961f6783e7e2db831d085a Merge: 528d3e1 3dfecff Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 16:38:58 2016 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/master] Remove from master more changes files already merged in release-0.2.9
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit e0311f6a36f12c1883bf17c6f891e275598258bc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 16:32:30 2016 -0500 Remove from master more changes files already merged in release-0.2.9 --- changes/20460 | 4 ---- changes/bug20484 | 5 ----- changes/bug20529 | 4 ---- changes/bug20533 | 7 ------- changes/bug20534 | 8 -------- changes/bug20536 | 6 ------ changes/bug20587 | 5 ----- changes/bug20588 | 3 --- changes/bug20591 | 3 --- changes/bug20593 | 6 ------ changes/geoip-november2016 | 4 ---- 11 files changed, 55 deletions(-) diff --git a/changes/20460 b/changes/20460 deleted file mode 100644 index 9fbb4a7..0000000 --- a/changes/20460 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (testing): - - Use ECDHE ciphers instead of ECDH in tortls tests. LibreSSL has - removed the ECDH ciphers which caused the tests to fail on - platforms which use it. Fixes bug 20460; bugfix on 0.2.8.1-alpha. diff --git a/changes/bug20484 b/changes/bug20484 deleted file mode 100644 index 9a0b95c..0000000 --- a/changes/bug20484 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (single onion services): - - Start correctly when creating a single onion service in a - directory that did not previously exist. Fixes bug 20484; bugfix on - 0.2.9.3-alpha. - diff --git a/changes/bug20529 b/changes/bug20529 deleted file mode 100644 index 276be5b..0000000 --- a/changes/bug20529 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (hidden services): - - When configuring hidden services, check every hidden service directory's - permissions. Previously, we only checked the last hidden service. - Fixes bug 20529; bugfix on 13942 commit 85bfad1 in 0.2.6.2-alpha. diff --git a/changes/bug20533 b/changes/bug20533 deleted file mode 100644 index 7d1a456..0000000 --- a/changes/bug20533 +++ /dev/null @@ -1,7 +0,0 @@ - o Minor bugfixes (consensus downloads): - - If a consensus expires while we are waiting for certificates to download, - stop waiting for certificates. - - If we stop waiting for certificates less than a minute after we started - downloading them, do not consider the certificate download failure a - separate failure. - Fixes bug 20533; bugfix on commit e0204f21 in 0.2.0.9-alpha. diff --git a/changes/bug20534 b/changes/bug20534 deleted file mode 100644 index 49db433..0000000 --- a/changes/bug20534 +++ /dev/null @@ -1,8 +0,0 @@ - o Minor bugfixes (directory download scheduling): - - Remove the maximum delay on exponential-backoff scheduling. - Since we now allow an infinite number of failures (see ticket - 20536), we must now allow the time to grow longer on each failure. - Fixes part of bug 20534; bugfix on 0.2.9.1-alpha. - - Use initial delays and decrements in download scheduling closer to - those from 0.2.8. Fixes another part of bug 20534; bugfix on - 0.2.9.1-alpha. diff --git a/changes/bug20536 b/changes/bug20536 deleted file mode 100644 index 9e0dd16..0000000 --- a/changes/bug20536 +++ /dev/null @@ -1,6 +0,0 @@ - o Major bugfixes (download scheduling): - - When using an exponential backoff schedule, do not give up on - dowloading just because we have failed a bunch of times. Since - each delay is longer than the last, retrying indefinitely won't - hurt. Fixes bug 20536; bugfix on 0.2.9.1-alpha. - diff --git a/changes/bug20587 b/changes/bug20587 deleted file mode 100644 index 341b001..0000000 --- a/changes/bug20587 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (download timing): - - When determining when to download a directory object, handle times - after 2038 if the operating system supports that. (Someday this will be - important!) Fixes bug 20587; bugfix on 0.2.8.1-alpha. - diff --git a/changes/bug20588 b/changes/bug20588 deleted file mode 100644 index 832ef81..0000000 --- a/changes/bug20588 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features (portability): - - Fix compilation with OpenSSL 1.1 and less commonly-used - CPU architectures. Closes ticket 20588. diff --git a/changes/bug20591 b/changes/bug20591 deleted file mode 100644 index deaa738..0000000 --- a/changes/bug20591 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (relay bootstrap): - - Ensure relays don't make multiple connections during bootstrap. - Fixes bug 20591; bugfix on 0.2.8.1-alpha. diff --git a/changes/bug20593 b/changes/bug20593 deleted file mode 100644 index e9f54d3..0000000 --- a/changes/bug20593 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes (client directory scheduling): - - Treat "relay too busy to answer request" as a failed request and a - reason to back off on our retry frequency. This is safe now that - exponential backups retry indefinitely, and avoids a bug where we would - reset our download schedule erroneously. - Fixes bug 20593; bugfix on 0.2.9.1-alpha. diff --git a/changes/geoip-november2016 b/changes/geoip-november2016 deleted file mode 100644 index b3f9913..0000000 --- a/changes/geoip-november2016 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (ge0oip): - - Update geoip and geoip6 to the November 3 2016 Maxmind GeoLite2 - Country database. -

1 0

[tor/master] Create single-onion-service directory before poisoning it, if needed
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 8841a9e396372771a170656ebfab4b4bf6b0c593 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 31 14:53:30 2016 -0400 Create single-onion-service directory before poisoning it, if needed (Also, refactor the code to create a hidden service directory into a separate funcion, so we don't have to duplicate it.) Fixes bug 20484; bugfix on 0.2.9.3-alpha. --- changes/bug20484 | 5 +++++ src/or/rendservice.c | 33 +++++++++++++++++++++++++-------- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/changes/bug20484 b/changes/bug20484 new file mode 100644 index 0000000..9a0b95c --- /dev/null +++ b/changes/bug20484 @@ -0,0 +1,5 @@ + o Minor bugfixes (single onion services): + - Start correctly when creating a single onion service in a + directory that did not previously exist. Fixes bug 20484; bugfix on + 0.2.9.3-alpha. + diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 3afe880..1bf6ae9 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -72,6 +72,8 @@ static ssize_t rend_service_parse_intro_for_v3( size_t plaintext_len, char **err_msg_out); +static int rend_service_check_and_create_private_dir(const rend_service_t *s); + /** Represents the mapping from a virtual port of a rendezvous service to * a real port on some IP. */ @@ -1090,6 +1092,10 @@ poison_new_single_onion_hidden_service_dir(const rend_service_t *service) return -1; } + /* Make sure the directory exists */ + if (rend_service_check_and_create_private_dir(service) < 0) + return -1; + poison_fname = rend_service_sos_poison_path(service); switch (file_status(poison_fname)) { @@ -1245,22 +1251,18 @@ rend_service_derive_key_digests(struct rend_service_t *s) return 0; } -/** Load and/or generate private keys for the hidden service s, - * possibly including keys for client authorization. Return 0 on success, -1 - * on failure. */ +/** Make sure that the directory for s is private, creating it + * if needed. Return 0 on success, -1 on failure. */ static int -rend_service_load_keys(rend_service_t *s) +rend_service_check_and_create_private_dir(const rend_service_t *s) { - char *fname = NULL; - char buf[128]; cpd_check_t check_opts = CPD_CREATE; - if (s->dir_group_readable) { check_opts |= CPD_GROUP_READ; } /* Check/create directory */ if (check_private_dir(s->directory, check_opts, get_options()->User) < 0) { - goto err; + return -1; } #ifndef _WIN32 if (s->dir_group_readable) { @@ -1271,6 +1273,21 @@ rend_service_load_keys(rend_service_t *s) } #endif + return 0; +} + +/** Load and/or generate private keys for the hidden service s, + * possibly including keys for client authorization. Return 0 on success, -1 + * on failure. */ +static int +rend_service_load_keys(rend_service_t *s) +{ + char *fname = NULL; + char buf[128]; + + if (rend_service_check_and_create_private_dir(s) < 0) + goto err; + /* Load key */ fname = rend_service_path(s, private_key_fname); s->private_key = init_key_from_file(fname, 1, LOG_ERR, 0);

1 0

[tor/master] Add get_fname_rnd for unit tests that want a unique path every time
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 77e1d660ee5b8e2beae12f3de543d19009aaa8ac Author: teor <teor2345(a)gmail.com> Date: Wed Nov 2 14:14:19 2016 +1100 Add get_fname_rnd for unit tests that want a unique path every time --- src/test/test.h | 1 + src/test/testing_common.c | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/src/test/test.h b/src/test/test.h index 770f403..25336ac 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -73,6 +73,7 @@ {print_ = (I64_PRINTF_TYPE) value_;}, {}, TT_EXIT_TEST_FUNCTION) const char *get_fname(const char *name); +const char *get_fname_rnd(const char *name); struct crypto_pk_t *pk_generate(int idx); #define US2_CONCAT_2__(a, b) a ## __ ## b diff --git a/src/test/testing_common.c b/src/test/testing_common.c index e28e3dd..1eae07e 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -125,6 +125,18 @@ get_fname(const char *name) return get_fname_suffix(name, NULL); } +/** Return a filename with a random suffix, relative to our testing temporary + * directory. If name is NULL, return the name of the testing temporary + * directory, without any suffix. */ +const char * +get_fname_rnd(const char *name) +{ + char rnd[256], rnd32[256]; + crypto_rand(rnd, RAND_PATH_BYTES); + base32_encode(rnd32, sizeof(rnd32), rnd, RAND_PATH_BYTES); + return get_fname_suffix(name, rnd32); +} + /* Remove a directory and all of its subdirectories */ static void rm_rf(const char *dir)

1 0

[tor/master] fixup! Refactor, adding a create argument to rend_service_check_private_dir
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit a906ff88a3660ff689a2bd630836b74d70a1ce6c Author: teor <teor2345(a)gmail.com> Date: Wed Nov 2 14:10:52 2016 +1100 fixup! Refactor, adding a create argument to rend_service_check_private_dir --- src/or/rendservice.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index dca775e..6743d82 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1246,17 +1246,23 @@ rend_service_derive_key_digests(struct rend_service_t *s) return 0; } -/** Make sure that the directory for s is private. If create is - * true, if it exists, change permissions if needed, otherwise, create it with - * the correct permissions. Otherwise, if create is false and the - * directory does not exist, check if we think we can create it. +/** Make sure that the directory for s is private. + * If create is true: + * - if the directory exists, change permissions if needed, + * - if the directory does not exist, create it with the correct permissions. + * If create is false: + * - if the directory exists, check permissions, + * - if the directory does not exist, check if we think we can create it. * Return 0 on success, -1 on failure. */ static int rend_service_check_private_dir(const rend_service_t *s, int create) { - cpd_check_t check_opts = CPD_CREATE; - if (!create) { + cpd_check_t check_opts = CPD_NONE; + if (create) { + check_opts |= CPD_CREATE; + } else { check_opts |= CPD_CHECK_MODE_ONLY; + check_opts |= CPD_CHECK; } if (s->dir_group_readable) { check_opts |= CPD_GROUP_READ;

1 0