Merge branch 'tor-hardening' into 'master'

Enable FORTIFY_SOURCE for 32-bit Android binaries

See merge request !37

build_tor_android.py

@@ -64,28 +64,24 @@ def build_android(versions):
     app_abi = 'armeabi-v7a'
     env = os.environ.copy()
     env['APP_ABI'] = app_abi
-    env['NDK_PLATFORM_LEVEL'] = "16"  # first level supporting PIE
     build_android_arch(app_abi, env, versions)
 
     # build arm64 pie
     app_abi = 'arm64-v8a'
     env = os.environ.copy()
     env['APP_ABI'] = app_abi
-    env['NDK_PLATFORM_LEVEL'] = "21"  # first level supporting 64-bit
     build_android_arch(app_abi, env, versions)
 
     # build x86 pie
     app_abi = 'x86'
     env = os.environ.copy()
     env['APP_ABI'] = app_abi
-    env['NDK_PLATFORM_LEVEL'] = "16"  # first level supporting PIE
     build_android_arch(app_abi, env, versions)
 
     # build x86_64 pie
     app_abi = 'x86_64'
     env = os.environ.copy()
     env['APP_ABI'] = app_abi
-    env['NDK_PLATFORM_LEVEL'] = "21"  # first level supporting 64-bit
     build_android_arch(app_abi, env, versions)
 
 

tor-build/Makefile

@@ -49,7 +49,7 @@ ifneq ($(filter armeabi-v7a, $(APP_ABI)),)
  GREP_CHECK := EABI5
  NDK_ABI := arm
  NDK_BIT := 32
- NDK_PLATFORM_LEVEL := 16
+ NDK_PLATFORM_LEVEL := 18
  NDK_TOOLCHAIN := $(HOST)-$(NDK_TOOLCHAIN_VERSION)
 endif
 ifneq ($(filter x86, $(APP_ABI)),)
@@ -58,7 +58,7 @@ ifneq ($(filter x86, $(APP_ABI)),)
  GREP_CHECK := 80386
  NDK_ABI := x86
  NDK_BIT := 32
- NDK_PLATFORM_LEVEL := 16
+ NDK_PLATFORM_LEVEL := 18
  NDK_TOOLCHAIN := $(NDK_ABI)-$(NDK_TOOLCHAIN_VERSION)
 endif
 ifneq ($(filter x86_64, $(APP_ABI)),)
@@ -221,6 +221,7 @@ tor/Makefile: tor/configure.ac tor/Makefile.am
 	cd tor && \
 			./configure \
 				--host=$(ALTHOST) \
+				--enable-android \
 				--enable-lzma \
 				--enable-pic \
 				--enable-static-libevent --with-libevent-dir=$(EXTERNAL_ROOT) \

tor-versions.json

 {
+  "0.4.8.9-1": {
+    "tor": {
+      "url": "https://gitlab.torproject.org/tpo/core/tor.git",
+      "commit": "tor-0.4.8.9"
+    },
+    "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_1w"
+    },
+    "xz": {
+      "url": "https://git.tukaani.org/xz.git",
+      "commit": "v5.2.10"
+    },
+    "zlib": {
+      "url": "https://github.com/madler/zlib.git",
+      "commit": "v1.2.12"
+    },
+    "ndk": {
+      "url": "https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip",
+      "revision": "21.4.7075529",
+      "sha256": "ad7ce5467e18d40050dc51b8e7affc3e635c85bd8c59be62de32352328ed467e"
+    },
+    "upstream": {
+      "url": "https://code.briarproject.org/briar/tor-browser-build.git",
+      "commit": "tor-0.4.8.9",
+      "tor-browser": "13.0.5",
+      "libevent": "2.1.7",
+      "reproduce-upstream": true
+    },
+    "timestamp": "201001010000.00"
+  },
   "0.4.8.9": {
     "tor": {
       "url": "https://gitlab.torproject.org/tpo/core/tor.git",