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

[tor/master] This should be the last SecureZeroMemory fix
by nickm＠torproject.org 12 Jul '15

12 Jul '15

commit 7ed477786cbbb3905117f8ae9f4ce8ca82e5446b Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jul 12 15:14:43 2015 -0400 This should be the last SecureZeroMemory fix --- src/common/compat.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/common/compat.c b/src/common/compat.c index a32a1af..01eccac 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -80,7 +80,8 @@ wint_t _getwch(void); #define WEOF (wchar_t)(0xFFFF) #endif #if defined(HAVE_DECL_SECUREZEROMEMORY) && !HAVE_DECL_SECUREZEROMEMORY -PVOID SecureZeroMemory(PVOID ptr, SIZE_T cnt); +#define SecureZeroMemory RtlSecureZeroMemory +PVOID WINAPI SecureZeroMemory(PVOID ptr, SIZE_T cnt); #endif #elif defined(HAVE_READPASSPHRASE_H) #include <readpassphrase.h>

1 0

[tor/master] Dammit, autoconf!
by nickm＠torproject.org 12 Jul '15

12 Jul '15

commit 9f21c85e049f3c2bc65c8edb88d540f43814b522 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jul 12 15:02:43 2015 -0400 Dammit, autoconf! --- src/common/compat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 69c4705..a32a1af 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -73,13 +73,13 @@ #include <conio.h> #include <wchar.h> /* Some mingw headers lack these. :p */ -#ifndef HAVE_DECL__GETWCH +#if defined(HAVE_DECL__GETWCH) && !HAVE_DECL__GETWCH wint_t _getwch(void); #endif #ifndef WEOF #define WEOF (wchar_t)(0xFFFF) #endif -#ifndef HAVE_DECL_SECUREZEROMEMORY +#if defined(HAVE_DECL_SECUREZEROMEMORY) && !HAVE_DECL_SECUREZEROMEMORY PVOID SecureZeroMemory(PVOID ptr, SIZE_T cnt); #endif #elif defined(HAVE_READPASSPHRASE_H)

1 0

[tor/master] Disable -Wstack-protector diagnostics in curve25519-donna-helpers.h
by nickm＠torproject.org 12 Jul '15

12 Jul '15

commit d8352646900c6316af8e2967742ce6a438b04221 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jul 12 14:48:48 2015 -0400 Disable -Wstack-protector diagnostics in curve25519-donna-helpers.h This was causing a false positive on our arm builders. --- src/ext/ed25519/donna/curve25519-donna-helpers.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/ext/ed25519/donna/curve25519-donna-helpers.h b/src/ext/ed25519/donna/curve25519-donna-helpers.h index e4058ff..ca442fa 100644 --- a/src/ext/ed25519/donna/curve25519-donna-helpers.h +++ b/src/ext/ed25519/donna/curve25519-donna-helpers.h @@ -5,6 +5,19 @@ Curve25519 implementation agnostic helpers */ +#ifdef __GNUC__ +#define ED_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) +#endif + +#if __GNUC__ && ED_GCC_VERSION >= 401 +#if ED_GCC_VERSION >= 406 +#pragma GCC diagnostic push +#endif +/* Some versions of GCC (particularly on arm) give us bogus warnings here. + * Suppress the GCC warning so we can build Tor with -Wstack-protector. */ +#pragma GCC diagnostic ignored "-Wstack-protector" +#endif + /* * In: b = 2^5 - 2^0 * Out: b = 2^250 - 2^0 @@ -65,3 +78,7 @@ curve25519_pow_two252m3(bignum25519 two252m3, const bignum25519 z) { /* 2^252 - 2^2 */ curve25519_square_times(b, b, 2); /* 2^252 - 3 */ curve25519_mul_noinline(two252m3, b, z); } + +#if __GNUC__ && ED_GCC_VERSION >= 406 +#pragma GCC diagnostic pop +#endif

1 0

[tor/master] Nth time is maybe the charm for fixing windows readpassword build errors
by nickm＠torproject.org 12 Jul '15

12 Jul '15

commit db88d91ebedd407531784cf7fa8df0bd4f1f4164 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jul 12 14:34:11 2015 -0400 Nth time is maybe the charm for fixing windows readpassword build errors --- configure.ac | 10 ++++++++-- src/common/compat.c | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 6acc587..214b7e6 100644 --- a/configure.ac +++ b/configure.ac @@ -396,7 +396,6 @@ dnl Check for functions before libevent, since libevent-1.2 apparently dnl exports strlcpy without defining it in a header. AC_CHECK_FUNCS( - SecureZeroMemory \ _NSGetEnviron \ accept4 \ backtrace \ @@ -436,7 +435,6 @@ AC_CHECK_FUNCS( uname \ usleep \ vasprintf \ - _getwch \ _vscprintf ) @@ -445,6 +443,14 @@ if test "$bwin32" != true; then AC_CHECK_FUNCS(pthread_create) fi +if test "$bwin32" = true; then + AC_CHECK_DECLS([SecureZeroMemory, _getwch], , , [ +#include <windows.h> +#include <conio.h> +#include <wchar.h> + ]) +fi + AM_CONDITIONAL(BUILD_READPASSPHRASE_C, test x$ac_cv_func_readpassphrase = xno && test $bwin32 = false) dnl ------------------------------------------------------ diff --git a/src/common/compat.c b/src/common/compat.c index 9d01c9d..69c4705 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -73,13 +73,13 @@ #include <conio.h> #include <wchar.h> /* Some mingw headers lack these. :p */ -#ifndef HAVE__GETWCH +#ifndef HAVE_DECL__GETWCH wint_t _getwch(void); #endif #ifndef WEOF #define WEOF (wchar_t)(0xFFFF) #endif -#ifndef HAVE_SECUREZEROMEMORY +#ifndef HAVE_DECL_SECUREZEROMEMORY PVOID SecureZeroMemory(PVOID ptr, SIZE_T cnt); #endif #elif defined(HAVE_READPASSPHRASE_H)

1 0

[tor/release-0.2.6] Edit changelog
by nickm＠torproject.org 12 Jul '15

12 Jul '15

commit 4bae17e57d08113affb7689e741463d12482434f Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jul 12 14:07:00 2015 -0400 Edit changelog --- ChangeLog | 49 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4805257..f13cf11 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,42 +5,41 @@ Changes in version 0.2.6.10 - 2015-07-14 Linux. Everyone running an older version, especially an older version of 0.2.6, should upgrade. - o Major 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 0.2.5.2-alpha, introduced - when implementing 4900. Patch by "teor". - o Major bugfixes (hidden service clients, stability): - - Revert commit 9407040c592184 of bug 14219 that indeed fixed an - issue but introduced a major hidden service reachability + - Stop refusing to store updated hidden service descriptors on a + client. This reverts commit 9407040c59218 (which indeed fixed bug + 14219), but introduced a major hidden service reachability regression detailed in bug 16381. This is a temporary fix since we - can live with the minor issue in #14219 but the regression - introduced is too much of a set back. + can live with the minor issue in bug 14219 (it just results in + some load on the network) but the regression of 16381 is too much + of a setback. - To be clear, 14219 bug just results in some load on the network, - and some delay for the client when visiting a hidden service that - will ultimately fail. - - Workaround for bug 16381; bugfix on tor-0.2.6.3-alpha~138. + First-round fix for bug 16381; bugfix on tor-0.2.6.3-alpha. o Major bugfixes (stability): - - Do not crash with an assertion error when parsing certain kinds of - malformed or truncated microdescriptors. Fixes bug 16400; bugfix - on 0.2.6.1-alpha. Found by "torkeln"; fix based on a patch + - Stop crashing with an assertion failure when parsing certain kinds + of malformed or truncated microdescriptors. Fixes bug 16400; + bugfix on 0.2.6.1-alpha. Found by "torkeln"; fix based on a patch by "cypherpunks_backup". - - Stop randomly crashing with an assertion failure when connecting - to a busy hidden service, or connecting to a hidden service while - a NEWNYM is in progress. Fixes bug 16013; bugfix on 0.1.0.1-rc. + - Stop random assertion failures that could occur when connecting to + a busy hidden service, or connecting to a hidden service while a + NEWNYM is in progress. Fixes bug 16013; bugfix on 0.1.0.1-rc. - o Minor features: + o Minor features (geoip): - Update geoip to the June 3 2015 Maxmind GeoLite2 Country database. - Update geoip6 to the June 3 2015 Maxmind GeoLite2 Country database. + o Minor bugfixes (crypto error-handling): + - Check for failures from crypto_early_init, and refuse to continue. + A previous typo meant that we could keep going with an + uninitialized crypto library, and would have OpenSSL initialize + its own PRNG. Fixes bug 16360; bugfix on 0.2.5.2-alpha, introduced + when implementing 4900. Patch by "teor". + o Minor bugfixes (Linux seccomp2 sandbox): - - Allow pipe() and pipe2() syscalls; we need these when eventfd2() - support is missing. Fixes bug 16363; bugfix on 0.2.6.3-alpha. - Patch from "teor". + - Allow pipe() and pipe2() syscalls in the seccomp2 sandbox: we need + these when eventfd2() support is missing. Fixes bug 16363; bugfix + on 0.2.6.3-alpha. Patch from "teor". Changes in version 0.2.6.9 - 2015-06-11

1 0

[tor/master] Bump maint-0.2.6 to 0.2.6.10
by nickm＠torproject.org 12 Jul '15

12 Jul '15

commit 3d0c09019f0564278f61a5f494adcc0ce2436fda Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jul 12 13:33:47 2015 -0400 Bump maint-0.2.6 to 0.2.6.10 --- 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 1496b05..9ba67ad 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.6.9]) +AC_INIT([tor],[0.2.6.10]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 5c5c1bb..b88f092 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.6.9" +!define VERSION "0.2.6.10" !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 9b2e84d..d8e5245 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.6.9" +#define VERSION "0.2.6.10"

1 0

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

12 Jul '15

commit 6b80ff1b45c6c60a28dcbd40cdc3ab9cb421ed81 Merge: de397d5 3d0c090 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jul 12 13:34:22 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' This is an "ours" merge to avoid bumping the version number in master.

1 0

[tor/maint-0.2.6] Bump maint-0.2.6 to 0.2.6.10
by nickm＠torproject.org 12 Jul '15

12 Jul '15

commit 3d0c09019f0564278f61a5f494adcc0ce2436fda Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jul 12 13:33:47 2015 -0400 Bump maint-0.2.6 to 0.2.6.10 --- 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 1496b05..9ba67ad 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.6.9]) +AC_INIT([tor],[0.2.6.10]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 5c5c1bb..b88f092 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.6.9" +!define VERSION "0.2.6.10" !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 9b2e84d..d8e5245 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.6.9" +#define VERSION "0.2.6.10"

1 0

[tor/release-0.2.6] Bump maint-0.2.6 to 0.2.6.10
by nickm＠torproject.org 12 Jul '15

12 Jul '15

commit 3d0c09019f0564278f61a5f494adcc0ce2436fda Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jul 12 13:33:47 2015 -0400 Bump maint-0.2.6 to 0.2.6.10 --- 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 1496b05..9ba67ad 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.6.9]) +AC_INIT([tor],[0.2.6.10]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 5c5c1bb..b88f092 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.6.9" +!define VERSION "0.2.6.10" !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 9b2e84d..d8e5245 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.6.9" +#define VERSION "0.2.6.10"

1 0

[tor/release-0.2.6] Merge branch 'maint-0.2.6' into release-0.2.6
by nickm＠torproject.org 12 Jul '15

12 Jul '15

commit 3085343783d6914480dc71209f5441163ed8d4e2 Merge: aff4053 3d0c090 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jul 12 13:33:52 2015 -0400 Merge branch 'maint-0.2.6' into release-0.2.6 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --cc src/win32/orconfig.h index fd59446,d8e5245..14c0f70 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@@ -232,9 -232,10 +232,9 @@@ #define USING_TWOS_COMPLEMENT /* Version number of package */ - #define VERSION "0.2.6.9" + #define VERSION "0.2.6.10" - #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR #define RSHIFT_DOES_SIGN_EXTEND

1 0