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

[tor/master] Stop implying that we support openssl 1.0.0; we don't.
by nickm＠torproject.org 06 Oct '16

06 Oct '16

commit 850ec1e2822482435bb0efa8853a74d6f0feaa20 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 6 12:58:49 2016 -0400 Stop implying that we support openssl 1.0.0; we don't. Closes ticket 20303. The LIBRESSL_VERSION_NUMBER check is needed because if our openssl is really libressl, it will have an openssl version number we can't really believe. --- changes/no_openssl_100 | 4 ++++ configure.ac | 4 ++-- src/common/compat_openssl.h | 5 +++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/changes/no_openssl_100 b/changes/no_openssl_100 new file mode 100644 index 0000000..dd89da8 --- /dev/null +++ b/changes/no_openssl_100 @@ -0,0 +1,4 @@ + o Required libraries: + - When building with OpenSSL, Tor now requires version 1.0.1 or later. + OpenSSL 1.0.0 and earlier are no longer supported by the openssl team, + and should not be used. Closes ticket 20303. diff --git a/configure.ac b/configure.ac index 23371d3..af42896 100644 --- a/configure.ac +++ b/configure.ac @@ -614,12 +614,12 @@ CPPFLAGS="$TOR_CPPFLAGS_openssl $CPPFLAGS" AC_TRY_COMPILE([ #include <openssl/opensslv.h> -#if OPENSSL_VERSION_NUMBER < 0x1000000fL +#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x1000100fL #error "too old" #endif ], [], [ : ], - [ AC_ERROR([OpenSSL is too old. We require 1.0.0 or later. You can specify a path to a newer one with --with-openssl-dir.]) ]) + [ AC_ERROR([OpenSSL is too old. We require 1.0.1 or later. You can specify a path to a newer one with --with-openssl-dir.]) ]) AC_TRY_COMPILE([ #include <openssl/opensslv.h> diff --git a/src/common/compat_openssl.h b/src/common/compat_openssl.h index a7bdb0a..1bfe188 100644 --- a/src/common/compat_openssl.h +++ b/src/common/compat_openssl.h @@ -15,8 +15,9 @@ * \brief compatability definitions for working with different openssl forks **/ -#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,0,0) -#error "We require OpenSSL >= 1.0.0" +#if !defined(LIBRESSL_VERSION_NUMBER) && \ + OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,0,1) +#error "We require OpenSSL >= 1.0.1" #endif #if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) && \

1 0

[tor/master] Merge branch 'no_openssl_100'
by nickm＠torproject.org 06 Oct '16

06 Oct '16

commit 4f169a020ac80411731dffb3b1ca79e09a3d7541 Merge: 80e2896 850ec1e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 6 16:36:49 2016 -0400 Merge branch 'no_openssl_100' changes/no_openssl_100 | 4 ++++ configure.ac | 4 ++-- src/common/compat_openssl.h | 5 +++-- 3 files changed, 9 insertions(+), 4 deletions(-)

1 0

[tor/master] comment tweak. Fixes 20271. patch from pastly.
by nickm＠torproject.org 06 Oct '16

06 Oct '16

commit 80e2896d52981579042cc906766bc0444da7a1d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 6 12:04:04 2016 -0400 comment tweak. Fixes 20271. patch from pastly. --- src/or/dirvote.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 8b195f8..2c10e78 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -901,7 +901,7 @@ networkstatus_compute_bw_weights_v10(smartlist_t *chunks, int64_t G, } /* - * Computed from cases in 3.4.3 of dir-spec.txt + * Computed from cases in 3.8.3 of dir-spec.txt * * 1. Neither are scarce * 2. Both Guard and Exit are scarce

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.6' into maint-0.2.7
by nickm＠torproject.org 06 Oct '16

06 Oct '16

commit ec718aa83914e848ca9ee5e828731477a410e484 Merge: 11edbf4 12a7298 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 6 09:59:18 2016 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/geoip-october2016 | 4 + src/config/geoip | 63919 +++++++++++++++++++++++++++++++++----------- src/config/geoip6 | 1496 +- 3 files changed, 48664 insertions(+), 16755 deletions(-)

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8
by nickm＠torproject.org 06 Oct '16

06 Oct '16

commit d579528033837f56f341ffc624282d1ccf819982 Merge: c043398 ab98c43 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 6 10:01:23 2016 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 changes/geoip-october2016 | 4 + src/config/geoip | 63919 +++++++++++++++++++++++++++++++++----------- src/config/geoip6 | 1496 +- 3 files changed, 48664 insertions(+), 16755 deletions(-)

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.7' into maint-0.2.8
by nickm＠torproject.org 06 Oct '16

06 Oct '16

commit ab98c4387eadf380f6fe71b8dc1b568704a379ea Merge: ec19ecc ec718aa Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 6 09:59:42 2016 -0400 Merge branch 'maint-0.2.7' into maint-0.2.8 changes/geoip-october2016 | 4 + src/config/geoip | 63919 +++++++++++++++++++++++++++++++++----------- src/config/geoip6 | 1496 +- 3 files changed, 48664 insertions(+), 16755 deletions(-)

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 06 Oct '16

06 Oct '16

commit 304d8f3bbbf063c2ee504568dde134296a2025ca Merge: e4d82da 1b4984f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 6 09:58:54 2016 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-october2016 | 4 + src/config/geoip | 63919 +++++++++++++++++++++++++++++++++----------- src/config/geoip6 | 1496 +- 3 files changed, 48664 insertions(+), 16755 deletions(-)

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 06 Oct '16

06 Oct '16

commit 12a72983766d5265b5259038af711cb172671af7 Merge: 52a99cb 304d8f3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 6 09:59:03 2016 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/geoip-october2016 | 4 + src/config/geoip | 63919 +++++++++++++++++++++++++++++++++----------- src/config/geoip6 | 1496 +- 3 files changed, 48664 insertions(+), 16755 deletions(-)

1 0

[tor/release-0.2.7] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 06 Oct '16

06 Oct '16

commit 12a72983766d5265b5259038af711cb172671af7 Merge: 52a99cb 304d8f3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 6 09:59:03 2016 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/geoip-october2016 | 4 + src/config/geoip | 63919 +++++++++++++++++++++++++++++++++----------- src/config/geoip6 | 1496 +- 3 files changed, 48664 insertions(+), 16755 deletions(-)

1 0

[tor/release-0.2.7] Merge branch 'maint-0.2.6' into maint-0.2.7
by nickm＠torproject.org 06 Oct '16

06 Oct '16

commit ec718aa83914e848ca9ee5e828731477a410e484 Merge: 11edbf4 12a7298 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 6 09:59:18 2016 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/geoip-october2016 | 4 + src/config/geoip | 63919 +++++++++++++++++++++++++++++++++----------- src/config/geoip6 | 1496 +- 3 files changed, 48664 insertions(+), 16755 deletions(-)

1 0