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

[tor/maint-0.3.4] 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.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

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

07 Sep '18

commit 1e46a391b3ef4dfc65044f900684368ea234c290 Merge: 9fcb3ef78 2ec88a2a6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 09:15:15 2018 -0400 Merge branch 'ticket27344_029' into maint-0.2.9 changes/bug27344 | 4 ++++ configure.ac | 1 + src/common/tortls.c | 6 +++++- 3 files changed, 10 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.4] Appveyor: Disable gcc hardening in Windows 64-bit builds
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit e70cf826257b913deb7fd90f9b8a8982941a8558 Author: teor <teor(a)torproject.org> Date: Wed Sep 5 18:32:46 2018 +1000 Appveyor: Disable gcc hardening in 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. --- .appveyor.yml | 4 +++- changes/bug27460 | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 690f93e5b..cb8446f43 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -9,9 +9,11 @@ environment: - target: i686-w64-mingw32 compiler_path: mingw32 openssl_path: /c/OpenSSL-Win32 + hardening: - target: x86_64-w64-mingw32 compiler_path: mingw64 openssl_path: /c/OpenSSL-Win64 + hardening: --disable-gcc-hardening install: - ps: >- @@ -41,7 +43,7 @@ build_script: Set-Location "${env:build}" Execute-Bash "which ${env:target}-gcc" Execute-Bash "${env:target}-gcc --version" - Execute-Bash "../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings --with-openssl-dir=${env:openssl_path}" + Execute-Bash "../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings --with-openssl-dir=${env:openssl_path} ${env:hardening}" Execute-Bash "V=1 make -j2" Execute-Bash "V=1 make -j2 install" } diff --git a/changes/bug27460 b/changes/bug27460 new file mode 100644 index 000000000..53c4c7daf --- /dev/null +++ b/changes/bug27460 @@ -0,0 +1,6 @@ + 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.

1 0

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

07 Sep '18

commit 291876be36d70e892d8fb5e50509379e69485a02 Merge: 579770b70 967cef2f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 08:48:23 2018 -0400 Merge branch 'maint-0.3.4' .appveyor.yml | 4 +++- changes/bug27460 | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.4] Merge remote-tracking branch 'teor/bug27460-034' into maint-0.3.4
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 967cef2f8f5ad654aa0d53e1516fd26bc18a00e8 Merge: a78504dbe e70cf8262 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 08:48:19 2018 -0400 Merge remote-tracking branch 'teor/bug27460-034' into maint-0.3.4 .appveyor.yml | 4 +++- changes/bug27460 | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge remote-tracking branch 'teor/bug27460-034' into maint-0.3.4
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 967cef2f8f5ad654aa0d53e1516fd26bc18a00e8 Merge: a78504dbe e70cf8262 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 08:48:19 2018 -0400 Merge remote-tracking branch 'teor/bug27460-034' into maint-0.3.4 .appveyor.yml | 4 +++- changes/bug27460 | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/master] Appveyor: Disable gcc hardening in Windows 64-bit builds
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit e70cf826257b913deb7fd90f9b8a8982941a8558 Author: teor <teor(a)torproject.org> Date: Wed Sep 5 18:32:46 2018 +1000 Appveyor: Disable gcc hardening in 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. --- .appveyor.yml | 4 +++- changes/bug27460 | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 690f93e5b..cb8446f43 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -9,9 +9,11 @@ environment: - target: i686-w64-mingw32 compiler_path: mingw32 openssl_path: /c/OpenSSL-Win32 + hardening: - target: x86_64-w64-mingw32 compiler_path: mingw64 openssl_path: /c/OpenSSL-Win64 + hardening: --disable-gcc-hardening install: - ps: >- @@ -41,7 +43,7 @@ build_script: Set-Location "${env:build}" Execute-Bash "which ${env:target}-gcc" Execute-Bash "${env:target}-gcc --version" - Execute-Bash "../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings --with-openssl-dir=${env:openssl_path}" + Execute-Bash "../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings --with-openssl-dir=${env:openssl_path} ${env:hardening}" Execute-Bash "V=1 make -j2" Execute-Bash "V=1 make -j2 install" } diff --git a/changes/bug27460 b/changes/bug27460 new file mode 100644 index 000000000..53c4c7daf --- /dev/null +++ b/changes/bug27460 @@ -0,0 +1,6 @@ + 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.

1 0

[tor/release-0.3.4] Merge remote-tracking branch 'teor/bug27460-034' into maint-0.3.4
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 967cef2f8f5ad654aa0d53e1516fd26bc18a00e8 Merge: a78504dbe e70cf8262 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 08:48:19 2018 -0400 Merge remote-tracking branch 'teor/bug27460-034' into maint-0.3.4 .appveyor.yml | 4 +++- changes/bug27460 | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.4] Appveyor: Disable gcc hardening in Windows 64-bit builds
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit e70cf826257b913deb7fd90f9b8a8982941a8558 Author: teor <teor(a)torproject.org> Date: Wed Sep 5 18:32:46 2018 +1000 Appveyor: Disable gcc hardening in 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. --- .appveyor.yml | 4 +++- changes/bug27460 | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 690f93e5b..cb8446f43 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -9,9 +9,11 @@ environment: - target: i686-w64-mingw32 compiler_path: mingw32 openssl_path: /c/OpenSSL-Win32 + hardening: - target: x86_64-w64-mingw32 compiler_path: mingw64 openssl_path: /c/OpenSSL-Win64 + hardening: --disable-gcc-hardening install: - ps: >- @@ -41,7 +43,7 @@ build_script: Set-Location "${env:build}" Execute-Bash "which ${env:target}-gcc" Execute-Bash "${env:target}-gcc --version" - Execute-Bash "../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings --with-openssl-dir=${env:openssl_path}" + Execute-Bash "../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings --with-openssl-dir=${env:openssl_path} ${env:hardening}" Execute-Bash "V=1 make -j2" Execute-Bash "V=1 make -j2 install" } diff --git a/changes/bug27460 b/changes/bug27460 new file mode 100644 index 000000000..53c4c7daf --- /dev/null +++ b/changes/bug27460 @@ -0,0 +1,6 @@ + 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.

1 0