commit 2fba118f50c4bb3418787cdca5a021d5941841b6 Author: Georg Koppen gk@torproject.org Date: Wed May 29 11:31:11 2019 +0000

Bug 30492: Switch to the OpenSSL 1.1.1 series --- projects/openssl/config | 4 ++-- projects/tor/build | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/projects/openssl/config b/projects/openssl/config index ecb6966..318529a 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.0.2r +version: 1.1.1b filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'

var: @@ -26,4 +26,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-%5B% c("version") %].tar.gz' - sha256sum: ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6 + sha256sum: 5c557b023230413dfb0756f3137a13e6d726838ccd1430888ad15bfb2b43ea4b diff --git a/projects/tor/build b/projects/tor/build index a9305d6..8c8ed45 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -49,8 +49,8 @@ openssldir=/var/tmp/dist/openssl [% END -%] [% IF c("var/linux") %] mkdir -p "$distdir/Debug/Tor" - cp $openssldir/lib/libssl.so.1.0.0 "$distdir/Tor/" - cp $openssldir/lib/libcrypto.so.1.0.0 "$distdir/Tor/" + cp $openssldir/lib/libssl.so.1.1 "$distdir/Tor/" + cp $openssldir/lib/libcrypto.so.1.1 "$distdir/Tor/" cp $libeventdir/lib/libevent-2.1.so.6 "$distdir/Tor/" # We need to copy the libstdc++.so.6 for Tor Browser on older Linux distros. # Copying it into /Browser, which feels more natural, and amending