September 2018 - tor-commits - lists.torproject.org

[tor/master] in master, remove changes files for already-merged changes
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 859d744eb884f4ea0a7b732c63ddf461b3808b93 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 09:39:54 2018 -0400 in master, remove changes files for already-merged changes --- changes/27286 | 4 ---- changes/bug27295 | 3 --- changes/bug27344 | 4 ---- changes/bug27345 | 5 ----- changes/bug27418 | 3 --- changes/bug27453 | 3 --- changes/bug27460 | 6 ------ changes/bug27461 | 5 ----- changes/bug27463 | 3 --- changes/bug27465 | 5 ----- changes/ticket27430 | 4 ---- changes/ticket27449 | 3 --- 12 files changed, 48 deletions(-) diff --git a/changes/27286 b/changes/27286 deleted file mode 100644 index 5f5f7a4ae..000000000 --- a/changes/27286 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (directory authorities): - - Authorities no longer vote to make the subprotocol version "LinkAuth=1" - a requirement: it is unsupportable with NSS, and hasn't been needed - since Tor 0.3.0.1-alpha. Closes ticket 27286. diff --git a/changes/bug27295 b/changes/bug27295 deleted file mode 100644 index c5a364877..000000000 --- a/changes/bug27295 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (testing, chutney): - - Before running make test-network-all, delete old logs and test result - files, to avoid spurious failures. Fixes bug 27295; bugfix on 0.2.7.3-rc. diff --git a/changes/bug27344 b/changes/bug27344 deleted file mode 100644 index 9f6685558..000000000 --- a/changes/bug27344 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (compatibility): - - Tell OpenSSL to maintain backward compatibility with previous - RSA1024/DH1024 users in Tor. With OpenSSL 1.1.1-pre6, these ciphers - are disabled by default. Closes ticket 27344. diff --git a/changes/bug27345 b/changes/bug27345 deleted file mode 100644 index d98f4afbc..000000000 --- a/changes/bug27345 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (testing): - - When running make test-network-all, use the mixed+hs-v2 network. - (A previous fix to chutney removed v3 onion services from the - mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is - confusing.) Fixes bug 27345; bugfix on 0.3.2.1-alpha. diff --git a/changes/bug27418 b/changes/bug27418 deleted file mode 100644 index 1d99497dc..000000000 --- a/changes/bug27418 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (continuous integration): - - When we use echo in Travis, don't pass a --flag as the first argument. - Fixes bug 27418; bugfix on 0.3.4.7-rc. diff --git a/changes/bug27453 b/changes/bug27453 deleted file mode 100644 index 4501346d2..000000000 --- a/changes/bug27453 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (continuous integration): - - When a Travis build fails, and showing a log fails, keep trying to - show the other logs. Fixes bug 27453; bugfix on 0.3.4.7-rc. diff --git a/changes/bug27460 b/changes/bug27460 deleted file mode 100644 index 53c4c7daf..000000000 --- a/changes/bug27460 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes (continuous integration): - - Disable gcc hardening in Appveyor Windows 64-bit builds. As of - August 29, 2018, Appveyor images come with gcc 8.2.0 by default. - 64-bit Windows executables compiled with gcc 8.2.0 and - tor's --enable-gcc-hardening crash. - Fixes bug 27460; bugfix on 0.3.4.1-alpha. diff --git a/changes/bug27461 b/changes/bug27461 deleted file mode 100644 index 3571ee816..000000000 --- a/changes/bug27461 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (compilation): - - Stop calling SetProcessDEPPolicy() on 64-bit Windows. It is not - supported, and always fails. Some compilers warn about the function - pointer cast on 64-bit Windows. - Fixes bug 27461; bugfix on 0.2.2.23-alpha. diff --git a/changes/bug27463 b/changes/bug27463 deleted file mode 100644 index 073acdd99..000000000 --- a/changes/bug27463 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (onion services): - - Silence a spurious compiler warning in rend_client_send_introduction(). - Fixes bug 27463; bugfix on 0.1.1.2-alpha. diff --git a/changes/bug27465 b/changes/bug27465 deleted file mode 100644 index 743b35130..000000000 --- a/changes/bug27465 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (compilation): - - Silence a spurious compiler warning on the GetAdaptersAddresses - function pointer cast. This issue is already fixed by 26481 in - 0.3.5 and later, by removing the lookup and cast. - Fixes bug 27465; bugfix on 0.2.3.11-alpha. diff --git a/changes/ticket27430 b/changes/ticket27430 deleted file mode 100644 index 4e016e91e..000000000 --- a/changes/ticket27430 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (continuous integration): - - Show config.log and test-suite.log after failed Appveyor builds. - Also upload the zipped full logs as a build artifact. - Implements ticket 27430. diff --git a/changes/ticket27449 b/changes/ticket27449 deleted file mode 100644 index 2a0984c09..000000000 --- a/changes/ticket27449 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features (continuous integration): - - Log the compiler path and version during Appveyor builds. - Implements ticket 27449.

1 0

[tor/release-0.3.4] Reincorporate changes files removed in bf33ddd into 0.3.4.6-rc changelog
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 7ce714e7d360416db3b5f1e1b8af7a2f4eae97b4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 09:32:01 2018 -0400 Reincorporate changes files removed in bf33ddd into 0.3.4.6-rc changelog These should have been removed in master, not in 0.3.4. Closes ticket 27488. --- ChangeLog | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/ChangeLog b/ChangeLog index 25ddebc8c..ce54a8340 100644 --- a/ChangeLog +++ b/ChangeLog @@ -119,6 +119,27 @@ Changes in version 0.3.4.6-rc - 2018-08-06 - When building Tor, prefer to use Python 3 over Python 2, and more recent (contemplated) versions over older ones. Closes ticket 26372. + - When compiling with --enable-openbsd-malloc or --enable-tcmalloc, + tell the compiler not to include the system malloc implementation. + Fixes bug 20424; bugfix on 0.2.0.20-rc. + - Don't try to use a pragma to temporarily disable the + -Wunused-const-variable warning if the compiler doesn't support + it. Fixes bug 26785; bugfix on 0.3.2.11. + + o Minor bugfixes (continuous integration): + - Skip a pair of unreliable key generation tests on Windows, until + the underlying issue in bug 26076 is resolved. Fixes bug 26830 and + bug 26853; bugfix on 0.2.7.3-rc and 0.3.2.1-alpha respectively. + + o Minor features (controller): + - The control port now exposes the list of HTTPTunnelPorts and + ExtOrPorts via GETINFO net/listeners/httptunnel and + net/listeners/extor respectively. Closes ticket 26647. + + o Minor bugfixes (directory authority): + - When voting for recommended versions, make sure that all of the + versions are well-formed and parsable. Fixes bug 26485; bugfix + on 0.1.1.6-alpha. o Minor features (geoip): - Update geoip and geoip6 to the July 3 2018 Maxmind GeoLite2 @@ -128,6 +149,8 @@ Changes in version 0.3.4.6-rc - 2018-08-06 - Rust cross-compilation is now supported. Closes ticket 25895. o Minor bugfixes (compilation): + - Update build system so that tor builds again with --disable-unittests + after recent refactoring. Fixes bug 26789; bugfix on 0.3.4.3-alpha. - Fix a compilation warning on some versions of GCC when building code that calls routerinfo_get_my_routerinfo() twice, assuming that the second call will succeed if the first one did. Fixes bug @@ -149,9 +172,26 @@ Changes in version 0.3.4.6-rc - 2018-08-06 - Fix a number of small memory leaks identified by coverity. Fixes bug 26467; bugfix on numerous Tor versions. + o Minor bugfixes (logging): + - Improve the log message when connection initiators fail to + authenticate direct connections to relays. Fixes bug 26927; bugfix + on 0.3.0.1-alpha. + o Minor bugfixes (portability): - Avoid a compilation error in test_bwmgt.c on Solaris 10. Fixes bug 26994; bugfix on 0.3.4.1-alpha. + - Work around two different bugs in the OS X 10.10 and later SDKs + that would prevent us from successfully targeting earlier versions + of OS X. Fixes bug 26876; bugfix on 0.3.3.1-alpha. + + o Minor bugfixes (single onion services, Tor2web): + - Log a protocol warning when single onion services or Tor2web + clients fail to authenticate direct connections to relays. Fixes + bug 26924; bugfix on 0.2.9.1-alpha. + + o Minor bugfixes (testing): + - Disable core dumps in test_bt.sh, to avoid failures in "make + distcheck". Fixes bug 26787; bugfix on 0.2.5.2-alpha. o Minor bugfixes (testing, compatibility): - When running the ntor_ref.py and hs_ntor_ref.py tests, make sure @@ -160,6 +200,12 @@ Changes in version 0.3.4.6-rc - 2018-08-06 Fixes bug 26535; bugfix on 0.2.5.5-alpha (for ntor_ref.py) and 0.3.1.1-alpha (for hs_ntor_ref.py). + o Minor bugfixes (v3 onion services): + - Stop sending ed25519 link specifiers in v3 onion service introduce + cells and descriptors, when the rendezvous or introduction point + doesn't support ed25519 link authentication. Fixes bug 26627; + bugfix on 0.3.2.4-alpha. + Changes in version 0.3.4.5-rc - 2018-07-13 Tor 0.3.4.5-rc moves to a new bridge authority, meaning people running

1 0

[tor/master] Copy updated 0.3.4.6-rc changelog to master
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit c50a053a95deffb5b8bd4a899f6d3a0d64fa43d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 09:32:31 2018 -0400 Copy updated 0.3.4.6-rc changelog to master Forward-ports fix for 27488. --- ChangeLog | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/ChangeLog b/ChangeLog index 25ddebc8c..ce54a8340 100644 --- a/ChangeLog +++ b/ChangeLog @@ -119,6 +119,27 @@ Changes in version 0.3.4.6-rc - 2018-08-06 - When building Tor, prefer to use Python 3 over Python 2, and more recent (contemplated) versions over older ones. Closes ticket 26372. + - When compiling with --enable-openbsd-malloc or --enable-tcmalloc, + tell the compiler not to include the system malloc implementation. + Fixes bug 20424; bugfix on 0.2.0.20-rc. + - Don't try to use a pragma to temporarily disable the + -Wunused-const-variable warning if the compiler doesn't support + it. Fixes bug 26785; bugfix on 0.3.2.11. + + o Minor bugfixes (continuous integration): + - Skip a pair of unreliable key generation tests on Windows, until + the underlying issue in bug 26076 is resolved. Fixes bug 26830 and + bug 26853; bugfix on 0.2.7.3-rc and 0.3.2.1-alpha respectively. + + o Minor features (controller): + - The control port now exposes the list of HTTPTunnelPorts and + ExtOrPorts via GETINFO net/listeners/httptunnel and + net/listeners/extor respectively. Closes ticket 26647. + + o Minor bugfixes (directory authority): + - When voting for recommended versions, make sure that all of the + versions are well-formed and parsable. Fixes bug 26485; bugfix + on 0.1.1.6-alpha. o Minor features (geoip): - Update geoip and geoip6 to the July 3 2018 Maxmind GeoLite2 @@ -128,6 +149,8 @@ Changes in version 0.3.4.6-rc - 2018-08-06 - Rust cross-compilation is now supported. Closes ticket 25895. o Minor bugfixes (compilation): + - Update build system so that tor builds again with --disable-unittests + after recent refactoring. Fixes bug 26789; bugfix on 0.3.4.3-alpha. - Fix a compilation warning on some versions of GCC when building code that calls routerinfo_get_my_routerinfo() twice, assuming that the second call will succeed if the first one did. Fixes bug @@ -149,9 +172,26 @@ Changes in version 0.3.4.6-rc - 2018-08-06 - Fix a number of small memory leaks identified by coverity. Fixes bug 26467; bugfix on numerous Tor versions. + o Minor bugfixes (logging): + - Improve the log message when connection initiators fail to + authenticate direct connections to relays. Fixes bug 26927; bugfix + on 0.3.0.1-alpha. + o Minor bugfixes (portability): - Avoid a compilation error in test_bwmgt.c on Solaris 10. Fixes bug 26994; bugfix on 0.3.4.1-alpha. + - Work around two different bugs in the OS X 10.10 and later SDKs + that would prevent us from successfully targeting earlier versions + of OS X. Fixes bug 26876; bugfix on 0.3.3.1-alpha. + + o Minor bugfixes (single onion services, Tor2web): + - Log a protocol warning when single onion services or Tor2web + clients fail to authenticate direct connections to relays. Fixes + bug 26924; bugfix on 0.2.9.1-alpha. + + o Minor bugfixes (testing): + - Disable core dumps in test_bt.sh, to avoid failures in "make + distcheck". Fixes bug 26787; bugfix on 0.2.5.2-alpha. o Minor bugfixes (testing, compatibility): - When running the ntor_ref.py and hs_ntor_ref.py tests, make sure @@ -160,6 +200,12 @@ Changes in version 0.3.4.6-rc - 2018-08-06 Fixes bug 26535; bugfix on 0.2.5.5-alpha (for ntor_ref.py) and 0.3.1.1-alpha (for hs_ntor_ref.py). + o Minor bugfixes (v3 onion services): + - Stop sending ed25519 link specifiers in v3 onion service introduce + cells and descriptors, when the rendezvous or introduction point + doesn't support ed25519 link authentication. Fixes bug 26627; + bugfix on 0.3.2.4-alpha. + Changes in version 0.3.4.5-rc - 2018-07-13 Tor 0.3.4.5-rc moves to a new bridge authority, meaning people running

1 0

[translation/support-portal_completed] Update translations for support-portal_completed
by translation＠torproject.org 07 Sep '18

07 Sep '18

commit 5852a8cb7bf38b4238622e8400ad9bbd37326e5e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 7 13:19:02 2018 +0000 Update translations for support-portal_completed --- contents+es.po | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/contents+es.po b/contents+es.po index 0dd99a06f..8df313e06 100644 --- a/contents+es.po +++ b/contents+es.po @@ -560,6 +560,8 @@ msgid "" "<img class=\"card-img-top\" src=\"/static/images/onion-website.png\" " "alt=\"Onion icon\">" msgstr "" +"<img class=\"card-img-top\" src=\"/static/images/onion-website.png\" " +"alt=\"Onion icon\">" #: http//localhost/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) @@ -4616,13 +4618,9 @@ msgid "" " 1 minutes, or that theirs is ahead. Tor requires an accurate clock to work:" " please check your time, timezone, and date settings." msgstr "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead. Tor requires an accurate clock to work:" -" please check your time, timezone, and date settings. (19.11.2017 " -"00:04:48.800 [WARN] Se ha recibido la celda NETINFO con la hora " -"distorsionada (OR:xxx.xx.x.xx:xxxx): Parece que nuestro reloj está atrasado " -"1 día, 0 horas, 1 minuto o que el tuyo está adelantado.. Tor necesita un " +" (19.11.2017 00:04:48.800 [WARN] Se ha recibido la celda NETINFO con la hora" +" distorsionada (OR:xxx.xx.x.xx:xxxx): Parece que nuestro reloj está atrasado" +" 1 día, 0 horas, 1 minuto o que el tuyo está adelantado.. Tor necesita un " "reloj exacto para funcionar: por favor, comprueba tus ajustes de hora, zona " "horaria y fecha..)"

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 07 Sep '18

07 Sep '18

commit d30305a121358aeaef51ca5402713c3caeb2ed23 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 7 13:18:57 2018 +0000 Update translations for support-portal --- contents+es.po | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/contents+es.po b/contents+es.po index 0dd99a06f..8df313e06 100644 --- a/contents+es.po +++ b/contents+es.po @@ -560,6 +560,8 @@ msgid "" "<img class=\"card-img-top\" src=\"/static/images/onion-website.png\" " "alt=\"Onion icon\">" msgstr "" +"<img class=\"card-img-top\" src=\"/static/images/onion-website.png\" " +"alt=\"Onion icon\">" #: http//localhost/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) @@ -4616,13 +4618,9 @@ msgid "" " 1 minutes, or that theirs is ahead. Tor requires an accurate clock to work:" " please check your time, timezone, and date settings." msgstr "" -"19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " -"(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," -" 1 minutes, or that theirs is ahead. Tor requires an accurate clock to work:" -" please check your time, timezone, and date settings. (19.11.2017 " -"00:04:48.800 [WARN] Se ha recibido la celda NETINFO con la hora " -"distorsionada (OR:xxx.xx.x.xx:xxxx): Parece que nuestro reloj está atrasado " -"1 día, 0 horas, 1 minuto o que el tuyo está adelantado.. Tor necesita un " +" (19.11.2017 00:04:48.800 [WARN] Se ha recibido la celda NETINFO con la hora" +" distorsionada (OR:xxx.xx.x.xx:xxxx): Parece que nuestro reloj está atrasado" +" 1 día, 0 horas, 1 minuto o que el tuyo está adelantado.. Tor necesita un " "reloj exacto para funcionar: por favor, comprueba tus ajustes de hora, zona " "horaria y fecha..)"

1 0

[translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties
by translation＠torproject.org 07 Sep '18

07 Sep '18

commit 17ae78cda21b36b5037222a048bdf47721db02b1 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 7 13:18:15 2018 +0000 Update translations for torbutton-browseronboardingproperties --- id/browserOnboarding.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/id/browserOnboarding.properties b/id/browserOnboarding.properties index 5af64bc9b..4e7b10639 100644 --- a/id/browserOnboarding.properties +++ b/id/browserOnboarding.properties @@ -3,7 +3,7 @@ # vim: set sw=2 sts=2 ts=8 et: onboarding.tour-tor-welcome=Selamat datang -onboarding.tour-tor-welcome.title=You’re ready. +onboarding.tour-tor-welcome.title=Anda siap. onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. onboarding.tour-tor-welcome.button=Start Now

1 0

[tor/release-0.2.9] Tell openssl to build its TLS contexts with security level 1
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 2ec88a2a6ddef1b916425438b9648879a977b120 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 08:57:14 2018 -0400 Tell openssl to build its TLS contexts with security level 1 Fixes bug 27344, where we'd break compatibility with old tors by rejecting RSA1024 and DH1024. --- changes/bug27344 | 4 ++++ configure.ac | 1 + src/common/tortls.c | 6 +++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/changes/bug27344 b/changes/bug27344 new file mode 100644 index 000000000..9f6685558 --- /dev/null +++ b/changes/bug27344 @@ -0,0 +1,4 @@ + o Minor features (compatibility): + - Tell OpenSSL to maintain backward compatibility with previous + RSA1024/DH1024 users in Tor. With OpenSSL 1.1.1-pre6, these ciphers + are disabled by default. Closes ticket 27344. diff --git a/configure.ac b/configure.ac index 76b3f423a..5ac3579d7 100644 --- a/configure.ac +++ b/configure.ac @@ -678,6 +678,7 @@ AC_CHECK_FUNCS([ \ SSL_get_client_ciphers \ SSL_get_client_random \ SSL_CIPHER_find \ + SSL_CTX_set_security_level \ TLS_method ]) diff --git a/src/common/tortls.c b/src/common/tortls.c index 4cbe8b10e..1f2fe1ce1 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1130,6 +1130,11 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int key_lifetime, if (!(result->ctx = SSL_CTX_new(SSLv23_method()))) goto error; #endif +#ifdef HAVE_SSL_CTX_SET_SECURITY_LEVEL + /* Level 1 re-enables RSA1024 and DH1024 for compatibility with old tors */ + SSL_CTX_set_security_level(result->ctx, 1); +#endif + SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv2); SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv3); @@ -2555,4 +2560,3 @@ evaluate_ecgroup_for_tls(const char *ecgroup) return ret; } -

1 0

[tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 8849b2ca3c3943e7d2f109b8e56179be82092a6e Merge: 967cef2f8 732ea9120 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 09:15:56 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27344 | 4 ++++ configure.ac | 1 + src/common/tortls.c | 7 ++++++- 3 files changed, 11 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 732ea9120c9db5d6368cba6f2b789aa4fca5db31 Merge: 056003d60 0366ae224 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 09:15:56 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27344 | 4 ++++ configure.ac | 1 + src/common/tortls.c | 7 ++++++- 3 files changed, 11 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 0366ae224cb3b9cd55905201cd1b55a03f2736e9 Merge: 987e12a58 1e46a391b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 09:15:52 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27344 | 4 ++++ configure.ac | 1 + src/common/tortls.c | 7 ++++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --cc src/common/tortls.c index 03c0be1cd,1f2fe1ce1..6efc8c3e4 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@@ -1171,7 -1129,12 +1171,13 @@@ tor_tls_context_new(crypto_pk_t *identi #else if (!(result->ctx = SSL_CTX_new(SSLv23_method()))) goto error; -#endif +#endif /* defined(HAVE_TLS_METHOD) */ ++ + #ifdef HAVE_SSL_CTX_SET_SECURITY_LEVEL + /* Level 1 re-enables RSA1024 and DH1024 for compatibility with old tors */ + SSL_CTX_set_security_level(result->ctx, 1); + #endif + SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv2); SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv3);

1 0