[omemo] Added recipes needed to build omemo module

ci/constants.py

@@ -38,6 +38,13 @@ class TargetPython(Enum):
     'm2crypto',
     'netifaces',
     'Pillow',
+    # depends on cffi that still seems to have compilation issues
+    'protobuf_cpp',
+    'xeddsa',
+    'x3dh',
+    'pynacl',
+    'doubleratchet',
+    'omemo',
     'cryptography',
     # https://github.com/kivy/python-for-android/issues/1405
     'psycopg2',

pythonforandroid/recipes/doubleratchet/__init__.py

@@ -0,0 +1,17 @@
+from pythonforandroid.recipe import PythonRecipe
+
+
+class DoubleRatchetRecipe(PythonRecipe):
+    name = 'doubleratchet'
+    version = '0.4.0'
+    url = 'https://pypi.python.org/packages/source/D/DoubleRatchet/DoubleRatchet-{version}.tar.gz'
+    depends = [
+        ('python2', 'python3crystax'),
+        'setuptools',
+        'cryptography',
+    ]
+    patches = ['requires_fix.patch']
+    call_hostpython_via_targetpython = False
+
+
+recipe = DoubleRatchetRecipe()

pythonforandroid/recipes/doubleratchet/requires_fix.patch

@@ -0,0 +1,12 @@
+diff -urN DoubleRatchet.ori/setup.py DoubleRatchet/setup.py
+--- DoubleRatchet.ori/setup.py	2018-10-28 18:55:16.259540354 +0100
++++ DoubleRatchet/setup.py	2018-10-28 18:55:39.349541117 +0100
+@@ -21,7 +21,7 @@
+     author_email = "[email protected]",
+     license = "MIT",
+     packages = find_packages(),
+-    install_requires = [ "cryptography>=1.7.1" ],
++    install_requires = [],
+     python_requires  = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4",
+     zip_safe = True,
+     classifiers = [

pythonforandroid/recipes/omemo/__init__.py

@@ -0,0 +1,21 @@
+from pythonforandroid.recipe import PythonRecipe
+
+
+class OmemoRecipe(PythonRecipe):
+    name = 'omemo'
+    version = '0.7.1'
+    url = 'https://pypi.python.org/packages/source/O/OMEMO/OMEMO-{version}.tar.gz'
+    site_packages_name = 'omemo'
+    depends = [
+        ('python2', 'python3crystax'),
+        'setuptools',
+        'protobuf_cpp',
+        'x3dh',
+        'DoubleRatchet',
+        'hkdf==0.0.3',
+    ]
+    patches = ['remove_dependencies.patch', 'wireformat.patch']
+    call_hostpython_via_targetpython = False
+
+
+recipe = OmemoRecipe()

pythonforandroid/recipes/omemo/remove_dependencies.patch

@@ -0,0 +1,16 @@
+diff -urN OMEMO-0.7.1.ori/setup.py OMEMO-0.7.1/setup.py
+--- OMEMO-0.7.1.ori/setup.py	2018-09-09 16:31:44.000000000 +0200
++++ OMEMO-0.7.1/setup.py	2018-11-02 09:08:50.819963131 +0100
+@@ -15,12 +15,6 @@
+     license = "GPLv3",
+     packages = find_packages(),
+     install_requires = [
+-        "X3DH>=0.5.3,<0.6",
+-        "DoubleRatchet>=0.4.0,<0.5",
+-        "hkdf==0.0.3",
+-        "pynacl>=1.0.1",
+-        "cryptography>=1.7.1",
+-        "protobuf>=2.6.1"
+     ],
+     python_requires = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4",
+     zip_safe = True,

pythonforandroid/recipes/omemo/wireformat.patch

@@ -0,0 +1,101 @@
+diff -urN OMEMO-0.7.1.ori/omemo/signal/wireformat/whispertextprotocol_pb2.py OMEMO-0.7.1/omemo/signal/wireformat/whispertextprotocol_pb2.py
+--- OMEMO-0.7.1.ori/omemo/signal/wireformat/whispertextprotocol_pb2.py	2018-09-02 21:04:26.000000000 +0200
++++ OMEMO-0.7.1/omemo/signal/wireformat/whispertextprotocol_pb2.py	2018-11-02 10:39:15.196715321 +0100
+@@ -21,7 +21,6 @@
+   syntax='proto2',
+   serialized_pb=_b('\n\x19WhisperTextProtocol.proto\"R\n\rSignalMessage\x12\x16\n\x0e\x64h_ratchet_key\x18\x01 \x01(\x0c\x12\t\n\x01n\x18\x02 \x01(\r\x12\n\n\x02pn\x18\x03 \x01(\r\x12\x12\n\nciphertext\x18\x04 \x01(\x0c\"\x7f\n\x13PreKeySignalMessage\x12\x17\n\x0fregistration_id\x18\x05 \x01(\r\x12\x0f\n\x07otpk_id\x18\x01 \x01(\r\x12\x0e\n\x06spk_id\x18\x06 \x01(\r\x12\n\n\x02\x65k\x18\x02 \x01(\x0c\x12\n\n\x02ik\x18\x03 \x01(\x0c\x12\x16\n\x0esignal_message\x18\x04 \x01(\x0c')
+ )
+-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+
+
+@@ -39,28 +38,28 @@
+       has_default_value=False, default_value=_b(""),
+       message_type=None, enum_type=None, containing_type=None,
+       is_extension=False, extension_scope=None,
+-      options=None),
++      options=None, file=DESCRIPTOR),
+     _descriptor.FieldDescriptor(
+       name='n', full_name='SignalMessage.n', index=1,
+       number=2, type=13, cpp_type=3, label=1,
+       has_default_value=False, default_value=0,
+       message_type=None, enum_type=None, containing_type=None,
+       is_extension=False, extension_scope=None,
+-      options=None),
++      options=None, file=DESCRIPTOR),
+     _descriptor.FieldDescriptor(
+       name='pn', full_name='SignalMessage.pn', index=2,
+       number=3, type=13, cpp_type=3, label=1,
+       has_default_value=False, default_value=0,
+       message_type=None, enum_type=None, containing_type=None,
+       is_extension=False, extension_scope=None,
+-      options=None),
++      options=None, file=DESCRIPTOR),
+     _descriptor.FieldDescriptor(
+       name='ciphertext', full_name='SignalMessage.ciphertext', index=3,
+       number=4, type=12, cpp_type=9, label=1,
+       has_default_value=False, default_value=_b(""),
+       message_type=None, enum_type=None, containing_type=None,
+       is_extension=False, extension_scope=None,
+-      options=None),
++      options=None, file=DESCRIPTOR),
+   ],
+   extensions=[
+   ],
+@@ -91,42 +90,42 @@
+       has_default_value=False, default_value=0,
+       message_type=None, enum_type=None, containing_type=None,
+       is_extension=False, extension_scope=None,
+-      options=None),
++      options=None, file=DESCRIPTOR),
+     _descriptor.FieldDescriptor(
+       name='otpk_id', full_name='PreKeySignalMessage.otpk_id', index=1,
+       number=1, type=13, cpp_type=3, label=1,
+       has_default_value=False, default_value=0,
+       message_type=None, enum_type=None, containing_type=None,
+       is_extension=False, extension_scope=None,
+-      options=None),
++      options=None, file=DESCRIPTOR),
+     _descriptor.FieldDescriptor(
+       name='spk_id', full_name='PreKeySignalMessage.spk_id', index=2,
+       number=6, type=13, cpp_type=3, label=1,
+       has_default_value=False, default_value=0,
+       message_type=None, enum_type=None, containing_type=None,
+       is_extension=False, extension_scope=None,
+-      options=None),
++      options=None, file=DESCRIPTOR),
+     _descriptor.FieldDescriptor(
+       name='ek', full_name='PreKeySignalMessage.ek', index=3,
+       number=2, type=12, cpp_type=9, label=1,
+       has_default_value=False, default_value=_b(""),
+       message_type=None, enum_type=None, containing_type=None,
+       is_extension=False, extension_scope=None,
+-      options=None),
++      options=None, file=DESCRIPTOR),
+     _descriptor.FieldDescriptor(
+       name='ik', full_name='PreKeySignalMessage.ik', index=4,
+       number=3, type=12, cpp_type=9, label=1,
+       has_default_value=False, default_value=_b(""),
+       message_type=None, enum_type=None, containing_type=None,
+       is_extension=False, extension_scope=None,
+-      options=None),
++      options=None, file=DESCRIPTOR),
+     _descriptor.FieldDescriptor(
+       name='signal_message', full_name='PreKeySignalMessage.signal_message', index=5,
+       number=4, type=12, cpp_type=9, label=1,
+       has_default_value=False, default_value=_b(""),
+       message_type=None, enum_type=None, containing_type=None,
+       is_extension=False, extension_scope=None,
+-      options=None),
++      options=None, file=DESCRIPTOR),
+   ],
+   extensions=[
+   ],
+@@ -145,6 +144,7 @@
+
+ DESCRIPTOR.message_types_by_name['SignalMessage'] = _SIGNALMESSAGE
+ DESCRIPTOR.message_types_by_name['PreKeySignalMessage'] = _PREKEYSIGNALMESSAGE
++_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+ SignalMessage = _reflection.GeneratedProtocolMessageType('SignalMessage', (_message.Message,), dict(
+   DESCRIPTOR = _SIGNALMESSAGE,

pythonforandroid/recipes/pynacl/__init__.py

@@ -0,0 +1,29 @@
+from pythonforandroid.recipe import CompiledComponentsPythonRecipe
+import os
+
+
+class PyNaCLRecipe(CompiledComponentsPythonRecipe):
+    name = 'pynacl'
+    version = '1.3.0'
+    url = 'https://pypi.python.org/packages/source/P/PyNaCl/PyNaCl-{version}.tar.gz'
+
+    depends = ['hostpython2', 'python2', 'six', 'setuptools', 'cffi', 'libsodium']
+    call_hostpython_via_targetpython = False
+
+    def get_recipe_env(self, arch):
+        env = super(PyNaCLRecipe, self).get_recipe_env(arch)
+        env['SODIUM_INSTALL'] = 'system'
+
+        libsodium_build_dir = self.get_recipe(
+            'libsodium', self.ctx).get_build_dir(arch.arch)
+        env['CFLAGS'] += ' -I{}'.format(os.path.join(libsodium_build_dir,
+                                                     'src/libsodium/include'))
+        env['LDFLAGS'] += ' -L{}'.format(
+            self.ctx.get_libs_dir(arch.arch) +
+            '-L{}'.format(self.ctx.libs_dir)) + ' -L{}'.format(
+            libsodium_build_dir)
+
+        return env
+
+
+recipe = PyNaCLRecipe()

pythonforandroid/recipes/x3dh/__init__.py

@@ -0,0 +1,19 @@
+from pythonforandroid.recipe import PythonRecipe
+
+
+class X3DHRecipe(PythonRecipe):
+    name = 'x3dh'
+    version = '0.5.3'
+    url = 'https://pypi.python.org/packages/source/X/X3DH/X3DH-{version}.tar.gz'
+    site_packages_name = 'x3dh'
+    depends = [
+        ('python2', 'python3crystax'),
+        'setuptools',
+        'cryptography',
+        'xeddsa',
+    ]
+    patches = ['requires_fix.patch']
+    call_hostpython_via_targetpython = False
+
+
+recipe = X3DHRecipe()

pythonforandroid/recipes/x3dh/requires_fix.patch

@@ -0,0 +1,12 @@
+diff -urN X3DH-0.5.3.ori/setup.py X3DH-0.5.3/setup.py
+--- X3DH-0.5.3.ori/setup.py	2018-10-28 19:15:16.444766623 +0100
++++ X3DH-0.5.3/setup.py	2018-10-28 19:15:38.028060948 +0100
+@@ -24,7 +24,7 @@
+     author_email = "[email protected]",
+     license = "MIT",
+     packages = find_packages(),
+-    install_requires = [ "cryptography>=1.7.1", "XEdDSA>=0.4.2" ],
++    install_requires = [],
+     python_requires  = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4",
+     zip_safe = True,
+     classifiers = [

pythonforandroid/recipes/xeddsa/__init__.py

@@ -0,0 +1,37 @@
+from pythonforandroid.recipe import CythonRecipe
+from pythonforandroid.toolchain import current_directory, shprint
+from os.path import join
+import sh
+
+
+class XedDSARecipe(CythonRecipe):
+    name = 'xeddsa'
+    version = '0.4.4'
+    url = 'https://pypi.python.org/packages/source/X/XEdDSA/XEdDSA-{version}.tar.gz'
+    depends = [
+        ('python2', 'python3crystax'),
+        'setuptools',
+        'cffi',
+        'pynacl',
+    ]
+    patches = ['remove_dependencies.patch']
+    call_hostpython_via_targetpython = False
+
+    def build_arch(self, arch):
+        with current_directory(join(self.get_build_dir(arch.arch))):
+            env = self.get_recipe_env(arch)
+            hostpython = sh.Command(self.ctx.hostpython)
+            shprint(
+                hostpython, 'ref10/build.py',
+                _env=env
+            )
+            python_version = self.ctx.python_recipe.version[0:3]
+            site_packages_dir = 'lib/python{python_version}/site-packages'.format(
+                python_version=python_version)
+            site_packages = join(self.ctx.get_python_install_dir(),
+                                 site_packages_dir)
+            shprint(sh.cp, '_crypto_sign.so', site_packages)
+            self.install_python_package(arch)
+
+
+recipe = XedDSARecipe()

pythonforandroid/recipes/xeddsa/remove_dependencies.patch

@@ -0,0 +1,15 @@
+diff -urN XEdDSA-0.4.4.ori/setup.py XEdDSA-0.4.4/setup.py
+--- XEdDSA-0.4.4.ori/setup.py	2018-09-23 16:08:35.000000000 +0200
++++ XEdDSA-0.4.4/setup.py	2018-10-30 08:21:23.338790184 +0100
+@@ -22,9 +22,8 @@
+     author_email = "[email protected]",
+     license = "MIT",
+     packages = find_packages(),
+-    install_requires = [ "cffi>=1.9.1", "pynacl>=1.0.1" ],
+-    setup_requires   = [ "cffi>=1.9.1" ],
+-    cffi_modules     = [ os.path.join("ref10", "build.py") + ":ffibuilder" ],
++    install_requires = ["pynacl>=1.0.1" ],
++    setup_requires   = [],
+     python_requires  = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4",
+     include_package_data = True,
+     zip_safe = False,