Update OpenSSL to 1.1.1 (uses clang for compilation)

This openssl version is an LTS, supported until 11th September 2023.

Important: There is now a distinction between the version we use for downloading, and the version used for creating the library: OpenSSL 1.1 now have prefix with "1.1.so". This explains why others recipes that depends on it require the "library" version. Those recipes, still not are modified to support the new version.

References: #1478

Author: tito

pythonforandroid/recipes/openssl/__init__.py

@@ -5,12 +5,13 @@
 
 
 class OpenSSLRecipe(Recipe):
-    version = '1.0.2h'
+    version = '1.1.1'
+    lib_version = '1.1'
     url = 'https://www.openssl.org/source/openssl-{version}.tar.gz'
 
     def should_build(self, arch):
-        return not self.has_libs(arch, 'libssl' + self.version + '.so',
-                                 'libcrypto' + self.version + '.so')
+        return not self.has_libs(arch, 'libssl' + self.lib_version + '.so',
+                                 'libcrypto' + self.lib_version + '.so')
 
     def check_symbol(self, env, sofile, symbol):
         nm = env.get('NM', 'nm')
@@ -22,19 +23,18 @@ def check_symbol(self, env, sofile, symbol):
         return False
 
     def get_recipe_env(self, arch=None):
-        env = super(OpenSSLRecipe, self).get_recipe_env(arch)
-        env['OPENSSL_VERSION'] = self.version
-        env['CFLAGS'] += ' ' + env['LDFLAGS']
-        env['CC'] += ' ' + env['LDFLAGS']
+        env = super(OpenSSLRecipe, self).get_recipe_env(arch, clang=True)
+        env['OPENSSL_VERSION'] = self.lib_version
         env['MAKE'] = 'make'  # This removes the '-j5', which isn't safe
+        env['ANDROID_NDK'] = self.ctx.ndk_dir
         return env
 
     def select_build_arch(self, arch):
         aname = arch.arch
         if 'arm64' in aname:
             return 'linux-aarch64'
         if 'v7a' in aname:
-            return 'android-armv7'
+            return 'android-arm'
         if 'arm' in aname:
             return 'android'
         if 'x86' in aname:
@@ -48,20 +48,27 @@ def build_arch(self, arch):
             # so instead we manually run perl passing in Configure
             perl = sh.Command('perl')
             buildarch = self.select_build_arch(arch)
-            shprint(perl, 'Configure', 'shared', 'no-dso', 'no-krb5', buildarch, _env=env)
+            # XXX if we don't have no-asm, using clang and ndk-15c, i got:
+            # crypto/aes/bsaes-armv7.S:1372:14: error: immediate operand must be in the range [0,4095]
+            #  add r8, r6, #.LREVM0SR-.LM0 @ borrow r8
+            #              ^
+            # crypto/aes/bsaes-armv7.S:1434:14: error: immediate operand must be in the range [0,4095]
+            #  sub r6, r8, #.LREVM0SR-.LSR @ pass constants
+            shprint(perl, 'Configure', 'shared', 'no-dso', 'no-asm', buildarch, _env=env)
             self.apply_patch('disable-sover.patch', arch.arch)
-            self.apply_patch('rename-shared-lib.patch', arch.arch)
 
             # check_ssl = partial(self.check_symbol, env, 'libssl' + self.version + '.so')
-            check_crypto = partial(self.check_symbol, env, 'libcrypto' + self.version + '.so')
+            check_crypto = partial(self.check_symbol, env, 'libcrypto' + self.lib_version + '.so')
             while True:
                 shprint(sh.make, 'build_libs', _env=env)
-                if all(map(check_crypto, ('SSLeay', 'MD5_Transform', 'MD4_Init'))):
+                if all(map(check_crypto, ('MD5_Transform', 'MD4_Init'))):
                     break
+                import time
+                time.sleep(3)
                 shprint(sh.make, 'clean', _env=env)
 
-            self.install_libs(arch, 'libssl' + self.version + '.so',
-                              'libcrypto' + self.version + '.so')
+            self.install_libs(arch, 'libssl' + self.lib_version + '.so',
+                              'libcrypto' + self.lib_version + '.so')
 
 
 recipe = OpenSSLRecipe()

pythonforandroid/recipes/openssl/disable-sover.patch

@@ -1,20 +1,11 @@
---- openssl/Makefile	2016-01-28 17:26:49.159522273 +0100
-+++ b/Makefile	2016-01-28 17:26:54.358438402 +0100
-@@ -342,7 +342,7 @@
- link-shared:
- 	@ set -e; for i in $(SHLIBDIRS); do \
- 		$(MAKE) -f $(HERE)/Makefile.shared -e $(BUILDENV) \
--			LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \
-+			LIBNAME=$$i LIBVERSION= \
- 			LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \
- 			symlink.$(SHLIB_TARGET); \
- 		libs="$$libs -l$$i"; \
-@@ -356,7 +356,7 @@
- 			libs="$(LIBKRB5) $$libs"; \
- 		fi; \
- 		$(CLEARENV) && $(MAKE) -f Makefile.shared -e $(BUILDENV) \
--			LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \
-+			LIBNAME=$$i LIBVERSION= \
- 			LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \
- 			LIBDEPS="$$libs $(EX_LIBS)" \
- 			link_a.$(SHLIB_TARGET); \
+--- openssl/Makefile.orig       2018-10-20 22:49:40.418310423 +0200
++++ openssl/Makefile    2018-10-20 22:50:23.347322403 +0200
+@@ -19,7 +19,7 @@
+ SHLIB_MAJOR=1
+ SHLIB_MINOR=1
+ SHLIB_TARGET=linux-shared
+-SHLIB_EXT=.so.$(SHLIB_VERSION_NUMBER)
++SHLIB_EXT=$(SHLIB_VERSION_NUMBER).so
+ SHLIB_EXT_SIMPLE=.so
+ SHLIB_EXT_IMPORT=
+