Commit 824bbe7e authored by Torsten Grote's avatar Torsten Grote
Browse files

Merge branch 'openssl-1-1-1n' into 'master'

Upgrade to OpenSSL 1.1.1n, fully strip Tor binaries

See merge request !20
parents c5d85ea5 dc281ff7
Pipeline #10351 passed with stages
in 63 minutes and 39 seconds
......@@ -117,7 +117,7 @@ def build_linux_arch(arch, gcc_arch, cc_env, openssl_target, autogen_host, versi
output_dir = get_output_dir(PLATFORM)
tor_path = os.path.join(output_dir, 'tor')
copy(os.path.join(BUILD_DIR, 'tor', 'src', 'app', 'tor'), tor_path)
check_call(['strip', '-D', '--strip-unneeded', '--strip-debug', '-R', '.note*', '-R', '.comment', tor_path])
check_call(['strip', '-D', tor_path])
reset_time(tor_path, versions)
print("Sha256 hash of tor before zipping %s: %s" % (name, get_sha256(tor_path)))
check_call(['zip', '--no-dir-entries', '--junk-paths', '-X', name, 'tor'], cwd=output_dir)
......
......@@ -119,7 +119,7 @@ def build_windows_arch(arch, host, versions):
output_dir = get_output_dir(PLATFORM)
tor_path = os.path.join(output_dir, 'tor')
copy(os.path.join(prefix_dir, 'bin', 'tor.exe'), tor_path)
check_call(['strip', '-D', '--strip-unneeded', '--strip-debug', '-R', '.note*', '-R', '.comment', tor_path])
check_call(['strip', '-D', tor_path])
reset_time(tor_path, versions)
print("Sha256 hash of tor before zipping %s: %s" % (name, get_sha256(tor_path)))
check_call(['zip', '--no-dir-entries', '--junk-paths', '-X', name, 'tor'], cwd=output_dir)
......
......@@ -273,7 +273,7 @@ tor/Makefile: tor/configure.ac tor/Makefile.am
tor-build-stamp: tor/Makefile
$(MAKE) -C tor
$(NDK_TOOLCHAIN_BASE)/bin/$(ALTHOST)-strip -D --strip-unneeded -R .note* -R .comment --strip-debug $(OUTPUT_FILE)
$(NDK_TOOLCHAIN_BASE)/bin/$(ALTHOST)-strip -D $(OUTPUT_FILE)
touch $@
tor: lzma-build-stamp zstd-build-stamp libevent-build-stamp openssl-build-stamp tor-build-stamp
......
{
"0.4.5.12-1": {
"tor": {
"url": "https://git.torproject.org/git/tor.git",
"commit": "tor-0.4.5.12"
},
"libevent": {
"url": "https://github.com/libevent/libevent.git",
"commit": "release-2.1.12-stable"
},
"openssl": {
"url": "https://github.com/openssl/openssl.git",
"commit": "OpenSSL_1_1_1n"
},
"xz": {
"url": "https://git.tukaani.org/xz.git",
"commit": "v5.2.5"
},
"zlib": {
"url": "https://github.com/madler/zlib.git",
"commit": "v1.2.11"
},
"zstd": {
"url": "https://github.com/facebook/zstd.git",
"commit": "v1.4.8"
},
"ndk": {
"url": "https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip",
"revision": "21.4.7075529",
"sha256": "ad7ce5467e18d40050dc51b8e7affc3e635c85bd8c59be62de32352328ed467e"
},
"timestamp": "201001010000.00"
},
"0.4.5.12": {
"tor": {
"url": "https://git.torproject.org/git/tor.git",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment