Add OpenVPN3 to build, change build system to cmake

327 files changed, 1374 insertions, 69 deletions

diff --git a/.gitignore b/.gitignore
index 6e26c832..547fbdc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ main/openvpn3
 
 
 main/src/ovpn3/java/net/openvpn/ovpn3
+main/.externalNativeBuild
diff --git a/.gitmodules b/.gitmodules
index 8ee8ab30..dbd43e32 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,15 @@
 [submodule "main/openvpn"]
-	path = main/openvpn
+	path = main/src/main/cpp/openvpn
 	url = ../openvpn.git
 [submodule "main/openssl"]
-	path = main/openssl
+	path = main/src/main/cpp/openssl
 	url = ../platform_external_openssl.git
 [submodule "main/breakpad"]
 	path = main/breakpad
 	url = ../breakpad.git
+[submodule "main/src/main/cpp/mbedtls"]
+	path = main/src/main/cpp/mbedtls
+	url = ../polarssl.git
+[submodule "main/src/main/cpp/openvpn3"]
+	path = main/src/main/cpp/openvpn3
+	url = ../openvpn3.git
diff --git a/main/build.gradle b/main/build.gradle
index 02384425..2926795e 100644
--- a/main/build.gradle
+++ b/main/build.gradle
@@ -20,31 +20,44 @@ repositories {
 
 dependencies {
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    compile 'com.android.support:support-annotations:27.0.2'
-    compile 'com.android.support:cardview-v7:27.0.2'
-    compile 'com.android.support:recyclerview-v7:27.0.2'
+    implementation 'com.android.support:support-annotations:27.0.2'
+    implementation 'com.android.support:cardview-v7:27.0.2'
+    implementation 'com.android.support:recyclerview-v7:27.0.2'
     //    compile 'ch.acra:acra:4.5.0'
-    compile 'com.github.PhilJay:MPAndroidChart:v3.0.2'
+    implementation 'com.github.PhilJay:MPAndroidChart:v3.0.2'
 
-    testCompile 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.12'
 }
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '27.0.1'
+    compileSdkVersion 27
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode = 153
         versionName = "0.6.73"
+
+        externalNativeBuild {
+            cmake {
+                arguments '-DANDROID_TOOLCHAIN=clang',
+                        '-DANDROID_STL=c++_static'
+                //abiFilters "arm64-v8a"
+            }
+        }
+    }
+
+    externalNativeBuild {
+        cmake {
+            path "src/main/cpp/CMakeLists.txt"
+        }
     }
 
     sourceSets {
         main {
-            assets.srcDirs = ['src/main/assets', 'ovpnlibs/assets']
+            assets.srcDirs = ['src/main/assets', 'build/ovpnassets']
             jniLibs.srcDirs = ['ovpnlibs/jniLibs']
-            jni.srcDirs = [] //disable automatic ndk-build
         }
 
         ovpn3 {
@@ -60,12 +73,6 @@ android {
         }
     }
 
-    /*
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }*/
-
     signingConfigs {
         release
     }
@@ -85,10 +92,10 @@ android {
     flavorDimensions "implementation"
 
     productFlavors {
-        /*ovpn3 {
-        dimension "implementation"
+        ovpn3 {
+            dimension "implementation"
 
-    } */
+        }
 
         normal {
             dimension "implementation"
@@ -115,9 +122,7 @@ if (project.hasProperty('keystoreFile') &&
     android.buildTypes.release.signingConfig = null
 }
 
-/*tasks.withType(com.android.build.gradle.tasks.PackageApplication) { pkgTask ->
-    pkgTask.jniFolders = new HashSet<File>()
-    pkgTask.jniFolders.add(new File(buildDir, 'native-libs'))
+// Ensure native build is run before assets, so assets are ready to be merged into the apk
+android.applicationVariants.all { variant ->
+    variant.mergeAssets.dependsOn(variant.externalNativeBuildTasks)
 }
-*/
-
diff --git a/main/openvpn b/main/openvpn
deleted file mode 160000
-Subproject 61ec1d3207a058b29eb8c463550dc5958cf0e38
diff --git a/main/ovpn3/Android.mk b/main/ovpn3/Android.mk
deleted file mode 100644
index 4564ca52..00000000
--- a/main/ovpn3/Android.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-LOCAL_PATH:= $(call my-dir)/
-
-include $(CLEAR_VARS)
-
-LOCAL_LDLIBS := -lz 
-LOCAL_C_INCLUDES := openssl/include lzo/include openssl/crypto openssl openvpn/src/compat openvpn3/client openvpn3 boost_1_55_0 polarssl/include  snappy asio/asio/include
-LOCAL_CPP_FEATURES += exceptions rtti
-
-#LOCAL_SHARED_LIBRARIES :=  libssl libcrypto 
-#LOCAL_SHARED_LIBRARIES := polarssl-dynamic
-LOCAL_STATIC_LIBRARIES :=  libssl_static libcrypto_static  liblzo-static
-#LOCAL_STATIC_LIBRARIES :=  liblzo-static
-
-#LOCAL_CFLAGS= -DHAVE_CONFIG_H -DTARGET_ABI=\"${TARGET_ABI}\" -DUSE_POLARSSL -DHAVE_LZO -DASIO_STANDALONE
-LOCAL_CFLAGS= -DHAVE_CONFIG_H -DTARGET_ABI=\"${TARGET_ABI}\" -DUSE_OPENSSL -DHAVE_LZO -DASIO_STANDALONE
-
-LOCAL_CXXFLAGS += -std=c++1y
-
-#ifneq ($(TARGET_ARCH),mips)
-#LOCAL_STATIC_LIBRARIES += breakpad_client
-#LOCAL_CFLAGS += -DGOOGLE_BREAKPAD=1
-#endif
-
-LOCAL_MODULE = ovpn3
-
-LOCAL_SRC_FILES:= \
-	../openvpn3/javacli/ovpncli_wrap.cxx \
-	../openvpn3/client/ovpncli.cpp \
-
-
-#ifneq ($(TARGET_ARCH),mips)
-#LOCAL_SRC_FILES+=src/openvpn/breakpad.cpp
-#endif
-
-
-
-include $(BUILD_SHARED_LIBRARY)
-#include $(BUILD_EXECUTABLE)
-
-
-
diff --git a/main/src/main/cpp/CMakeLists.txt b/main/src/main/cpp/CMakeLists.txt
new file mode 100644
index 00000000..b4862178
--- /dev/null
+++ b/main/src/main/cpp/CMakeLists.txt
@@ -0,0 +1,179 @@
+cmake_minimum_required(VERSION 3.4.1)
+
+# Set mbedtls options
+OPTION(ENABLE_PROGRAMS "" OFF)
+OPTION(USE_SHARED_MBEDTLS_LIBRARY "" OFF)
+OPTION(ENABLE_TESTING ""  OFF)
+
+add_subdirectory(mbedtls)
+add_subdirectory(lzo)
+include(tools.cmake)
+include(openssl.cmake)
+
+# OpenVPN build config is here to not add extra files to openvpn3
+
+add_custom_command(OUTPUT "javacli/ovpncli_wrap.cxx"
+  file(MAKE_DIRECTORY ovpn3/java/net/openvpn/ovpn3)
+  COMMAND swig -outdir ovpn3/java/net/openvpn/ovpn3/ -c++ -java -package net.openvpn.ovpn3 -I${CMAKE_SOURCE_DIR}/openvpn3/client -I${CMAKE_SOURCE_DIR}/openvpn3 ${CMAKE_SOURCE_DIR}/openvpn3/javacli/ovpncli.i)
+
+set(ovpn3_SRCS
+  openvpn3/client/ovpncli.cpp
+  openvpn3/javacli/ovpncli_wrap.cxx)
+
+add_library(ovpn3 SHARED ${ovpn3_SRCS})
+
+target_include_directories(ovpn3 PUBLIC
+  ${CMAKE_CURRENT_SOURCE_DIR}/lzo/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/openvpn3
+  ${CMAKE_CURRENT_SOURCE_DIR}/asio/asio/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/openvpn3/client
+  ${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/include
+  )
+
+target_compile_options(ovpn3 PRIVATE  -std=c++1y)
+target_compile_definitions(ovpn3 PRIVATE
+  -DHAVE_CONFIG_H
+  -DHAVE_LZO
+  -DASIO_STANDALONE
+  -DUSE_ASIO
+  -DUSE_MBEDTLS
+  )
+target_link_libraries(ovpn3 mbedtls mbedx509 mbedcrypto lzo_static_lib)
+
+add_library(opvpnutil SHARED opvpnutil/jniglue.c opvpnutil/scan_ifs.c opvpnutil/sslspeed.c)
+target_compile_definitions(opvpnutil PRIVATE -DTARGET_ARCH_ABI=\"${ANDROID_ABI}\")
+target_link_libraries(opvpnutil log crypto ssl)
+
+
+add_library(jbcrypto SHARED jbcrypto/jbcrypto.cpp)
+target_link_libraries(jbcrypto log crypto)
+
+
+
+set(openvpn_srcs
+	src/compat/compat-basename.c 
+	src/compat/compat-daemon.c 
+	src/compat/compat-dirname.c 
+	src/compat/compat-gettimeofday.c 
+	src/compat/compat-inet_ntop.c 
+	src/compat/compat-inet_pton.c 
+	src/compat/compat-lz4.c 
+	src/openvpn/argv.c 
+	src/openvpn/base64.c 
+	src/openvpn/buffer.c 
+	src/openvpn/clinat.c 
+	src/openvpn/console.c 
+	src/openvpn/console_builtin.c 
+	src/openvpn/crypto.c 
+	src/openvpn/crypto_openssl.c 
+	src/openvpn/crypto_mbedtls.c 
+	src/openvpn/cryptoapi.c 
+	src/openvpn/dhcp.c 
+	src/openvpn/error.c 
+	src/openvpn/event.c 
+	src/openvpn/fdmisc.c 
+	src/openvpn/forward.c 
+	src/openvpn/fragment.c 
+	src/openvpn/gremlin.c 
+	src/openvpn/helper.c 
+	src/openvpn/httpdigest.c 
+	src/openvpn/init.c 
+	src/openvpn/interval.c 
+	src/openvpn/list.c 
+	src/openvpn/lladdr.c 
+	src/openvpn/lzo.c 
+	src/openvpn/manage.c 
+	src/openvpn/mbuf.c 
+	src/openvpn/misc.c 
+	src/openvpn/mroute.c 
+	src/openvpn/mss.c 
+	src/openvpn/mstats.c 
+	src/openvpn/mtcp.c 
+	src/openvpn/mtu.c 
+	src/openvpn/mudp.c 
+	src/openvpn/multi.c 
+	src/openvpn/ntlm.c 
+	src/openvpn/occ.c 
+	src/openvpn/openvpn.c 
+	src/openvpn/options.c 
+	src/openvpn/otime.c 
+	src/openvpn/packet_id.c 
+	src/openvpn/perf.c 
+	src/openvpn/pf.c 
+	src/openvpn/ping.c 
+	src/openvpn/pkcs11.c 
+	src/openvpn/pkcs11_openssl.c 
+	src/openvpn/platform.c 
+	src/openvpn/plugin.c 
+	src/openvpn/pool.c 
+	src/openvpn/proto.c 
+	src/openvpn/proxy.c 
+	src/openvpn/ps.c 
+	src/openvpn/push.c 
+	src/openvpn/reliable.c 
+	src/openvpn/route.c 
+	src/openvpn/schedule.c 
+	src/openvpn/session_id.c 
+	src/openvpn/shaper.c 
+	src/openvpn/sig.c 
+	src/openvpn/socket.c 
+	src/openvpn/socks.c 
+	src/openvpn/ssl.c 
+	src/openvpn/ssl_openssl.c 
+	src/openvpn/ssl_mbedtls.c 
+	src/openvpn/ssl_verify.c 
+	src/openvpn/ssl_verify_openssl.c 
+	src/openvpn/ssl_verify_mbedtls.c 
+	src/openvpn/status.c 
+	src/openvpn/tls_crypt.c 
+	src/openvpn/tun.c 
+	src/openvpn/comp-lz4.c 
+	src/openvpn/comp.c 
+	src/openvpn/compstub.c 
+	src/openvpn/env_set.c  
+	src/openvpn/run_command.c
+    )
+
+PREPEND(openvpn_srcs_with_path "openvpn" ${openvpn_srcs})  
+add_library(openvpn SHARED ${openvpn_srcs_with_path})
+target_include_directories(openvpn PRIVATE
+  openvpn/android-config/
+  openvpn/src/compat
+  openvpn/include
+  lzo/include
+  openvpn
+  )
+
+target_compile_definitions(openvpn PRIVATE
+  -DHAVE_CONFIG_H
+  -DTARGET_ABI=\"${ANDROID_ABI}\"
+  )
+
+target_compile_definitions(openvpn PRIVATE
+  -DENABLE_CRYPTO_OPENSSL=1
+  )
+target_link_libraries(openvpn crypto ssl lzo_static_lib)
+
+add_executable(pie_openvpn.${ANDROID_ABI} minivpn/minivpn.c)
+target_compile_options(pie_openvpn.${ANDROID_ABI} PRIVATE -fPIE)
+target_link_libraries(pie_openvpn.${ANDROID_ABI} PRIVATE openvpn -fPIE -pie)
+
+add_executable(nopie_openvpn.${ANDROID_ABI} minivpn/minivpn.c)
+target_link_libraries(nopie_openvpn.${ANDROID_ABI} PRIVATE openvpn)
+
+
+# Hack to copy OpenVPN binaries to assets directory
+SET(OVPN_ASSET_DIR ${CMAKE_SOURCE_DIR}/../../../build/ovpnassets)
+file(MAKE_DIRECTORY ${OVPN_ASSET_DIR})
+
+add_custom_command(TARGET nopie_openvpn.${ANDROID_ABI} POST_BUILD
+  COMMAND
+  ${CMAKE_COMMAND} -E copy
+  ${CMAKE_CURRENT_BINARY_DIR}/nopie_openvpn.${ANDROID_ABI}
+  ${OVPN_ASSET_DIR})
+
+add_custom_command(TARGET pie_openvpn.${ANDROID_ABI} POST_BUILD
+  COMMAND
+  ${CMAKE_COMMAND} -E copy
+  ${CMAKE_CURRENT_BINARY_DIR}/pie_openvpn.${ANDROID_ABI}
+  ${OVPN_ASSET_DIR})
diff --git a/main/jni/jbcrypto.cpp b/main/src/main/cpp/jbcrypto/jbcrypto.cpp
index c61ef14f..c61ef14f 100644
--- a/main/jni/jbcrypto.cpp
+++ b/main/src/main/cpp/jbcrypto/jbcrypto.cpp
diff --git a/main/lzo/CMakeLists.txt b/main/src/main/cpp/lzo/#CMakeLists.txt#
index 98c0a1ad..98c0a1ad 100644
--- a/main/lzo/CMakeLists.txt
+++ b/main/src/main/cpp/lzo/#CMakeLists.txt#
diff --git a/main/lzo/AUTHORS b/main/src/main/cpp/lzo/AUTHORS
index d53d32cd..d53d32cd 100644
--- a/main/lzo/AUTHORS
+++ b/main/src/main/cpp/lzo/AUTHORS
diff --git a/main/lzo/Android.mk b/main/src/main/cpp/lzo/Android.mk
index 004be5fb..004be5fb 100644
--- a/main/lzo/Android.mk
+++ b/main/src/main/cpp/lzo/Android.mk
diff --git a/main/lzo/B/00README.TXT b/main/src/main/cpp/lzo/B/00README.TXT
index 17d8ef8e..17d8ef8e 100644
--- a/main/lzo/B/00README.TXT
+++ b/main/src/main/cpp/lzo/B/00README.TXT
diff --git a/main/lzo/B/clean.bat b/main/src/main/cpp/lzo/B/clean.bat
index 1f7de592..1f7de592 100644
--- a/main/lzo/B/clean.bat
+++ b/main/src/main/cpp/lzo/B/clean.bat
diff --git a/main/lzo/B/done.bat b/main/src/main/cpp/lzo/B/done.bat
index b9bf6aa0..b9bf6aa0 100644
--- a/main/lzo/B/done.bat
+++ b/main/src/main/cpp/lzo/B/done.bat
diff --git a/main/lzo/B/dos32/bc_pp.bat b/main/src/main/cpp/lzo/B/dos32/bc_pp.bat
index 1af928a1..1af928a1 100644
--- a/main/lzo/B/dos32/bc_pp.bat
+++ b/main/src/main/cpp/lzo/B/dos32/bc_pp.bat
diff --git a/main/lzo/B/dos32/dj2.bat b/main/src/main/cpp/lzo/B/dos32/dj2.bat
index eb07ff6c..eb07ff6c 100644
--- a/main/lzo/B/dos32/dj2.bat
+++ b/main/src/main/cpp/lzo/B/dos32/dj2.bat
diff --git a/main/lzo/B/dos32/dj2.opt b/main/src/main/cpp/lzo/B/dos32/dj2.opt
index 9cd02cd0..9cd02cd0 100644
--- a/main/lzo/B/dos32/dj2.opt
+++ b/main/src/main/cpp/lzo/B/dos32/dj2.opt
diff --git a/main/lzo/B/dos32/dm.bat b/main/src/main/cpp/lzo/B/dos32/dm.bat
index e3c9e8a1..e3c9e8a1 100644
--- a/main/lzo/B/dos32/dm.bat
+++ b/main/src/main/cpp/lzo/B/dos32/dm.bat
diff --git a/main/lzo/B/dos32/emx.bat b/main/src/main/cpp/lzo/B/dos32/emx.bat
index 2b42003e..2b42003e 100644
--- a/main/lzo/B/dos32/emx.bat
+++ b/main/src/main/cpp/lzo/B/dos32/emx.bat
diff --git a/main/lzo/B/dos32/highc.bat b/main/src/main/cpp/lzo/B/dos32/highc.bat
index db5a1bda..db5a1bda 100644
--- a/main/lzo/B/dos32/highc.bat
+++ b/main/src/main/cpp/lzo/B/dos32/highc.bat
diff --git a/main/lzo/B/dos32/highc.rsp b/main/src/main/cpp/lzo/B/dos32/highc.rsp
index d477b962..d477b962 100644
--- a/main/lzo/B/dos32/highc.rsp
+++ b/main/src/main/cpp/lzo/B/dos32/highc.rsp
diff --git a/main/lzo/B/dos32/ndp.bat b/main/src/main/cpp/lzo/B/dos32/ndp.bat
index 70b3d633..70b3d633 100644
--- a/main/lzo/B/dos32/ndp.bat
+++ b/main/src/main/cpp/lzo/B/dos32/ndp.bat
diff --git a/main/lzo/B/dos32/ndp.rsp b/main/src/main/cpp/lzo/B/dos32/ndp.rsp
index c62b19eb..c62b19eb 100644
--- a/main/lzo/B/dos32/ndp.rsp
+++ b/main/src/main/cpp/lzo/B/dos32/ndp.rsp
diff --git a/main/lzo/B/dos32/sc.bat b/main/src/main/cpp/lzo/B/dos32/sc.bat
index 88be0958..88be0958 100644
--- a/main/lzo/B/dos32/sc.bat
+++ b/main/src/main/cpp/lzo/B/dos32/sc.bat
diff --git a/main/lzo/B/dos32/wc.bat b/main/src/main/cpp/lzo/B/dos32/wc.bat
index 306f982d..306f982d 100644
--- a/main/lzo/B/dos32/wc.bat
+++ b/main/src/main/cpp/lzo/B/dos32/wc.bat
diff --git a/main/lzo/B/dos32/zc.bat b/main/src/main/cpp/lzo/B/dos32/zc.bat
index 2d344cb1..2d344cb1 100644
--- a/main/lzo/B/dos32/zc.bat
+++ b/main/src/main/cpp/lzo/B/dos32/zc.bat
diff --git a/main/lzo/B/generic/Makefile b/main/src/main/cpp/lzo/B/generic/Makefile
index 98f5d9e5..98f5d9e5 100644
--- a/main/lzo/B/generic/Makefile
+++ b/main/src/main/cpp/lzo/B/generic/Makefile
diff --git a/main/lzo/B/generic/build.sh b/main/src/main/cpp/lzo/B/generic/build.sh
index 28f95b54..28f95b54 100755
--- a/main/lzo/B/generic/build.sh
+++ b/main/src/main/cpp/lzo/B/generic/build.sh
diff --git a/main/lzo/B/generic/build_freestanding.sh b/main/src/main/cpp/lzo/B/generic/build_freestanding.sh
index 9d391e9a..9d391e9a 100755
--- a/main/lzo/B/generic/build_freestanding.sh
+++ b/main/src/main/cpp/lzo/B/generic/build_freestanding.sh
diff --git a/main/lzo/B/generic/build_gcc.sh b/main/src/main/cpp/lzo/B/generic/build_gcc.sh
index 241bbf0f..241bbf0f 100755
--- a/main/lzo/B/generic/build_gcc.sh
+++ b/main/src/main/cpp/lzo/B/generic/build_gcc.sh
diff --git a/main/lzo/B/generic/clean.sh b/main/src/main/cpp/lzo/B/generic/clean.sh
index eb7a9680..eb7a9680 100755
--- a/main/lzo/B/generic/clean.sh
+++ b/main/src/main/cpp/lzo/B/generic/clean.sh
diff --git a/main/lzo/B/os2/emx.bat b/main/src/main/cpp/lzo/B/os2/emx.bat
index 182f0497..182f0497 100644
--- a/main/lzo/B/os2/emx.bat
+++ b/main/src/main/cpp/lzo/B/os2/emx.bat
diff --git a/main/lzo/B/os2/wc.bat b/main/src/main/cpp/lzo/B/os2/wc.bat
index cecce7d8..cecce7d8 100644
--- a/main/lzo/B/os2/wc.bat
+++ b/main/src/main/cpp/lzo/B/os2/wc.bat
diff --git a/main/lzo/B/os2/zc.bat b/main/src/main/cpp/lzo/B/os2/zc.bat
index 91bd480d..91bd480d 100644
--- a/main/lzo/B/os2/zc.bat
+++ b/main/src/main/cpp/lzo/B/os2/zc.bat
diff --git a/main/lzo/B/prepare.bat b/main/src/main/cpp/lzo/B/prepare.bat
index 34bac191..34bac191 100644
--- a/main/lzo/B/prepare.bat
+++ b/main/src/main/cpp/lzo/B/prepare.bat
diff --git a/main/lzo/B/src.rsp b/main/src/main/cpp/lzo/B/src.rsp
index 2a1dbce6..2a1dbce6 100644
--- a/main/lzo/B/src.rsp
+++ b/main/src/main/cpp/lzo/B/src.rsp
diff --git a/main/lzo/B/unset.bat b/main/src/main/cpp/lzo/B/unset.bat
index 21672dd6..21672dd6 100644
--- a/main/lzo/B/unset.bat
+++ b/main/src/main/cpp/lzo/B/unset.bat
diff --git a/main/lzo/B/win32/bc.bat b/main/src/main/cpp/lzo/B/win32/bc.bat
index 7124c361..7124c361 100644
--- a/main/lzo/B/win32/bc.bat
+++ b/main/src/main/cpp/lzo/B/win32/bc.bat
diff --git a/main/lzo/B/win32/bc.rsp b/main/src/main/cpp/lzo/B/win32/bc.rsp
index b48a182d..b48a182d 100644
--- a/main/lzo/B/win32/bc.rsp
+++ b/main/src/main/cpp/lzo/B/win32/bc.rsp
diff --git a/main/lzo/B/win32/cygwin.bat b/main/src/main/cpp/lzo/B/win32/cygwin.bat
index 7cc44486..7cc44486 100644
--- a/main/lzo/B/win32/cygwin.bat
+++ b/main/src/main/cpp/lzo/B/win32/cygwin.bat
diff --git a/main/lzo/B/win32/cygwin.rsp b/main/src/main/cpp/lzo/B/win32/cygwin.rsp
index 62eab38c..62eab38c 100644
--- a/main/lzo/B/win32/cygwin.rsp
+++ b/main/src/main/cpp/lzo/B/win32/cygwin.rsp
diff --git a/main/lzo/B/win32/dm.bat b/main/src/main/cpp/lzo/B/win32/dm.bat
index e9f944a3..e9f944a3 100644
--- a/main/lzo/B/win32/dm.bat
+++ b/main/src/main/cpp/lzo/B/win32/dm.bat
diff --git a/main/lzo/B/win32/ic.bat b/main/src/main/cpp/lzo/B/win32/ic.bat
index eeb260bd..eeb260bd 100644
--- a/main/lzo/B/win32/ic.bat
+++ b/main/src/main/cpp/lzo/B/win32/ic.bat
diff --git a/main/lzo/B/win32/lccwin32.bat b/main/src/main/cpp/lzo/B/win32/lccwin32.bat
index bd40d044..bd40d044 100644
--- a/main/lzo/B/win32/lccwin32.bat
+++ b/main/src/main/cpp/lzo/B/win32/lccwin32.bat
diff --git a/main/lzo/B/win32/mingw.bat b/main/src/main/cpp/lzo/B/win32/mingw.bat
index edd9b894..edd9b894 100644
--- a/main/lzo/B/win32/mingw.bat
+++ b/main/src/main/cpp/lzo/B/win32/mingw.bat
diff --git a/main/lzo/B/win32/mwerks.bat b/main/src/main/cpp/lzo/B/win32/mwerks.bat
index cb1a4718..cb1a4718 100644
--- a/main/lzo/B/win32/mwerks.bat
+++ b/main/src/main/cpp/lzo/B/win32/mwerks.bat
diff --git a/main/lzo/B/win32/pellesc.bat b/main/src/main/cpp/lzo/B/win32/pellesc.bat
index 5115be6d..5115be6d 100644
--- a/main/lzo/B/win32/pellesc.bat
+++ b/main/src/main/cpp/lzo/B/win32/pellesc.bat
diff --git a/main/lzo/B/win32/pgi.bat b/main/src/main/cpp/lzo/B/win32/pgi.bat
index a3b37988..a3b37988 100644
--- a/main/lzo/B/win32/pgi.bat
+++ b/main/src/main/cpp/lzo/B/win32/pgi.bat
diff --git a/main/lzo/B/win32/pw32.bat b/main/src/main/cpp/lzo/B/win32/pw32.bat
index 43d5717f..43d5717f 100644
--- a/main/lzo/B/win32/pw32.bat
+++ b/main/src/main/cpp/lzo/B/win32/pw32.bat
diff --git a/main/lzo/B/win32/rsxnt.bat b/main/src/main/cpp/lzo/B/win32/rsxnt.bat
index c72314fc..c72314fc 100644
--- a/main/lzo/B/win32/rsxnt.bat
+++ b/main/src/main/cpp/lzo/B/win32/rsxnt.bat
diff --git a/main/lzo/B/win32/sc.bat b/main/src/main/cpp/lzo/B/win32/sc.bat
index 6f2932f7..6f2932f7 100644
--- a/main/lzo/B/win32/sc.bat
+++ b/main/src/main/cpp/lzo/B/win32/sc.bat
diff --git a/main/lzo/B/win32/vc.bat b/main/src/main/cpp/lzo/B/win32/vc.bat
index f4336af5..f4336af5 100644
--- a/main/lzo/B/win32/vc.bat
+++ b/main/src/main/cpp/lzo/B/win32/vc.bat
diff --git a/main/lzo/B/win32/vc.rsp b/main/src/main/cpp/lzo/B/win32/vc.rsp
index 690bec1c..690bec1c 100644
--- a/main/lzo/B/win32/vc.rsp
+++ b/main/src/main/cpp/lzo/B/win32/vc.rsp
diff --git a/main/lzo/B/win32/vc_dll.bat b/main/src/main/cpp/lzo/B/win32/vc_dll.bat
index ee1f8dec..ee1f8dec 100644
--- a/main/lzo/B/win32/vc_dll.bat
+++ b/main/src/main/cpp/lzo/B/win32/vc_dll.bat
diff --git a/main/lzo/B/win32/vc_dll.def b/main/src/main/cpp/lzo/B/win32/vc_dll.def
index 967cdf16..967cdf16 100644
--- a/main/lzo/B/win32/vc_dll.def
+++ b/main/src/main/cpp/lzo/B/win32/vc_dll.def
diff --git a/main/lzo/B/win32/wc.bat b/main/src/main/cpp/lzo/B/win32/wc.bat
index e7266e5e..e7266e5e 100644
--- a/main/lzo/B/win32/wc.bat
+++ b/main/src/main/cpp/lzo/B/win32/wc.bat
diff --git a/main/lzo/B/win32/wc.rsp b/main/src/main/cpp/lzo/B/win32/wc.rsp
index 503667ba..503667ba 100644
--- a/main/lzo/B/win32/wc.rsp
+++ b/main/src/main/cpp/lzo/B/win32/wc.rsp
diff --git a/main/lzo/B/win64/ic.bat b/main/src/main/cpp/lzo/B/win64/ic.bat
index 4587019c..4587019c 100644
--- a/main/lzo/B/win64/ic.bat
+++ b/main/src/main/cpp/lzo/B/win64/ic.bat
diff --git a/main/lzo/B/win64/ic_dll.bat b/main/src/main/cpp/lzo/B/win64/ic_dll.bat
index 9139822c..9139822c 100644
--- a/main/lzo/B/win64/ic_dll.bat
+++ b/main/src/main/cpp/lzo/B/win64/ic_dll.bat
diff --git a/main/lzo/B/win64/vc.bat b/main/src/main/cpp/lzo/B/win64/vc.bat
index c4429168..c4429168 100644
--- a/main/lzo/B/win64/vc.bat
+++ b/main/src/main/cpp/lzo/B/win64/vc.bat
diff --git a/main/lzo/B/win64/vc.rsp b/main/src/main/cpp/lzo/B/win64/vc.rsp
index 182de60c..182de60c 100644
--- a/main/lzo/B/win64/vc.rsp
+++ b/main/src/main/cpp/lzo/B/win64/vc.rsp
diff --git a/main/lzo/B/win64/vc_dll.bat b/main/src/main/cpp/lzo/B/win64/vc_dll.bat
index bfc26f2f..bfc26f2f 100644
--- a/main/lzo/B/win64/vc_dll.bat
+++ b/main/src/main/cpp/lzo/B/win64/vc_dll.bat
diff --git a/main/lzo/B/win64/vc_dll.def b/main/src/main/cpp/lzo/B/win64/vc_dll.def
index e80a637a..e80a637a 100644
--- a/main/lzo/B/win64/vc_dll.def
+++ b/main/src/main/cpp/lzo/B/win64/vc_dll.def
diff --git a/main/lzo/BUGS b/main/src/main/cpp/lzo/BUGS
index aed77990..aed77990 100644
--- a/main/lzo/BUGS
+++ b/main/src/main/cpp/lzo/BUGS
diff --git a/main/src/main/cpp/lzo/CMakeLists.txt b/main/src/main/cpp/lzo/CMakeLists.txt
new file mode 100644
index 00000000..98c0a1ad
--- /dev/null
+++ b/main/src/main/cpp/lzo/CMakeLists.txt
@@ -0,0 +1,314 @@
+#
+# CMakeLists.txt --- a "CMake" file for building LZO
+#
+# This file is part of the LZO data compression library.
+#   http://www.oberhumer.com/opensource/lzo/
+#
+# Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
+# All Rights Reserved.
+#
+
+cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
+
+#
+# simple usage example (Unix):
+#     mkdir -p build && cd build && cmake .. && make
+#
+# simple usage example (Windows MSVC):
+#     md build
+#     cd build
+#     cmake .. -G "NMake Makefiles"
+#     nmake
+#
+# another usage example (Unix):
+#     mkdir -p build/release-i686
+#     cd       build/release-i686
+#     cmake ../.. -DENABLE_STATIC=0 -DENABLE_SHARED=1 \
+#         -DCMAKE_C_COMPILER=gcc -DCMAKE_C_FLAGS="-m32 -march=i686" \
+#         -DCMAKE_INSTALL_PREFIX=/opt/local/prefix-i686
+#     make VERBOSE=1
+#     make install
+#
+# see http://www.cmake.org/ for more info
+#
+
+# /***********************************************************************
+# // init
+# ************************************************************************/
+
+# Disallow in-source builds. Note that you will still have to manually
+# clean up a few files if you accidentally try an in-source build.
+set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
+set(CMAKE_DISABLE_SOURCE_CHANGES  ON)
+if(",${CMAKE_SOURCE_DIR}," STREQUAL ",${CMAKE_BINARY_DIR},")
+    message(FATAL_ERROR "ERROR: In-source builds are not allowed.")
+endif()
+
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
+endif()
+
+project(lzo VERSION 2.10 LANGUAGES C)
+
+# configuration options
+option(ENABLE_STATIC "Build static LZO library." ON)
+option(ENABLE_SHARED "Build shared LZO library." OFF)
+if(NOT ENABLE_STATIC AND NOT ENABLE_SHARED)
+    set(ENABLE_STATIC ON)
+endif()
+if(ENABLE_SHARED AND WIN32)
+    cmake_minimum_required(VERSION 3.4.3 FATAL_ERROR) # needed for WINDOWS_EXPORT_ALL_SYMBOLS
+endif()
+
+# install directories
+if(NOT CMAKE_INSTALL_PREFIX)
+    message(FATAL_ERROR "ERROR: CMAKE_INSTALL_PREFIX is not defined.")
+endif()
+include(FindPkgConfig QUIET)
+include(GNUInstallDirs)
+
+# /***********************************************************************
+# // targets
+# ************************************************************************/
+
+file(GLOB lzo_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.c")
+list(SORT lzo_SOURCES)
+
+# LZO library
+if(NOT DEFINED lzo_USE_OBJECT_LIB)
+    if(ENABLE_STATIC AND ENABLE_SHARED)
+        if(CMAKE_POSITION_INDEPENDENT_CODE OR MSVC)
+            # all objects are PIC on this system => can share objects
+            set(lzo_USE_OBJECT_LIB 1)
+        endif()
+    endif()
+endif()
+set(lzo_COMPILE_TARGETS )
+if(lzo_USE_OBJECT_LIB)
+    add_library(lzo_object_lib OBJECT ${lzo_SOURCES})
+    list(APPEND lzo_COMPILE_TARGETS lzo_object_lib)
+    set_property(TARGET lzo_object_lib PROPERTY POSITION_INDEPENDENT_CODE ON)
+endif()
+if(ENABLE_STATIC)
+    if(lzo_USE_OBJECT_LIB)
+        add_library(lzo_static_lib STATIC $<TARGET_OBJECTS:lzo_object_lib>)
+    else()
+        add_library(lzo_static_lib STATIC ${lzo_SOURCES})
+        list(APPEND lzo_COMPILE_TARGETS lzo_static_lib)
+    endif()
+    set_target_properties(lzo_static_lib PROPERTIES OUTPUT_NAME lzo2)
+endif()
+if(ENABLE_SHARED)
+    if(lzo_USE_OBJECT_LIB)
+        add_library(lzo_shared_lib SHARED $<TARGET_OBJECTS:lzo_object_lib>)
+    else()
+        add_library(lzo_shared_lib SHARED ${lzo_SOURCES})
+        list(APPEND lzo_COMPILE_TARGETS lzo_shared_lib)
+    endif()
+    set_target_properties(lzo_shared_lib PROPERTIES OUTPUT_NAME lzo2)
+    if(ENABLE_STATIC)
+        # avoid name clash between static lzo2.lib and DLL import-lib lzo2.lib
+        set_target_properties(lzo_shared_lib PROPERTIES ARCHIVE_OUTPUT_NAME lzo2_dllimport)
+    endif()
+    set_target_properties(lzo_shared_lib PROPERTIES SOVERSION 2 VERSION 2.0.0) # ABI version is 2.0.0 !
+    set_target_properties(lzo_shared_lib PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
+endif()
+
+# tests & examples
+macro(lzo_add_executable t)
+    add_executable(${t} ${ARGN})
+    if(ENABLE_STATIC)
+        target_link_libraries(${t} lzo_static_lib)
+    else()
+        target_link_libraries(${t} lzo_shared_lib)
+        if(DEFINED CMAKE_INSTALL_FULL_LIBDIR)
+            set_target_properties(${t} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
+        endif()
+    endif()
+endmacro()
+# main test driver
+lzo_add_executable(lzotest  lzotest/lzotest.c)
+# examples
+lzo_add_executable(dict     examples/dict.c)
+lzo_add_executable(lzopack  examples/lzopack.c)
+lzo_add_executable(overlap  examples/overlap.c)
+lzo_add_executable(precomp  examples/precomp.c)
+lzo_add_executable(precomp2 examples/precomp2.c)
+lzo_add_executable(simple   examples/simple.c)
+# some boring internal test programs
+if(0)
+    lzo_add_executable(align    tests/align.c)
+    lzo_add_executable(chksum   tests/chksum.c)
+    lzo_add_executable(promote  tests/promote.c)
+    lzo_add_executable(sizes    tests/sizes.c)
+endif()
+
+# miniLZO
+if(1)
+    add_executable(testmini minilzo/testmini.c minilzo/minilzo.c)
+    target_include_directories(testmini PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include/lzo") # needed for "lzoconf.h"
+endif()
+
+# /***********************************************************************
+# // compilation flags
+# // this section currently mostly matches the Autoconf version
+# ************************************************************************/
+
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
+
+include(CheckFunctionExists)
+include(CheckIncludeFile)
+include(CheckLibraryExists)
+include(CheckSymbolExists)
+include(CheckTypeSize)
+include(TestBigEndian)
+
+if(MSVC)
+    # disable silly warnings about using "deprecated" POSIX functions like fopen()
+    add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
+    add_definitions(-D_CRT_NONSTDC_NO_WARNINGS)
+    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
+    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+endif()
+
+# Checks for header files
+macro(mfx_check_include_file f var)
+    check_include_file("${f}" "mfx_${var}")
+    if(NOT ",${mfx_${var}}," STREQUAL ",,")
+        add_definitions(-D${var}=1)
+        set(mfx_${var} 1)
+    else()
+        set(mfx_${var} 0)
+    endif()
+endmacro()
+# mfx_ACC_CHECK_HEADERS
+set(l assert.h ctype.h dirent.h errno.h fcntl.h float.h limits.h malloc.h memory.h setjmp.h signal.h stdarg.h stddef.h stdint.h stdio.h stdlib.h string.h strings.h time.h unistd.h utime.h sys/mman.h sys/resource.h sys/stat.h sys/time.h sys/types.h sys/wait.h)
+foreach(f ${l})
+    string(TOUPPER "${f}" var)
+    string(REGEX REPLACE "[^0-9A-Z_]" "_" var "${var}")
+    mfx_check_include_file("${f}" "HAVE_${var}")
+endforeach()
+
+# Checks for typedefs and structures
+macro(mfx_check_type_size type var)
+    check_type_size("${type}" "mfx_${var}")
+    if("${mfx_${var}}" MATCHES "^[1-9][0-9]*$")
+        add_definitions(-D${var}=${mfx_${var}})
+    else()
+        set(mfx_${var} 0)
+    endif()
+endmacro()
+# mfx_ACC_CHECK_SIZEOF + mfx_CHECK_SIZEOF
+set(l short int long "long long" __int16 __int32 __int64 "void *" size_t ptrdiff_t intmax_t uintmax_t intptr_t uintptr_t float double "long double" dev_t fpos_t mode_t off_t ssize_t time_t)
+foreach(f ${l})
+    string(TOUPPER "${f}" var)
+    string(REGEX REPLACE " \\*" "_P" var "${var}")
+    string(REGEX REPLACE "[^0-9A-Z_]" "_" var "${var}")
+    mfx_check_type_size("${f}" "SIZEOF_${var}")
+endforeach()
+
+# Checks for library functions
+macro(mfx_check_function_exists func var)
+    check_function_exists("${func}" "mfx_${var}")
+    if(NOT ",${mfx_${var}}," STREQUAL ",,")
+        add_definitions(-D${var}=1)
+        set(mfx_${var} 1)
+    else()
+        set(mfx_${var} 0)
+    endif()
+endmacro()
+# mfx_ACC_CHECK_FUNCS
+set(l access alloca atexit atoi atol chmod chown clock_getcpuclockid clock_getres clock_gettime ctime difftime fstat getenv getpagesize getrusage gettimeofday gmtime isatty localtime longjmp lstat memcmp memcpy memmove memset mkdir mktime mmap mprotect munmap qsort raise rmdir setjmp signal snprintf strcasecmp strchr strdup strerror strftime stricmp strncasecmp strnicmp strrchr strstr time umask utime vsnprintf)
+foreach(f ${l})
+    string(TOUPPER "${f}" var)
+    string(REGEX REPLACE "[^0-9A-Z_]" "_" var "${var}")
+    mfx_check_function_exists("${f}" "HAVE_${var}")
+endforeach()
+
+# mfx_LZO_CHECK_ENDIAN
+TEST_BIG_ENDIAN(big_endian)
+if ("${big_endian}" MATCHES "^1$")
+    add_definitions(-DLZO_ABI_BIG_ENDIAN=1)
+elseif ("${big_endian}" MATCHES "^0$")
+    add_definitions(-DLZO_ABI_LITTLE_ENDIAN=1)
+else()
+    message(FATAL_ERROR "ERROR: TEST_BIG_ENDIAN failed with result '${big_endian}'.")
+endif()
+
+# LZO_HAVE_CONFIG_H
+add_definitions(-DLZO_CFG_NO_CONFIG_HEADER=1)
+
+# warnings
+foreach(t ${lzo_COMPILE_TARGETS})
+    if(CMAKE_C_COMPILER_ID MATCHES "^(Clang|GNU)$")
+        target_compile_options(${t} PRIVATE -Wall -W -Wcast-qual)
+    endif()
+endforeach()
+
+# /***********************************************************************
+# // "make test"
+# ************************************************************************/
+
+include(CTest)
+add_test(NAME simple     COMMAND simple)
+add_test(NAME testmini   COMMAND testmini)
+add_test(NAME lzotest-01 COMMAND lzotest -mlzo   -n2  -q "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
+add_test(NAME lzotest-02 COMMAND lzotest -mavail -n10 -q "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
+add_test(NAME lzotest-03 COMMAND lzotest -mall   -n10 -q "${CMAKE_CURRENT_SOURCE_DIR}/include/lzo/lzodefs.h")
+
+# /***********************************************************************
+# // "make install"
+# ************************************************************************/
+
+if(DEFINED CMAKE_INSTALL_FULL_LIBDIR)
+
+set(f AUTHORS COPYING NEWS THANKS doc/LZO.FAQ doc/LZO.TXT doc/LZOAPI.TXT)
+install(FILES ${f} DESTINATION "${CMAKE_INSTALL_FULL_DOCDIR}")
+
+set(f include/lzo/lzo1.h include/lzo/lzo1a.h include/lzo/lzo1b.h
+    include/lzo/lzo1c.h include/lzo/lzo1f.h include/lzo/lzo1x.h
+    include/lzo/lzo1y.h include/lzo/lzo1z.h include/lzo/lzo2a.h
+    include/lzo/lzo_asm.h include/lzo/lzoconf.h include/lzo/lzodefs.h
+    include/lzo/lzoutil.h
+)
+install(FILES ${f} DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/lzo")
+
+if(ENABLE_STATIC)
+    install(TARGETS lzo_static_lib ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
+endif()
+if(ENABLE_SHARED)
+    install(TARGETS lzo_shared_lib
+        ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+        LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+        RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
+    )
+endif()
+
+if(1)
+    set(f lzopack lzotest simple testmini) # examples
+    install(TARGETS ${f} DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/lzo/examples")
+endif()
+
+if(PKG_CONFIG_FOUND)
+    configure_file(lzo2.pc.cmakein lzo2.pc @ONLY)
+    #if(EXISTS "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lzo2.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
+    #endif()
+endif()
+
+endif() # CMAKE_INSTALL_FULL_LIBDIR
+
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.maint.txt")
+include("${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.maint.txt")
+endif()
+
+# finally print some info about the build-type
+if(CMAKE_CONFIGURATION_TYPES)
+message(STATUS "CMAKE_CONFIGURATION_TYPES = ${CMAKE_CONFIGURATION_TYPES}")
+endif()
+if(CMAKE_BUILD_TYPE)
+message(STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}")
+endif()
+
+# vim:set ft=cmake ts=4 sw=4 tw=0 et:
diff --git a/main/lzo/COPYING b/main/src/main/cpp/lzo/COPYING
index d159169d..d159169d 100644
--- a/main/lzo/COPYING
+++ b/main/src/main/cpp/lzo/COPYING
diff --git a/main/lzo/ChangeLog b/main/src/main/cpp/lzo/ChangeLog
index 755db71e..755db71e 100644
--- a/main/lzo/ChangeLog
+++ b/main/src/main/cpp/lzo/ChangeLog
diff --git a/main/lzo/INSTALL b/main/src/main/cpp/lzo/INSTALL
index 886ee504..886ee504 100644
--- a/main/lzo/INSTALL
+++ b/main/src/main/cpp/lzo/INSTALL
diff --git a/main/lzo/Makefile.am b/main/src/main/cpp/lzo/Makefile.am
index e4d383b1..e4d383b1 100644
--- a/main/lzo/Makefile.am
+++ b/main/src/main/cpp/lzo/Makefile.am
diff --git a/main/lzo/Makefile.in b/main/src/main/cpp/lzo/Makefile.in
index dd71d85f..dd71d85f 100644
--- a/main/lzo/Makefile.in
+++ b/main/src/main/cpp/lzo/Makefile.in
diff --git a/main/lzo/NEWS b/main/src/main/cpp/lzo/NEWS
index 4c2bbda0..4c2bbda0 100644
--- a/main/lzo/NEWS
+++ b/main/src/main/cpp/lzo/NEWS
diff --git a/main/lzo/README b/main/src/main/cpp/lzo/README
index 9d1d3319..9d1d3319 100644
--- a/main/lzo/README
+++ b/main/src/main/cpp/lzo/README
diff --git a/main/lzo/THANKS b/main/src/main/cpp/lzo/THANKS
index cf09bdf6..cf09bdf6 100644
--- a/main/lzo/THANKS
+++ b/main/src/main/cpp/lzo/THANKS
diff --git a/main/lzo/aclocal.m4 b/main/src/main/cpp/lzo/aclocal.m4
index 1f3e24f5..1f3e24f5 100644
--- a/main/lzo/aclocal.m4
+++ b/main/src/main/cpp/lzo/aclocal.m4
diff --git a/main/lzo/asm/i386/00README.TXT b/main/src/main/cpp/lzo/asm/i386/00README.TXT
index 81b01423..81b01423 100644
--- a/main/lzo/asm/i386/00README.TXT
+++ b/main/src/main/cpp/lzo/asm/i386/00README.TXT
diff --git a/main/lzo/asm/i386/obj/coff32/lzo1c_s1.o b/main/src/main/cpp/lzo/asm/i386/obj/coff32/lzo1c_s1.o
index 8379dbe9..8379dbe9 100644
--- a/main/lzo/asm/i386/obj/coff32/lzo1c_s1.o
+++ b/main/src/main/cpp/lzo/asm/i386/obj/coff32/lzo1c_s1.o
diff --git a/main/lzo/asm/i386/obj/coff32/lzo1f_f1.o b/main/src/main/cpp/lzo/asm/i386/obj/coff32/lzo1f_f1.o
index bce69fa9..bce69fa9 100644
--- a/main/lzo/asm/i386/obj/coff32/lzo1f_f1.o
+++ b/main/src/main/cpp/lzo/asm/i386/obj/coff32/lzo1f_f1.o
diff --git a/main/lzo/asm/i386/obj/coff32/lzo1x_f1.o b/main/src/main/cpp/lzo/asm/i386/obj/coff32/lzo1x_f1.o
index 438d0263..438d0263 100644
--- a/main/lzo/asm/i386/obj/coff32/lzo1x_f1.o
+++ b/main/src/main/cpp/lzo/asm/i386/obj/coff32/lzo1x_f1.o
diff --git a/main/lzo/asm/i386/obj/coff32/lzo1x_s1.o b/main/src/main/cpp/lzo/asm/i386/obj/coff32/lzo1x_s1.o
index b178f0d6..b178f0d6 100644
--- a/main/lzo/asm/i386/obj/coff32/lzo1x_s1.o
+++ b/main/src/main/cpp/lzo/asm/i386/obj/coff32/lzo1x_s1.o
diff --git a/main/lzo/asm/i386/obj/coff32/lzo1y_f1.o b/main/src/main/cpp/lzo/asm/i386/obj/coff32/lzo1y_f1.o
index f0ddcf98..f0ddcf98 100644
--- a/main/lzo/asm/i386/obj/coff32/lzo1y_f1.o
+++ b/main/src/main/cpp/lzo/asm/i386/obj/coff32/lzo1y_f1.o
diff --git a/main/lzo/asm/i386/obj/coff32/lzo1y_s1.o b/main/src/main/cpp/lzo/asm/i386/obj/coff32/lzo1y_s1.o
index 0beadb14..0beadb14 100644
--- a/main/lzo/asm/i386/obj/coff32/lzo1y_s1.o
+++ b/main/src/main/cpp/lzo/asm/i386/obj/coff32/lzo1y_s1.o
diff --git a/main/lzo/asm/i386/obj/elf32/lzo1c_s1.o b/main/src/main/cpp/lzo/asm/i386/obj/elf32/lzo1c_s1.o
index eb4429e2..eb4429e2 100644
--- a/main/lzo/asm/i386/obj/elf32/lzo1c_s1.o
+++ b/main/src/main/cpp/lzo/asm/i386/obj/elf32/lzo1c_s1.o
diff --git a/main/lzo/asm/i386/obj/elf32/lzo1f_f1.o b/main/src/main/cpp/lzo/asm/i386/obj/elf32/lzo1f_f1.o
index 3134a85f..3134a85f 100644
--- a/main/lzo/asm/i386/obj/elf32/lzo1f_f1.o
+++ b/main/src/main/cpp/lzo/asm/i386/obj/elf32/lzo1f_f1.o
diff --git a/main/lzo/asm/i386/obj/elf32/lzo1x_f1.o b/main/src/main/cpp/lzo/asm/i386/obj/elf32/lzo1x_f1.o
index fc96ecce..fc96ecce 100644
--- a/main/lzo/asm/i386/obj/elf32/lzo1x_f1.o
+++ b/main/src/main/cpp/lzo/asm/i386/obj/elf32/lzo1x_f1.o
diff --git a/main/lzo/asm/i386/obj/elf32/lzo1x_s1.o b/main/src/main/cpp/lzo/asm/i386/obj/elf32/lzo1x_s1.o
index 817386dd..817386dd 100644
--- a/main/lzo/asm/i386/obj/elf32/lzo1x_s1.o
+++ b/main/src/main/cpp/lzo/asm/i386/obj/elf32/lzo1x_s1.o
diff --git a/main/lzo/asm/i386/obj/elf32/lzo1y_f1.o b/main/src/main/cpp/lzo/asm/i386/obj/elf32/lzo1y_f1.o
index 15300e80..15300e80 100644
--- a/main/lzo/asm/i386/obj/elf32/lzo1y_f1.o
+++ b/main/src/main/cpp/lzo/asm/i386/obj/elf32/lzo1y_f1.o
diff --git a/main/lzo/asm/i386/obj/elf32/lzo1y_s1.o b/main/src/main/cpp/lzo/asm/i386/obj/elf32/lzo1y_s1.o
index 2fdd42e4..2fdd42e4 100644
--- a/main/lzo/asm/i386/obj/elf32/lzo1y_s1.o
+++ b/main/src/main/cpp/lzo/asm/i386/obj/elf32/lzo1y_s1.o
diff --git a/main/lzo/asm/i386/obj/macho32/lzo1c_s1.o b/main/src/main/cpp/lzo/asm/i386/obj/macho32/lzo1c_s1.o
index d70edd91..d70edd91 100644
--- a/main/lzo/asm/i386/obj/macho32/lzo1c_s1.o
+++ b/main/src/main/cpp/lzo/asm/i386/obj/macho32/lzo1c_s1.o
diff --git a/main/lzo/asm/i386/obj/macho32/lzo1f_f1.o b/main/src/main/cpp/lzo/asm/i386/obj/macho32/lzo1f_f1.o
index 06cc4909..06cc4909 100644
--- a/main/lzo/asm/i386/obj/macho32/lzo1f_f1.o
+++ b/main/src/main/cpp/lzo/asm/i386/obj/macho32/lzo1f_f1.o
diff --git a/main/lzo/asm/i386/obj/macho32/lzo1x_f1.o b/main/src/main/cpp/lzo/asm/i386/obj/macho32/lzo1x_f1.o
index 3644103a..3644103a 100644
--- a/main/lzo/asm/i386/obj/macho32/lzo1x_f1.o
+++ b/main/src/main/cpp/lzo/asm/i386/obj/macho32/lzo1x_f1.o
diff --git a/main/lzo/asm/i386/obj/macho32/lzo1x_s1.o b/main/src/main/cpp/lzo/asm/i386/obj/macho32/lzo1x_s1.o
index 79edb273..79edb273 100644
--- a/main/lzo/asm/i386/obj/macho32/lzo1x_s1.o
+++ b/main/src/main/cpp/lzo/asm/i386/obj/macho32/lzo1x_s1.o
diff --git a/main/lzo/asm/i386/obj/macho32/lzo1y_f1.o b/main/src/main/cpp/lzo/asm/i386/obj/macho32/lzo1y_f1.o
index 68e0a005..68e0a005 100644
--- a/main/lzo/asm/i386/obj/macho32/lzo1y_f1.o
+++ b/main/src/main/cpp/lzo/asm/i386/obj/macho32/lzo1y_f1.o
diff --git a/main/lzo/asm/i386/obj/macho32/lzo1y_s1.o b/main/src/main/cpp/lzo/asm/i386/obj/macho32/lzo1y_s1.o
index f47ecade..f47ecade 100644
--- a/main/lzo/asm/i386/obj/macho32/lzo1y_s1.o
+++ b/main/src/main/cpp/lzo/asm/i386/obj/macho32/lzo1y_s1.o
diff --git a/main/lzo/asm/i386/obj/omf32/lzo1c_s1.obj b/main/src/main/cpp/lzo/asm/i386/obj/omf32/lzo1c_s1.obj
index 57bc1d70..57bc1d70 100644
--- a/main/lzo/asm/i386/obj/omf32/lzo1c_s1.obj
+++ b/main/src/main/cpp/lzo/asm/i386/obj/omf32/lzo1c_s1.obj
diff --git a/main/lzo/asm/i386/obj/omf32/lzo1f_f1.obj b/main/src/main/cpp/lzo/asm/i386/obj/omf32/lzo1f_f1.obj
index 2b08c972..2b08c972 100644
--- a/main/lzo/asm/i386/obj/omf32/lzo1f_f1.obj
+++ b/main/src/main/cpp/lzo/asm/i386/obj/omf32/lzo1f_f1.obj
diff --git a/main/lzo/asm/i386/obj/omf32/lzo1x_f1.obj b/main/src/main/cpp/lzo/asm/i386/obj/omf32/lzo1x_f1.obj
index 5720ecb9..5720ecb9 100644
--- a/main/lzo/asm/i386/obj/omf32/lzo1x_f1.obj
+++ b/main/src/main/cpp/lzo/asm/i386/obj/omf32/lzo1x_f1.obj
diff --git a/main/lzo/asm/i386/obj/omf32/lzo1x_s1.obj b/main/src/main/cpp/lzo/asm/i386/obj/omf32/lzo1x_s1.obj
index 68d6c159..68d6c159 100644
--- a/main/lzo/asm/i386/obj/omf32/lzo1x_s1.obj
+++ b/main/src/main/cpp/lzo/asm/i386/obj/omf32/lzo1x_s1.obj
diff --git a/main/lzo/asm/i386/obj/omf32/lzo1y_f1.obj b/main/src/main/cpp/lzo/asm/i386/obj/omf32/lzo1y_f1.obj
index d5102cde..d5102cde 100644
--- a/main/lzo/asm/i386/obj/omf32/lzo1y_f1.obj
+++ b/main/src/main/cpp/lzo/asm/i386/obj/omf32/lzo1y_f1.obj
diff --git a/main/lzo/asm/i386/obj/omf32/lzo1y_s1.obj b/main/src/main/cpp/lzo/asm/i386/obj/omf32/lzo1y_s1.obj
index 29859c28..29859c28 100644
--- a/main/lzo/asm/i386/obj/omf32/lzo1y_s1.obj
+++ b/main/src/main/cpp/lzo/asm/i386/obj/omf32/lzo1y_s1.obj
diff --git a/main/lzo/asm/i386/obj/win32/lzo1c_s1.obj b/main/src/main/cpp/lzo/asm/i386/obj/win32/lzo1c_s1.obj
index b9703e8c..b9703e8c 100644
--- a/main/lzo/asm/i386/obj/win32/lzo1c_s1.obj
+++ b/main/src/main/cpp/lzo/asm/i386/obj/win32/lzo1c_s1.obj
diff --git a/main/lzo/asm/i386/obj/win32/lzo1f_f1.obj b/main/src/main/cpp/lzo/asm/i386/obj/win32/lzo1f_f1.obj
index e0c0295f..e0c0295f 100644
--- a/main/lzo/asm/i386/obj/win32/lzo1f_f1.obj
+++ b/main/src/main/cpp/lzo/asm/i386/obj/win32/lzo1f_f1.obj
diff --git a/main/lzo/asm/i386/obj/win32/lzo1x_f1.obj b/main/src/main/cpp/lzo/asm/i386/obj/win32/lzo1x_f1.obj
index c6c1f806..c6c1f806 100644
--- a/main/lzo/asm/i386/obj/win32/lzo1x_f1.obj
+++ b/main/src/main/cpp/lzo/asm/i386/obj/win32/lzo1x_f1.obj
diff --git a/main/lzo/asm/i386/obj/win32/lzo1x_s1.obj b/main/src/main/cpp/lzo/asm/i386/obj/win32/lzo1x_s1.obj
index b95eb969..b95eb969 100644
--- a/main/lzo/asm/i386/obj/win32/lzo1x_s1.obj
+++ b/main/src/main/cpp/lzo/asm/i386/obj/win32/lzo1x_s1.obj
diff --git a/main/lzo/asm/i386/obj/win32/lzo1y_f1.obj b/main/src/main/cpp/lzo/asm/i386/obj/win32/lzo1y_f1.obj
index 30827912..30827912 100644
--- a/main/lzo/asm/i386/obj/win32/lzo1y_f1.obj
+++ b/main/src/main/cpp/lzo/asm/i386/obj/win32/lzo1y_f1.obj
diff --git a/main/lzo/asm/i386/obj/win32/lzo1y_s1.obj b/main/src/main/cpp/lzo/asm/i386/obj/win32/lzo1y_s1.obj
index 1c34c7be..1c34c7be 100644
--- a/main/lzo/asm/i386/obj/win32/lzo1y_s1.obj
+++ b/main/src/main/cpp/lzo/asm/i386/obj/win32/lzo1y_s1.obj
diff --git a/main/lzo/asm/i386/src/enter.ash b/main/src/main/cpp/lzo/asm/i386/src/enter.ash
index cc5941b9..cc5941b9 100644
--- a/main/lzo/asm/i386/src/enter.ash
+++ b/main/src/main/cpp/lzo/asm/i386/src/enter.ash
diff --git a/main/lzo/asm/i386/src/leave.ash b/main/src/main/cpp/lzo/asm/i386/src/leave.ash
index dbaeda03..dbaeda03 100644
--- a/main/lzo/asm/i386/src/leave.ash
+++ b/main/src/main/cpp/lzo/asm/i386/src/leave.ash
diff --git a/main/lzo/asm/i386/src/lzo1c_d.ash b/main/src/main/cpp/lzo/asm/i386/src/lzo1c_d.ash
index 0d410243..0d410243 100644
--- a/main/lzo/asm/i386/src/lzo1c_d.ash
+++ b/main/src/main/cpp/lzo/asm/i386/src/lzo1c_d.ash
diff --git a/main/lzo/asm/i386/src/lzo1c_s1.S b/main/src/main/cpp/lzo/asm/i386/src/lzo1c_s1.S
index 03ca397b..03ca397b 100644
--- a/main/lzo/asm/i386/src/lzo1c_s1.S
+++ b/main/src/main/cpp/lzo/asm/i386/src/lzo1c_s1.S
diff --git a/main/lzo/asm/i386/src/lzo1f_d.ash b/main/src/main/cpp/lzo/asm/i386/src/lzo1f_d.ash
index 99093f68..99093f68 100644
--- a/main/lzo/asm/i386/src/lzo1f_d.ash
+++ b/main/src/main/cpp/lzo/asm/i386/src/lzo1f_d.ash
diff --git a/main/lzo/asm/i386/src/lzo1f_f1.S b/main/src/main/cpp/lzo/asm/i386/src/lzo1f_f1.S
index 212b62f4..212b62f4 100644
--- a/main/lzo/asm/i386/src/lzo1f_f1.S
+++ b/main/src/main/cpp/lzo/asm/i386/src/lzo1f_f1.S
diff --git a/main/lzo/asm/i386/src/lzo1x_d.ash b/main/src/main/cpp/lzo/asm/i386/src/lzo1x_d.ash
index 4635a2ad..4635a2ad 100644
--- a/main/lzo/asm/i386/src/lzo1x_d.ash
+++ b/main/src/main/cpp/lzo/asm/i386/src/lzo1x_d.ash
diff --git a/main/lzo/asm/i386/src/lzo1x_f1.S b/main/src/main/cpp/lzo/asm/i386/src/lzo1x_f1.S
index 4f02add5..4f02add5 100644
--- a/main/lzo/asm/i386/src/lzo1x_f1.S
+++ b/main/src/main/cpp/lzo/asm/i386/src/lzo1x_f1.S
diff --git a/main/lzo/asm/i386/src/lzo1x_s1.S b/main/src/main/cpp/lzo/asm/i386/src/lzo1x_s1.S
index d706fc2a..d706fc2a 100644
--- a/main/lzo/asm/i386/src/lzo1x_s1.S
+++ b/main/src/main/cpp/lzo/asm/i386/src/lzo1x_s1.S
diff --git a/main/lzo/asm/i386/src/lzo1y_f1.S b/main/src/main/cpp/lzo/asm/i386/src/lzo1y_f1.S
index 2982c32d..2982c32d 100644
--- a/main/lzo/asm/i386/src/lzo1y_f1.S
+++ b/main/src/main/cpp/lzo/asm/i386/src/lzo1y_f1.S
diff --git a/main/lzo/asm/i386/src/lzo1y_s1.S b/main/src/main/cpp/lzo/asm/i386/src/lzo1y_s1.S
index ddf8574a..ddf8574a 100644
--- a/main/lzo/asm/i386/src/lzo1y_s1.S
+++ b/main/src/main/cpp/lzo/asm/i386/src/lzo1y_s1.S
diff --git a/main/lzo/asm/i386/src/lzo_asm.h b/main/src/main/cpp/lzo/asm/i386/src/lzo_asm.h
index 7227b31a..7227b31a 100644
--- a/main/lzo/asm/i386/src/lzo_asm.h
+++ b/main/src/main/cpp/lzo/asm/i386/src/lzo_asm.h
diff --git a/main/lzo/asm/i386/src_gas/all/asm_all.S b/main/src/main/cpp/lzo/asm/i386/src_gas/all/asm_all.S
index 8aa67cbe..8aa67cbe 100644
--- a/main/lzo/asm/i386/src_gas/all/asm_all.S
+++ b/main/src/main/cpp/lzo/asm/i386/src_gas/all/asm_all.S
diff --git a/main/lzo/asm/i386/src_gas/asminit.def b/main/src/main/cpp/lzo/asm/i386/src_gas/asminit.def
index 0f1859ef..0f1859ef 100644
--- a/main/lzo/asm/i386/src_gas/asminit.def
+++ b/main/src/main/cpp/lzo/asm/i386/src_gas/asminit.def
diff --git a/main/lzo/asm/i386/src_gas/lzo1c_s1.S b/main/src/main/cpp/lzo/asm/i386/src_gas/lzo1c_s1.S
index 374e60f0..374e60f0 100644
--- a/main/lzo/asm/i386/src_gas/lzo1c_s1.S
+++ b/main/src/main/cpp/lzo/asm/i386/src_gas/lzo1c_s1.S
diff --git a/main/lzo/asm/i386/src_gas/lzo1f_f1.S b/main/src/main/cpp/lzo/asm/i386/src_gas/lzo1f_f1.S
index 4c5427bb..4c5427bb 100644
--- a/main/lzo/asm/i386/src_gas/lzo1f_f1.S
+++ b/main/src/main/cpp/lzo/asm/i386/src_gas/lzo1f_f1.S
diff --git a/main/lzo/asm/i386/src_gas/lzo1x_f1.S b/main/src/main/cpp/lzo/asm/i386/src_gas/lzo1x_f1.S
index 9ca92c34..9ca92c34 100644
--- a/main/lzo/asm/i386/src_gas/lzo1x_f1.S
+++ b/main/src/main/cpp/lzo/asm/i386/src_gas/lzo1x_f1.S
diff --git a/main/lzo/asm/i386/src_gas/lzo1x_s1.S b/main/src/main/cpp/lzo/asm/i386/src_gas/lzo1x_s1.S
index 3e31c182..3e31c182 100644
--- a/main/lzo/asm/i386/src_gas/lzo1x_s1.S
+++ b/main/src/main/cpp/lzo/asm/i386/src_gas/lzo1x_s1.S
diff --git a/main/lzo/asm/i386/src_gas/lzo1y_f1.S b/main/src/main/cpp/lzo/asm/i386/src_gas/lzo1y_f1.S
index b3129c39..b3129c39 100644
--- a/main/lzo/asm/i386/src_gas/lzo1y_f1.S
+++ b/main/src/main/cpp/lzo/asm/i386/src_gas/lzo1y_f1.S
diff --git a/main/lzo/asm/i386/src_gas/lzo1y_s1.S b/main/src/main/cpp/lzo/asm/i386/src_gas/lzo1y_s1.S
index c67db49d..c67db49d 100644
--- a/main/lzo/asm/i386/src_gas/lzo1y_s1.S
+++ b/main/src/main/cpp/lzo/asm/i386/src_gas/lzo1y_s1.S
diff --git a/main/lzo/asm/i386/src_masm/all/asm_all.asm b/main/src/main/cpp/lzo/asm/i386/src_masm/all/asm_all.asm
index 58ae4708..58ae4708 100644
--- a/main/lzo/asm/i386/src_masm/all/asm_all.asm
+++ b/main/src/main/cpp/lzo/asm/i386/src_masm/all/asm_all.asm
diff --git a/main/lzo/asm/i386/src_masm/asminit.def b/main/src/main/cpp/lzo/asm/i386/src_masm/asminit.def
index 5754d787..5754d787 100644
--- a/main/lzo/asm/i386/src_masm/asminit.def
+++ b/main/src/main/cpp/lzo/asm/i386/src_masm/asminit.def
diff --git a/main/lzo/asm/i386/src_masm/lzo1c_s1.asm b/main/src/main/cpp/lzo/asm/i386/src_masm/lzo1c_s1.asm
index 67016e35..67016e35 100644
--- a/main/lzo/asm/i386/src_masm/lzo1c_s1.asm
+++ b/main/src/main/cpp/lzo/asm/i386/src_masm/lzo1c_s1.asm
diff --git a/main/lzo/asm/i386/src_masm/lzo1f_f1.asm b/main/src/main/cpp/lzo/asm/i386/src_masm/lzo1f_f1.asm
index f1252af9..f1252af9 100644
--- a/main/lzo/asm/i386/src_masm/lzo1f_f1.asm
+++ b/main/src/main/cpp/lzo/asm/i386/src_masm/lzo1f_f1.asm
diff --git a/main/lzo/asm/i386/src_masm/lzo1x_f1.asm b/main/src/main/cpp/lzo/asm/i386/src_masm/lzo1x_f1.asm
index 95feaa21..95feaa21 100644
--- a/main/lzo/asm/i386/src_masm/lzo1x_f1.asm
+++ b/main/src/main/cpp/lzo/asm/i386/src_masm/lzo1x_f1.asm
diff --git a/main/lzo/asm/i386/src_masm/lzo1x_s1.asm b/main/src/main/cpp/lzo/asm/i386/src_masm/lzo1x_s1.asm
index 4af988a3..4af988a3 100644
--- a/main/lzo/asm/i386/src_masm/lzo1x_s1.asm
+++ b/main/src/main/cpp/lzo/asm/i386/src_masm/lzo1x_s1.asm
diff --git a/main/lzo/asm/i386/src_masm/lzo1y_f1.asm b/main/src/main/cpp/lzo/asm/i386/src_masm/lzo1y_f1.asm
index d86112ac..d86112ac 100644
--- a/main/lzo/asm/i386/src_masm/lzo1y_f1.asm
+++ b/main/src/main/cpp/lzo/asm/i386/src_masm/lzo1y_f1.asm
diff --git a/main/lzo/asm/i386/src_masm/lzo1y_s1.asm b/main/src/main/cpp/lzo/asm/i386/src_masm/lzo1y_s1.asm
index 3c4ab481..3c4ab481 100644
--- a/main/lzo/asm/i386/src_masm/lzo1y_s1.asm
+++ b/main/src/main/cpp/lzo/asm/i386/src_masm/lzo1y_s1.asm
diff --git a/main/lzo/asm/i386/src_nasm/all/asm_all.asm b/main/src/main/cpp/lzo/asm/i386/src_nasm/all/asm_all.asm
index 87260c08..87260c08 100644
--- a/main/lzo/asm/i386/src_nasm/all/asm_all.asm
+++ b/main/src/main/cpp/lzo/asm/i386/src_nasm/all/asm_all.asm
diff --git a/main/lzo/asm/i386/src_nasm/asminit.def b/main/src/main/cpp/lzo/asm/i386/src_nasm/asminit.def
index db792afc..db792afc 100644
--- a/main/lzo/asm/i386/src_nasm/asminit.def
+++ b/main/src/main/cpp/lzo/asm/i386/src_nasm/asminit.def
diff --git a/main/lzo/asm/i386/src_nasm/lzo1c_s1.asm b/main/src/main/cpp/lzo/asm/i386/src_nasm/lzo1c_s1.asm
index cb408e0d..cb408e0d 100644
--- a/main/lzo/asm/i386/src_nasm/lzo1c_s1.asm
+++ b/main/src/main/cpp/lzo/asm/i386/src_nasm/lzo1c_s1.asm
diff --git a/main/lzo/asm/i386/src_nasm/lzo1f_f1.asm b/main/src/main/cpp/lzo/asm/i386/src_nasm/lzo1f_f1.asm
index ebad1fd7..ebad1fd7 100644
--- a/main/lzo/asm/i386/src_nasm/lzo1f_f1.asm
+++ b/main/src/main/cpp/lzo/asm/i386/src_nasm/lzo1f_f1.asm
diff --git a/main/lzo/asm/i386/src_nasm/lzo1x_f1.asm b/main/src/main/cpp/lzo/asm/i386/src_nasm/lzo1x_f1.asm
index e5594740..e5594740 100644
--- a/main/lzo/asm/i386/src_nasm/lzo1x_f1.asm
+++ b/main/src/main/cpp/lzo/asm/i386/src_nasm/lzo1x_f1.asm
diff --git a/main/lzo/asm/i386/src_nasm/lzo1x_s1.asm b/main/src/main/cpp/lzo/asm/i386/src_nasm/lzo1x_s1.asm
index cd4cb71d..cd4cb71d 100644
--- a/main/lzo/asm/i386/src_nasm/lzo1x_s1.asm
+++ b/main/src/main/cpp/lzo/asm/i386/src_nasm/lzo1x_s1.asm
diff --git a/main/lzo/asm/i386/src_nasm/lzo1y_f1.asm b/main/src/main/cpp/lzo/asm/i386/src_nasm/lzo1y_f1.asm
index 6c65bb1c..6c65bb1c 100644
--- a/main/lzo/asm/i386/src_nasm/lzo1y_f1.asm
+++ b/main/src/main/cpp/lzo/asm/i386/src_nasm/lzo1y_f1.asm
diff --git a/main/lzo/asm/i386/src_nasm/lzo1y_s1.asm b/main/src/main/cpp/lzo/asm/i386/src_nasm/lzo1y_s1.asm
index 08aeec31..08aeec31 100644
--- a/main/lzo/asm/i386/src_nasm/lzo1y_s1.asm
+++ b/main/src/main/cpp/lzo/asm/i386/src_nasm/lzo1y_s1.asm
diff --git a/main/lzo/autoconf/ar-lib b/main/src/main/cpp/lzo/autoconf/ar-lib
index 05094d34..05094d34 100755
--- a/main/lzo/autoconf/ar-lib
+++ b/main/src/main/cpp/lzo/autoconf/ar-lib
diff --git a/main/lzo/autoconf/compile b/main/src/main/cpp/lzo/autoconf/compile
index 2ab71e4e..2ab71e4e 100755
--- a/main/lzo/autoconf/compile
+++ b/main/src/main/cpp/lzo/autoconf/compile
diff --git a/main/lzo/autoconf/config.guess b/main/src/main/cpp/lzo/autoconf/config.guess
index 1000e2bd..1000e2bd 100755
--- a/main/lzo/autoconf/config.guess
+++ b/main/src/main/cpp/lzo/autoconf/config.guess
diff --git a/main/lzo/autoconf/config.rpath b/main/src/main/cpp/lzo/autoconf/config.rpath
index af3c4155..af3c4155 100755
--- a/main/lzo/autoconf/config.rpath
+++ b/main/src/main/cpp/lzo/autoconf/config.rpath
diff --git a/main/lzo/autoconf/config.sub b/main/src/main/cpp/lzo/autoconf/config.sub
index 87abeab6..87abeab6 100755
--- a/main/lzo/autoconf/config.sub
+++ b/main/src/main/cpp/lzo/autoconf/config.sub
diff --git a/main/lzo/autoconf/depcomp b/main/src/main/cpp/lzo/autoconf/depcomp
index b6872321..b6872321 100755
--- a/main/lzo/autoconf/depcomp
+++ b/main/src/main/cpp/lzo/autoconf/depcomp
diff --git a/main/lzo/autoconf/install-sh b/main/src/main/cpp/lzo/autoconf/install-sh
index 0360b79e..0360b79e 100755
--- a/main/lzo/autoconf/install-sh
+++ b/main/src/main/cpp/lzo/autoconf/install-sh
diff --git a/main/lzo/autoconf/local.m4 b/main/src/main/cpp/lzo/autoconf/local.m4
index 978f7dc1..978f7dc1 100644
--- a/main/lzo/autoconf/local.m4
+++ b/main/src/main/cpp/lzo/autoconf/local.m4
diff --git a/main/lzo/autoconf/ltmain.sh b/main/src/main/cpp/lzo/autoconf/ltmain.sh
index a50a21a6..a50a21a6 100644
--- a/main/lzo/autoconf/ltmain.sh
+++ b/main/src/main/cpp/lzo/autoconf/ltmain.sh
diff --git a/main/lzo/autoconf/mdate-sh b/main/src/main/cpp/lzo/autoconf/mdate-sh
index f80075c0..f80075c0 100755
--- a/main/lzo/autoconf/mdate-sh
+++ b/main/src/main/cpp/lzo/autoconf/mdate-sh
diff --git a/main/lzo/autoconf/missing b/main/src/main/cpp/lzo/autoconf/missing
index c6e37958..c6e37958 100755
--- a/main/lzo/autoconf/missing
+++ b/main/src/main/cpp/lzo/autoconf/missing
diff --git a/main/lzo/autoconf/mkinstalldirs b/main/src/main/cpp/lzo/autoconf/mkinstalldirs
index a31ce6d0..a31ce6d0 100755
--- a/main/lzo/autoconf/mkinstalldirs
+++ b/main/src/main/cpp/lzo/autoconf/mkinstalldirs
diff --git a/main/lzo/autoconf/py-compile b/main/src/main/cpp/lzo/autoconf/py-compile
index 3693d96b..3693d96b 100755
--- a/main/lzo/autoconf/py-compile
+++ b/main/src/main/cpp/lzo/autoconf/py-compile
diff --git a/main/lzo/autoconf/shtool b/main/src/main/cpp/lzo/autoconf/shtool
index a1f4e7ee..a1f4e7ee 100755
--- a/main/lzo/autoconf/shtool
+++ b/main/src/main/cpp/lzo/autoconf/shtool
diff --git a/main/lzo/autoconf/ylwrap b/main/src/main/cpp/lzo/autoconf/ylwrap
index abac60c4..abac60c4 100755
--- a/main/lzo/autoconf/ylwrap
+++ b/main/src/main/cpp/lzo/autoconf/ylwrap
diff --git a/main/lzo/config.hin b/main/src/main/cpp/lzo/config.hin
index 985cca77..985cca77 100644
--- a/main/lzo/config.hin
+++ b/main/src/main/cpp/lzo/config.hin
diff --git a/main/lzo/configure b/main/src/main/cpp/lzo/configure
index f0356cd5..f0356cd5 100755
--- a/main/lzo/configure
+++ b/main/src/main/cpp/lzo/configure
diff --git a/main/lzo/configure.ac b/main/src/main/cpp/lzo/configure.ac
index 9c6f5e7a..9c6f5e7a 100644
--- a/main/lzo/configure.ac
+++ b/main/src/main/cpp/lzo/configure.ac
diff --git a/main/lzo/doc/LZO.FAQ b/main/src/main/cpp/lzo/doc/LZO.FAQ
index cb1f38aa..cb1f38aa 100644
--- a/main/lzo/doc/LZO.FAQ
+++ b/main/src/main/cpp/lzo/doc/LZO.FAQ
diff --git a/main/lzo/doc/LZO.TXT b/main/src/main/cpp/lzo/doc/LZO.TXT
index 2d9cb35b..2d9cb35b 100644
--- a/main/lzo/doc/LZO.TXT
+++ b/main/src/main/cpp/lzo/doc/LZO.TXT
diff --git a/main/lzo/doc/LZOAPI.TXT b/main/src/main/cpp/lzo/doc/LZOAPI.TXT
index 547b0d70..547b0d70 100644
--- a/main/lzo/doc/LZOAPI.TXT
+++ b/main/src/main/cpp/lzo/doc/LZOAPI.TXT
diff --git a/main/lzo/doc/LZOTEST.TXT b/main/src/main/cpp/lzo/doc/LZOTEST.TXT
index 93c86591..93c86591 100644
--- a/main/lzo/doc/LZOTEST.TXT
+++ b/main/src/main/cpp/lzo/doc/LZOTEST.TXT
diff --git a/main/lzo/examples/dict.c b/main/src/main/cpp/lzo/examples/dict.c
index 8945caf1..8945caf1 100644
--- a/main/lzo/examples/dict.c
+++ b/main/src/main/cpp/lzo/examples/dict.c
diff --git a/main/lzo/examples/lzopack.c b/main/src/main/cpp/lzo/examples/lzopack.c
index 91c0c1ab..91c0c1ab 100644
--- a/main/lzo/examples/lzopack.c
+++ b/main/src/main/cpp/lzo/examples/lzopack.c
diff --git a/main/lzo/examples/overlap.c b/main/src/main/cpp/lzo/examples/overlap.c
index 3ff4d180..3ff4d180 100644
--- a/main/lzo/examples/overlap.c
+++ b/main/src/main/cpp/lzo/examples/overlap.c
diff --git a/main/lzo/examples/portab.h b/main/src/main/cpp/lzo/examples/portab.h
index 93db56a9..93db56a9 100644
--- a/main/lzo/examples/portab.h
+++ b/main/src/main/cpp/lzo/examples/portab.h
diff --git a/main/lzo/examples/portab_a.h b/main/src/main/cpp/lzo/examples/portab_a.h
index 64841971..64841971 100644
--- a/main/lzo/examples/portab_a.h
+++ b/main/src/main/cpp/lzo/examples/portab_a.h
diff --git a/main/lzo/examples/precomp.c b/main/src/main/cpp/lzo/examples/precomp.c
index e61b0c13..e61b0c13 100644
--- a/main/lzo/examples/precomp.c
+++ b/main/src/main/cpp/lzo/examples/precomp.c
diff --git a/main/lzo/examples/precomp2.c b/main/src/main/cpp/lzo/examples/precomp2.c
index 3216cd99..3216cd99 100644
--- a/main/lzo/examples/precomp2.c
+++ b/main/src/main/cpp/lzo/examples/precomp2.c
diff --git a/main/lzo/examples/simple.c b/main/src/main/cpp/lzo/examples/simple.c
index 5757e0c1..5757e0c1 100644
--- a/main/lzo/examples/simple.c
+++ b/main/src/main/cpp/lzo/examples/simple.c
diff --git a/main/lzo/include/lzo/lzo1.h b/main/src/main/cpp/lzo/include/lzo/lzo1.h
index 06e8c4f6..06e8c4f6 100644
--- a/main/lzo/include/lzo/lzo1.h
+++ b/main/src/main/cpp/lzo/include/lzo/lzo1.h
diff --git a/main/lzo/include/lzo/lzo1a.h b/main/src/main/cpp/lzo/include/lzo/lzo1a.h
index 7ef9d23e..7ef9d23e 100644
--- a/main/lzo/include/lzo/lzo1a.h
+++ b/main/src/main/cpp/lzo/include/lzo/lzo1a.h
diff --git a/main/lzo/include/lzo/lzo1b.h b/main/src/main/cpp/lzo/include/lzo/lzo1b.h
index a748fde5..a748fde5 100644
--- a/main/lzo/include/lzo/lzo1b.h
+++ b/main/src/main/cpp/lzo/include/lzo/lzo1b.h
diff --git a/main/lzo/include/lzo/lzo1c.h b/main/src/main/cpp/lzo/include/lzo/lzo1c.h
index a6c6b756..a6c6b756 100644
--- a/main/lzo/include/lzo/lzo1c.h
+++ b/main/src/main/cpp/lzo/include/lzo/lzo1c.h
diff --git a/main/lzo/include/lzo/lzo1f.h b/main/src/main/cpp/lzo/include/lzo/lzo1f.h
index 25cbd51e..25cbd51e 100644
--- a/main/lzo/include/lzo/lzo1f.h
+++ b/main/src/main/cpp/lzo/include/lzo/lzo1f.h
diff --git a/main/lzo/include/lzo/lzo1x.h b/main/src/main/cpp/lzo/include/lzo/lzo1x.h
index a1115140..a1115140 100644
--- a/main/lzo/include/lzo/lzo1x.h
+++ b/main/src/main/cpp/lzo/include/lzo/lzo1x.h
diff --git a/main/lzo/include/lzo/lzo1y.h b/main/src/main/cpp/lzo/include/lzo/lzo1y.h
index 0f4d4aa2..0f4d4aa2 100644
--- a/main/lzo/include/lzo/lzo1y.h
+++ b/main/src/main/cpp/lzo/include/lzo/lzo1y.h
diff --git a/main/lzo/include/lzo/lzo1z.h b/main/src/main/cpp/lzo/include/lzo/lzo1z.h
index 3f8dea03..3f8dea03 100644
--- a/main/lzo/include/lzo/lzo1z.h
+++ b/main/src/main/cpp/lzo/include/lzo/lzo1z.h
diff --git a/main/lzo/include/lzo/lzo2a.h b/main/src/main/cpp/lzo/include/lzo/lzo2a.h
index f069e9ed..f069e9ed 100644
--- a/main/lzo/include/lzo/lzo2a.h
+++ b/main/src/main/cpp/lzo/include/lzo/lzo2a.h
diff --git a/main/lzo/include/lzo/lzo_asm.h b/main/src/main/cpp/lzo/include/lzo/lzo_asm.h
index 9a57e279..9a57e279 100644
--- a/main/lzo/include/lzo/lzo_asm.h
+++ b/main/src/main/cpp/lzo/include/lzo/lzo_asm.h
diff --git a/main/lzo/include/lzo/lzoconf.h b/main/src/main/cpp/lzo/include/lzo/lzoconf.h
index f9a8bdbe..f9a8bdbe 100644
--- a/main/lzo/include/lzo/lzoconf.h
+++ b/main/src/main/cpp/lzo/include/lzo/lzoconf.h
diff --git a/main/lzo/include/lzo/lzodefs.h b/main/src/main/cpp/lzo/include/lzo/lzodefs.h
index c3e2bcf5..c3e2bcf5 100644
--- a/main/lzo/include/lzo/lzodefs.h
+++ b/main/src/main/cpp/lzo/include/lzo/lzodefs.h
diff --git a/main/lzo/include/lzo/lzoutil.h b/main/src/main/cpp/lzo/include/lzo/lzoutil.h
index 75cd067d..75cd067d 100644
--- a/main/lzo/include/lzo/lzoutil.h
+++ b/main/src/main/cpp/lzo/include/lzo/lzoutil.h
diff --git a/main/lzo/lzo2.pc.cmakein b/main/src/main/cpp/lzo/lzo2.pc.cmakein
index 728c84b2..728c84b2 100644
--- a/main/lzo/lzo2.pc.cmakein
+++ b/main/src/main/cpp/lzo/lzo2.pc.cmakein
diff --git a/main/lzo/lzo2.pc.in b/main/src/main/cpp/lzo/lzo2.pc.in
index d5d7fa98..d5d7fa98 100644
--- a/main/lzo/lzo2.pc.in
+++ b/main/src/main/cpp/lzo/lzo2.pc.in
diff --git a/main/lzo/lzotest/asm.h b/main/src/main/cpp/lzo/lzotest/asm.h
index 3648bbe1..3648bbe1 100644
--- a/main/lzo/lzotest/asm.h
+++ b/main/src/main/cpp/lzo/lzotest/asm.h
diff --git a/main/lzo/lzotest/db.h b/main/src/main/cpp/lzo/lzotest/db.h
index d7023418..d7023418 100644
--- a/main/lzo/lzotest/db.h
+++ b/main/src/main/cpp/lzo/lzotest/db.h
diff --git a/main/lzo/lzotest/lzotest.c b/main/src/main/cpp/lzo/lzotest/lzotest.c
index 41fd726a..41fd726a 100644
--- a/main/lzo/lzotest/lzotest.c
+++ b/main/src/main/cpp/lzo/lzotest/lzotest.c
diff --git a/main/lzo/lzotest/wrap.h b/main/src/main/cpp/lzo/lzotest/wrap.h
index 815ce046..815ce046 100644
--- a/main/lzo/lzotest/wrap.h
+++ b/main/src/main/cpp/lzo/lzotest/wrap.h
diff --git a/main/lzo/lzotest/wrapmisc.h b/main/src/main/cpp/lzo/lzotest/wrapmisc.h
index 50e73b6e..50e73b6e 100644
--- a/main/lzo/lzotest/wrapmisc.h
+++ b/main/src/main/cpp/lzo/lzotest/wrapmisc.h
diff --git a/main/lzo/minilzo/Makefile.minilzo b/main/src/main/cpp/lzo/minilzo/Makefile.minilzo
index ae4d6d41..ae4d6d41 100644
--- a/main/lzo/minilzo/Makefile.minilzo
+++ b/main/src/main/cpp/lzo/minilzo/Makefile.minilzo
diff --git a/main/lzo/minilzo/README.LZO b/main/src/main/cpp/lzo/minilzo/README.LZO
index 7d9bea5c..7d9bea5c 100644
--- a/main/lzo/minilzo/README.LZO
+++ b/main/src/main/cpp/lzo/minilzo/README.LZO
diff --git a/main/lzo/minilzo/minilzo.c b/main/src/main/cpp/lzo/minilzo/minilzo.c
index 8fd86645..8fd86645 100644
--- a/main/lzo/minilzo/minilzo.c
+++ b/main/src/main/cpp/lzo/minilzo/minilzo.c
diff --git a/main/lzo/minilzo/minilzo.h b/main/src/main/cpp/lzo/minilzo/minilzo.h
index c1c22975..c1c22975 100644
--- a/main/lzo/minilzo/minilzo.h
+++ b/main/src/main/cpp/lzo/minilzo/minilzo.h
diff --git a/main/lzo/minilzo/testmini.c b/main/src/main/cpp/lzo/minilzo/testmini.c
index ca8c3d19..ca8c3d19 100644
--- a/main/lzo/minilzo/testmini.c
+++ b/main/src/main/cpp/lzo/minilzo/testmini.c
diff --git a/main/lzo/src/compr1b.h b/main/src/main/cpp/lzo/src/compr1b.h
index 521c9f95..521c9f95 100644
--- a/main/lzo/src/compr1b.h
+++ b/main/src/main/cpp/lzo/src/compr1b.h
diff --git a/main/lzo/src/compr1c.h b/main/src/main/cpp/lzo/src/compr1c.h
index 984ef7d6..984ef7d6 100644
--- a/main/lzo/src/compr1c.h
+++ b/main/src/main/cpp/lzo/src/compr1c.h
diff --git a/main/lzo/src/config1.h b/main/src/main/cpp/lzo/src/config1.h
index e67b6006..e67b6006 100644
--- a/main/lzo/src/config1.h
+++ b/main/src/main/cpp/lzo/src/config1.h
diff --git a/main/lzo/src/config1a.h b/main/src/main/cpp/lzo/src/config1a.h
index c5652353..c5652353 100644
--- a/main/lzo/src/config1a.h
+++ b/main/src/main/cpp/lzo/src/config1a.h
diff --git a/main/lzo/src/config1b.h b/main/src/main/cpp/lzo/src/config1b.h
index ee50c1fa..ee50c1fa 100644
--- a/main/lzo/src/config1b.h
+++ b/main/src/main/cpp/lzo/src/config1b.h
diff --git a/main/lzo/src/config1c.h b/main/src/main/cpp/lzo/src/config1c.h
index 988bc49e..988bc49e 100644
--- a/main/lzo/src/config1c.h
+++ b/main/src/main/cpp/lzo/src/config1c.h
diff --git a/main/lzo/src/config1f.h b/main/src/main/cpp/lzo/src/config1f.h
index 1a0fa032..1a0fa032 100644
--- a/main/lzo/src/config1f.h
+++ b/main/src/main/cpp/lzo/src/config1f.h
diff --git a/main/lzo/src/config1x.h b/main/src/main/cpp/lzo/src/config1x.h
index f3c93efb..f3c93efb 100644
--- a/main/lzo/src/config1x.h
+++ b/main/src/main/cpp/lzo/src/config1x.h
diff --git a/main/lzo/src/config1y.h b/main/src/main/cpp/lzo/src/config1y.h
index 56fcfb0d..56fcfb0d 100644
--- a/main/lzo/src/config1y.h
+++ b/main/src/main/cpp/lzo/src/config1y.h
diff --git a/main/lzo/src/config1z.h b/main/src/main/cpp/lzo/src/config1z.h
index 75ebb0a1..75ebb0a1 100644
--- a/main/lzo/src/config1z.h
+++ b/main/src/main/cpp/lzo/src/config1z.h
diff --git a/main/lzo/src/config2a.h b/main/src/main/cpp/lzo/src/config2a.h
index 4a4014b2..4a4014b2 100644
--- a/main/lzo/src/config2a.h
+++ b/main/src/main/cpp/lzo/src/config2a.h
diff --git a/main/lzo/src/lzo1.c b/main/src/main/cpp/lzo/src/lzo1.c
index 63bbc59b..63bbc59b 100644
--- a/main/lzo/src/lzo1.c
+++ b/main/src/main/cpp/lzo/src/lzo1.c
diff --git a/main/lzo/src/lzo1_99.c b/main/src/main/cpp/lzo/src/lzo1_99.c
index 8e1b37f9..8e1b37f9 100644
--- a/main/lzo/src/lzo1_99.c
+++ b/main/src/main/cpp/lzo/src/lzo1_99.c
diff --git a/main/lzo/src/lzo1_cm.ch b/main/src/main/cpp/lzo/src/lzo1_cm.ch
index 5f2ca089..5f2ca089 100644
--- a/main/lzo/src/lzo1_cm.ch
+++ b/main/src/main/cpp/lzo/src/lzo1_cm.ch
diff --git a/main/lzo/src/lzo1_d.ch b/main/src/main/cpp/lzo/src/lzo1_d.ch
index bedc7ce8..bedc7ce8 100644
--- a/main/lzo/src/lzo1_d.ch
+++ b/main/src/main/cpp/lzo/src/lzo1_d.ch
diff --git a/main/lzo/src/lzo1a.c b/main/src/main/cpp/lzo/src/lzo1a.c
index 6bffa307..6bffa307 100644
--- a/main/lzo/src/lzo1a.c
+++ b/main/src/main/cpp/lzo/src/lzo1a.c
diff --git a/main/lzo/src/lzo1a_99.c b/main/src/main/cpp/lzo/src/lzo1a_99.c
index 1628c92e..1628c92e 100644
--- a/main/lzo/src/lzo1a_99.c
+++ b/main/src/main/cpp/lzo/src/lzo1a_99.c
diff --git a/main/lzo/src/lzo1a_cm.ch b/main/src/main/cpp/lzo/src/lzo1a_cm.ch
index 01a957bc..01a957bc 100644
--- a/main/lzo/src/lzo1a_cm.ch
+++ b/main/src/main/cpp/lzo/src/lzo1a_cm.ch
diff --git a/main/lzo/src/lzo1a_cr.ch b/main/src/main/cpp/lzo/src/lzo1a_cr.ch
index 1071fa2b..1071fa2b 100644
--- a/main/lzo/src/lzo1a_cr.ch
+++ b/main/src/main/cpp/lzo/src/lzo1a_cr.ch
diff --git a/main/lzo/src/lzo1a_de.h b/main/src/main/cpp/lzo/src/lzo1a_de.h
index 043c1184..043c1184 100644
--- a/main/lzo/src/lzo1a_de.h
+++ b/main/src/main/cpp/lzo/src/lzo1a_de.h
diff --git a/main/lzo/src/lzo1b_1.c b/main/src/main/cpp/lzo/src/lzo1b_1.c
index 5241125b..5241125b 100644
--- a/main/lzo/src/lzo1b_1.c
+++ b/main/src/main/cpp/lzo/src/lzo1b_1.c
diff --git a/main/lzo/src/lzo1b_2.c b/main/src/main/cpp/lzo/src/lzo1b_2.c
index 764b0a52..764b0a52 100644
--- a/main/lzo/src/lzo1b_2.c
+++ b/main/src/main/cpp/lzo/src/lzo1b_2.c
diff --git a/main/lzo/src/lzo1b_3.c b/main/src/main/cpp/lzo/src/lzo1b_3.c
index a2b9f2ed..a2b9f2ed 100644
--- a/main/lzo/src/lzo1b_3.c
+++ b/main/src/main/cpp/lzo/src/lzo1b_3.c
diff --git a/main/lzo/src/lzo1b_4.c b/main/src/main/cpp/lzo/src/lzo1b_4.c
index 722c82a7..722c82a7 100644
--- a/main/lzo/src/lzo1b_4.c
+++ b/main/src/main/cpp/lzo/src/lzo1b_4.c
diff --git a/main/lzo/src/lzo1b_5.c b/main/src/main/cpp/lzo/src/lzo1b_5.c
index b8bd8d5b..b8bd8d5b 100644
--- a/main/lzo/src/lzo1b_5.c
+++ b/main/src/main/cpp/lzo/src/lzo1b_5.c
diff --git a/main/lzo/src/lzo1b_6.c b/main/src/main/cpp/lzo/src/lzo1b_6.c
index 0226fc85..0226fc85 100644
--- a/main/lzo/src/lzo1b_6.c
+++ b/main/src/main/cpp/lzo/src/lzo1b_6.c
diff --git a/main/lzo/src/lzo1b_7.c b/main/src/main/cpp/lzo/src/lzo1b_7.c
index bfb8d726..bfb8d726 100644
--- a/main/lzo/src/lzo1b_7.c
+++ b/main/src/main/cpp/lzo/src/lzo1b_7.c
diff --git a/main/lzo/src/lzo1b_8.c b/main/src/main/cpp/lzo/src/lzo1b_8.c
index d7736c37..d7736c37 100644
--- a/main/lzo/src/lzo1b_8.c
+++ b/main/src/main/cpp/lzo/src/lzo1b_8.c
diff --git a/main/lzo/src/lzo1b_9.c b/main/src/main/cpp/lzo/src/lzo1b_9.c
index ebe70d52..ebe70d52 100644
--- a/main/lzo/src/lzo1b_9.c
+++ b/main/src/main/cpp/lzo/src/lzo1b_9.c
diff --git a/main/lzo/src/lzo1b_99.c b/main/src/main/cpp/lzo/src/lzo1b_99.c
index 8a667cbc..8a667cbc 100644
--- a/main/lzo/src/lzo1b_99.c
+++ b/main/src/main/cpp/lzo/src/lzo1b_99.c
diff --git a/main/lzo/src/lzo1b_9x.c b/main/src/main/cpp/lzo/src/lzo1b_9x.c
index c19b4366..c19b4366 100644
--- a/main/lzo/src/lzo1b_9x.c
+++ b/main/src/main/cpp/lzo/src/lzo1b_9x.c
diff --git a/main/lzo/src/lzo1b_c.ch b/main/src/main/cpp/lzo/src/lzo1b_c.ch
index cd140499..cd140499 100644
--- a/main/lzo/src/lzo1b_c.ch
+++ b/main/src/main/cpp/lzo/src/lzo1b_c.ch
diff --git a/main/lzo/src/lzo1b_cc.c b/main/src/main/cpp/lzo/src/lzo1b_cc.c
index dfad7e2d..dfad7e2d 100644
--- a/main/lzo/src/lzo1b_cc.c
+++ b/main/src/main/cpp/lzo/src/lzo1b_cc.c
diff --git a/main/lzo/src/lzo1b_cc.h b/main/src/main/cpp/lzo/src/lzo1b_cc.h
index 02a6d290..02a6d290 100644
--- a/main/lzo/src/lzo1b_cc.h
+++ b/main/src/main/cpp/lzo/src/lzo1b_cc.h
diff --git a/main/lzo/src/lzo1b_cm.ch b/main/src/main/cpp/lzo/src/lzo1b_cm.ch
index c38b1387..c38b1387 100644
--- a/main/lzo/src/lzo1b_cm.ch
+++ b/main/src/main/cpp/lzo/src/lzo1b_cm.ch
diff --git a/main/lzo/src/lzo1b_cr.ch b/main/src/main/cpp/lzo/src/lzo1b_cr.ch
index bb3a9b9d..bb3a9b9d 100644
--- a/main/lzo/src/lzo1b_cr.ch
+++ b/main/src/main/cpp/lzo/src/lzo1b_cr.ch
diff --git a/main/lzo/src/lzo1b_d.ch b/main/src/main/cpp/lzo/src/lzo1b_d.ch
index 51e36849..51e36849 100644
--- a/main/lzo/src/lzo1b_d.ch
+++ b/main/src/main/cpp/lzo/src/lzo1b_d.ch
diff --git a/main/lzo/src/lzo1b_d1.c b/main/src/main/cpp/lzo/src/lzo1b_d1.c
index 04c075ac..04c075ac 100644
--- a/main/lzo/src/lzo1b_d1.c
+++ b/main/src/main/cpp/lzo/src/lzo1b_d1.c
diff --git a/main/lzo/src/lzo1b_d2.c b/main/src/main/cpp/lzo/src/lzo1b_d2.c
index a741c54b..a741c54b 100644
--- a/main/lzo/src/lzo1b_d2.c
+++ b/main/src/main/cpp/lzo/src/lzo1b_d2.c
diff --git a/main/lzo/src/lzo1b_de.h b/main/src/main/cpp/lzo/src/lzo1b_de.h
index 50c337dc..50c337dc 100644
--- a/main/lzo/src/lzo1b_de.h
+++ b/main/src/main/cpp/lzo/src/lzo1b_de.h
diff --git a/main/lzo/src/lzo1b_r.ch b/main/src/main/cpp/lzo/src/lzo1b_r.ch
index 28fc137c..28fc137c 100644
--- a/main/lzo/src/lzo1b_r.ch
+++ b/main/src/main/cpp/lzo/src/lzo1b_r.ch
diff --git a/main/lzo/src/lzo1b_rr.c b/main/src/main/cpp/lzo/src/lzo1b_rr.c
index b4f4f4f6..b4f4f4f6 100644
--- a/main/lzo/src/lzo1b_rr.c
+++ b/main/src/main/cpp/lzo/src/lzo1b_rr.c
diff --git a/main/lzo/src/lzo1b_sm.ch b/main/src/main/cpp/lzo/src/lzo1b_sm.ch
index 8e3f7c47..8e3f7c47 100644
--- a/main/lzo/src/lzo1b_sm.ch
+++ b/main/src/main/cpp/lzo/src/lzo1b_sm.ch
diff --git a/main/lzo/src/lzo1b_tm.ch b/main/src/main/cpp/lzo/src/lzo1b_tm.ch
index 98ac2c84..98ac2c84 100644
--- a/main/lzo/src/lzo1b_tm.ch
+++ b/main/src/main/cpp/lzo/src/lzo1b_tm.ch
diff --git a/main/lzo/src/lzo1b_xx.c b/main/src/main/cpp/lzo/src/lzo1b_xx.c
index ba7ab877..ba7ab877 100644
--- a/main/lzo/src/lzo1b_xx.c
+++ b/main/src/main/cpp/lzo/src/lzo1b_xx.c
diff --git a/main/lzo/src/lzo1c_1.c b/main/src/main/cpp/lzo/src/lzo1c_1.c
index 57d92c2e..57d92c2e 100644
--- a/main/lzo/src/lzo1c_1.c
+++ b/main/src/main/cpp/lzo/src/lzo1c_1.c
diff --git a/main/lzo/src/lzo1c_2.c b/main/src/main/cpp/lzo/src/lzo1c_2.c
index 2e4a1c95..2e4a1c95 100644
--- a/main/lzo/src/lzo1c_2.c
+++ b/main/src/main/cpp/lzo/src/lzo1c_2.c
diff --git a/main/lzo/src/lzo1c_3.c b/main/src/main/cpp/lzo/src/lzo1c_3.c
index 15710a74..15710a74 100644
--- a/main/lzo/src/lzo1c_3.c
+++ b/main/src/main/cpp/lzo/src/lzo1c_3.c
diff --git a/main/lzo/src/lzo1c_4.c b/main/src/main/cpp/lzo/src/lzo1c_4.c
index 3ba6bcf6..3ba6bcf6 100644
--- a/main/lzo/src/lzo1c_4.c
+++ b/main/src/main/cpp/lzo/src/lzo1c_4.c
diff --git a/main/lzo/src/lzo1c_5.c b/main/src/main/cpp/lzo/src/lzo1c_5.c
index d43537c3..d43537c3 100644
--- a/main/lzo/src/lzo1c_5.c
+++ b/main/src/main/cpp/lzo/src/lzo1c_5.c
diff --git a/main/lzo/src/lzo1c_6.c b/main/src/main/cpp/lzo/src/lzo1c_6.c
index 2afb6fd1..2afb6fd1 100644
--- a/main/lzo/src/lzo1c_6.c
+++ b/main/src/main/cpp/lzo/src/lzo1c_6.c
diff --git a/main/lzo/src/lzo1c_7.c b/main/src/main/cpp/lzo/src/lzo1c_7.c
index d50c9067..d50c9067 100644
--- a/main/lzo/src/lzo1c_7.c
+++ b/main/src/main/cpp/lzo/src/lzo1c_7.c
diff --git a/main/lzo/src/lzo1c_8.c b/main/src/main/cpp/lzo/src/lzo1c_8.c
index 8ae847a7..8ae847a7 100644
--- a/main/lzo/src/lzo1c_8.c
+++ b/main/src/main/cpp/lzo/src/lzo1c_8.c
diff --git a/main/lzo/src/lzo1c_9.c b/main/src/main/cpp/lzo/src/lzo1c_9.c
index ecc721c0..ecc721c0 100644
--- a/main/lzo/src/lzo1c_9.c
+++ b/main/src/main/cpp/lzo/src/lzo1c_9.c
diff --git a/main/lzo/src/lzo1c_99.c b/main/src/main/cpp/lzo/src/lzo1c_99.c
index c81ecd10..c81ecd10 100644
--- a/main/lzo/src/lzo1c_99.c
+++ b/main/src/main/cpp/lzo/src/lzo1c_99.c
diff --git a/main/lzo/src/lzo1c_9x.c b/main/src/main/cpp/lzo/src/lzo1c_9x.c
index c4ea914d..c4ea914d 100644
--- a/main/lzo/src/lzo1c_9x.c
+++ b/main/src/main/cpp/lzo/src/lzo1c_9x.c
diff --git a/main/lzo/src/lzo1c_cc.c b/main/src/main/cpp/lzo/src/lzo1c_cc.c
index 952df26a..952df26a 100644
--- a/main/lzo/src/lzo1c_cc.c
+++ b/main/src/main/cpp/lzo/src/lzo1c_cc.c
diff --git a/main/lzo/src/lzo1c_cc.h b/main/src/main/cpp/lzo/src/lzo1c_cc.h
index 86a5def7..86a5def7 100644
--- a/main/lzo/src/lzo1c_cc.h
+++ b/main/src/main/cpp/lzo/src/lzo1c_cc.h
diff --git a/main/lzo/src/lzo1c_d1.c b/main/src/main/cpp/lzo/src/lzo1c_d1.c
index 25283aca..25283aca 100644
--- a/main/lzo/src/lzo1c_d1.c
+++ b/main/src/main/cpp/lzo/src/lzo1c_d1.c
diff --git a/main/lzo/src/lzo1c_d2.c b/main/src/main/cpp/lzo/src/lzo1c_d2.c
index 526d5e78..526d5e78 100644
--- a/main/lzo/src/lzo1c_d2.c
+++ b/main/src/main/cpp/lzo/src/lzo1c_d2.c
diff --git a/main/lzo/src/lzo1c_rr.c b/main/src/main/cpp/lzo/src/lzo1c_rr.c
index 5c7c9875..5c7c9875 100644
--- a/main/lzo/src/lzo1c_rr.c
+++ b/main/src/main/cpp/lzo/src/lzo1c_rr.c
diff --git a/main/lzo/src/lzo1c_xx.c b/main/src/main/cpp/lzo/src/lzo1c_xx.c
index fb8d304d..fb8d304d 100644
--- a/main/lzo/src/lzo1c_xx.c
+++ b/main/src/main/cpp/lzo/src/lzo1c_xx.c
diff --git a/main/lzo/src/lzo1f_1.c b/main/src/main/cpp/lzo/src/lzo1f_1.c
index c201383b..c201383b 100644
--- a/main/lzo/src/lzo1f_1.c
+++ b/main/src/main/cpp/lzo/src/lzo1f_1.c
diff --git a/main/lzo/src/lzo1f_9x.c b/main/src/main/cpp/lzo/src/lzo1f_9x.c
index 927cdd5b..927cdd5b 100644
--- a/main/lzo/src/lzo1f_9x.c
+++ b/main/src/main/cpp/lzo/src/lzo1f_9x.c
diff --git a/main/lzo/src/lzo1f_d.ch b/main/src/main/cpp/lzo/src/lzo1f_d.ch
index e86027b8..e86027b8 100644
--- a/main/lzo/src/lzo1f_d.ch
+++ b/main/src/main/cpp/lzo/src/lzo1f_d.ch
diff --git a/main/lzo/src/lzo1f_d1.c b/main/src/main/cpp/lzo/src/lzo1f_d1.c
index b6931a00..b6931a00 100644
--- a/main/lzo/src/lzo1f_d1.c
+++ b/main/src/main/cpp/lzo/src/lzo1f_d1.c
diff --git a/main/lzo/src/lzo1f_d2.c b/main/src/main/cpp/lzo/src/lzo1f_d2.c
index 160d2cea..160d2cea 100644
--- a/main/lzo/src/lzo1f_d2.c
+++ b/main/src/main/cpp/lzo/src/lzo1f_d2.c
diff --git a/main/lzo/src/lzo1x_1.c b/main/src/main/cpp/lzo/src/lzo1x_1.c
index a659393f..a659393f 100644
--- a/main/lzo/src/lzo1x_1.c
+++ b/main/src/main/cpp/lzo/src/lzo1x_1.c
diff --git a/main/lzo/src/lzo1x_1k.c b/main/src/main/cpp/lzo/src/lzo1x_1k.c
index 4ae6eda4..4ae6eda4 100644
--- a/main/lzo/src/lzo1x_1k.c
+++ b/main/src/main/cpp/lzo/src/lzo1x_1k.c
diff --git a/main/lzo/src/lzo1x_1l.c b/main/src/main/cpp/lzo/src/lzo1x_1l.c
index 90b42e1b..90b42e1b 100644
--- a/main/lzo/src/lzo1x_1l.c
+++ b/main/src/main/cpp/lzo/src/lzo1x_1l.c
diff --git a/main/lzo/src/lzo1x_1o.c b/main/src/main/cpp/lzo/src/lzo1x_1o.c
index b935fc7a..b935fc7a 100644
--- a/main/lzo/src/lzo1x_1o.c
+++ b/main/src/main/cpp/lzo/src/lzo1x_1o.c
diff --git a/main/lzo/src/lzo1x_9x.c b/main/src/main/cpp/lzo/src/lzo1x_9x.c
index 6337f143..6337f143 100644
--- a/main/lzo/src/lzo1x_9x.c
+++ b/main/src/main/cpp/lzo/src/lzo1x_9x.c
diff --git a/main/lzo/src/lzo1x_c.ch b/main/src/main/cpp/lzo/src/lzo1x_c.ch
index be19b2b7..be19b2b7 100644
--- a/main/lzo/src/lzo1x_c.ch
+++ b/main/src/main/cpp/lzo/src/lzo1x_c.ch
diff --git a/main/lzo/src/lzo1x_d.ch b/main/src/main/cpp/lzo/src/lzo1x_d.ch
index b6c6d994..b6c6d994 100644
--- a/main/lzo/src/lzo1x_d.ch
+++ b/main/src/main/cpp/lzo/src/lzo1x_d.ch
diff --git a/main/lzo/src/lzo1x_d1.c b/main/src/main/cpp/lzo/src/lzo1x_d1.c
index 68faf48e..68faf48e 100644
--- a/main/lzo/src/lzo1x_d1.c
+++ b/main/src/main/cpp/lzo/src/lzo1x_d1.c
diff --git a/main/lzo/src/lzo1x_d2.c b/main/src/main/cpp/lzo/src/lzo1x_d2.c
index 8b7c316a..8b7c316a 100644
--- a/main/lzo/src/lzo1x_d2.c
+++ b/main/src/main/cpp/lzo/src/lzo1x_d2.c
diff --git a/main/lzo/src/lzo1x_d3.c b/main/src/main/cpp/lzo/src/lzo1x_d3.c
index b3d430f8..b3d430f8 100644
--- a/main/lzo/src/lzo1x_d3.c
+++ b/main/src/main/cpp/lzo/src/lzo1x_d3.c
diff --git a/main/lzo/src/lzo1x_o.c b/main/src/main/cpp/lzo/src/lzo1x_o.c
index 9fdf306c..9fdf306c 100644
--- a/main/lzo/src/lzo1x_o.c
+++ b/main/src/main/cpp/lzo/src/lzo1x_o.c
diff --git a/main/lzo/src/lzo1x_oo.ch b/main/src/main/cpp/lzo/src/lzo1x_oo.ch
index bb16fd40..bb16fd40 100644
--- a/main/lzo/src/lzo1x_oo.ch
+++ b/main/src/main/cpp/lzo/src/lzo1x_oo.ch
diff --git a/main/lzo/src/lzo1y_1.c b/main/src/main/cpp/lzo/src/lzo1y_1.c
index 30e9ffc0..30e9ffc0 100644
--- a/main/lzo/src/lzo1y_1.c
+++ b/main/src/main/cpp/lzo/src/lzo1y_1.c
diff --git a/main/lzo/src/lzo1y_9x.c b/main/src/main/cpp/lzo/src/lzo1y_9x.c
index 983a8804..983a8804 100644
--- a/main/lzo/src/lzo1y_9x.c
+++ b/main/src/main/cpp/lzo/src/lzo1y_9x.c
diff --git a/main/lzo/src/lzo1y_d1.c b/main/src/main/cpp/lzo/src/lzo1y_d1.c
index cbfa23c0..cbfa23c0 100644
--- a/main/lzo/src/lzo1y_d1.c
+++ b/main/src/main/cpp/lzo/src/lzo1y_d1.c
diff --git a/main/lzo/src/lzo1y_d2.c b/main/src/main/cpp/lzo/src/lzo1y_d2.c
index 76fec551..76fec551 100644
--- a/main/lzo/src/lzo1y_d2.c
+++ b/main/src/main/cpp/lzo/src/lzo1y_d2.c
diff --git a/main/lzo/src/lzo1y_d3.c b/main/src/main/cpp/lzo/src/lzo1y_d3.c
index 08324d68..08324d68 100644
--- a/main/lzo/src/lzo1y_d3.c
+++ b/main/src/main/cpp/lzo/src/lzo1y_d3.c
diff --git a/main/lzo/src/lzo1y_o.c b/main/src/main/cpp/lzo/src/lzo1y_o.c
index 1e32b75b..1e32b75b 100644
--- a/main/lzo/src/lzo1y_o.c
+++ b/main/src/main/cpp/lzo/src/lzo1y_o.c
diff --git a/main/lzo/src/lzo1z_9x.c b/main/src/main/cpp/lzo/src/lzo1z_9x.c
index 082baa49..082baa49 100644
--- a/main/lzo/src/lzo1z_9x.c
+++ b/main/src/main/cpp/lzo/src/lzo1z_9x.c
diff --git a/main/lzo/src/lzo1z_d1.c b/main/src/main/cpp/lzo/src/lzo1z_d1.c
index 3b7b9962..3b7b9962 100644
--- a/main/lzo/src/lzo1z_d1.c
+++ b/main/src/main/cpp/lzo/src/lzo1z_d1.c
diff --git a/main/lzo/src/lzo1z_d2.c b/main/src/main/cpp/lzo/src/lzo1z_d2.c
index 6515af44..6515af44 100644
--- a/main/lzo/src/lzo1z_d2.c
+++ b/main/src/main/cpp/lzo/src/lzo1z_d2.c
diff --git a/main/lzo/src/lzo1z_d3.c b/main/src/main/cpp/lzo/src/lzo1z_d3.c
index d7eae4cb..d7eae4cb 100644
--- a/main/lzo/src/lzo1z_d3.c
+++ b/main/src/main/cpp/lzo/src/lzo1z_d3.c
diff --git a/main/lzo/src/lzo2a_9x.c b/main/src/main/cpp/lzo/src/lzo2a_9x.c
index cc1401c5..cc1401c5 100644
--- a/main/lzo/src/lzo2a_9x.c
+++ b/main/src/main/cpp/lzo/src/lzo2a_9x.c
diff --git a/main/lzo/src/lzo2a_d.ch b/main/src/main/cpp/lzo/src/lzo2a_d.ch
index cbbb79ef..cbbb79ef 100644
--- a/main/lzo/src/lzo2a_d.ch
+++ b/main/src/main/cpp/lzo/src/lzo2a_d.ch
diff --git a/main/lzo/src/lzo2a_d1.c b/main/src/main/cpp/lzo/src/lzo2a_d1.c
index 20a167c9..20a167c9 100644
--- a/main/lzo/src/lzo2a_d1.c
+++ b/main/src/main/cpp/lzo/src/lzo2a_d1.c
diff --git a/main/lzo/src/lzo2a_d2.c b/main/src/main/cpp/lzo/src/lzo2a_d2.c
index 0d7ce526..0d7ce526 100644
--- a/main/lzo/src/lzo2a_d2.c
+++ b/main/src/main/cpp/lzo/src/lzo2a_d2.c
diff --git a/main/lzo/src/lzo_conf.h b/main/src/main/cpp/lzo/src/lzo_conf.h
index aa9a2b6b..aa9a2b6b 100644
--- a/main/lzo/src/lzo_conf.h
+++ b/main/src/main/cpp/lzo/src/lzo_conf.h
diff --git a/main/lzo/src/lzo_crc.c b/main/src/main/cpp/lzo/src/lzo_crc.c
index 56235e2f..56235e2f 100644
--- a/main/lzo/src/lzo_crc.c
+++ b/main/src/main/cpp/lzo/src/lzo_crc.c
diff --git a/main/lzo/src/lzo_dict.h b/main/src/main/cpp/lzo/src/lzo_dict.h
index e48addb1..e48addb1 100644
--- a/main/lzo/src/lzo_dict.h
+++ b/main/src/main/cpp/lzo/src/lzo_dict.h
diff --git a/main/lzo/src/lzo_dll.ch b/main/src/main/cpp/lzo/src/lzo_dll.ch
index d66839e1..d66839e1 100644
--- a/main/lzo/src/lzo_dll.ch
+++ b/main/src/main/cpp/lzo/src/lzo_dll.ch
diff --git a/main/lzo/src/lzo_func.h b/main/src/main/cpp/lzo/src/lzo_func.h
index f3ac8e34..f3ac8e34 100644
--- a/main/lzo/src/lzo_func.h
+++ b/main/src/main/cpp/lzo/src/lzo_func.h
diff --git a/main/lzo/src/lzo_init.c b/main/src/main/cpp/lzo/src/lzo_init.c
index 31fdabe5..31fdabe5 100644
--- a/main/lzo/src/lzo_init.c
+++ b/main/src/main/cpp/lzo/src/lzo_init.c
diff --git a/main/lzo/src/lzo_mchw.ch b/main/src/main/cpp/lzo/src/lzo_mchw.ch
index 94bedc3d..94bedc3d 100644
--- a/main/lzo/src/lzo_mchw.ch
+++ b/main/src/main/cpp/lzo/src/lzo_mchw.ch
diff --git a/main/lzo/src/lzo_ptr.c b/main/src/main/cpp/lzo/src/lzo_ptr.c
index d2def7f6..d2def7f6 100644
--- a/main/lzo/src/lzo_ptr.c
+++ b/main/src/main/cpp/lzo/src/lzo_ptr.c
diff --git a/main/lzo/src/lzo_ptr.h b/main/src/main/cpp/lzo/src/lzo_ptr.h
index 8d7ee448..8d7ee448 100644
--- a/main/lzo/src/lzo_ptr.h
+++ b/main/src/main/cpp/lzo/src/lzo_ptr.h
diff --git a/main/lzo/src/lzo_str.c b/main/src/main/cpp/lzo/src/lzo_str.c
index beac725c..beac725c 100644
--- a/main/lzo/src/lzo_str.c
+++ b/main/src/main/cpp/lzo/src/lzo_str.c
diff --git a/main/lzo/src/lzo_supp.h b/main/src/main/cpp/lzo/src/lzo_supp.h
index a2c90210..a2c90210 100644
--- a/main/lzo/src/lzo_supp.h
+++ b/main/src/main/cpp/lzo/src/lzo_supp.h
diff --git a/main/lzo/src/lzo_swd.ch b/main/src/main/cpp/lzo/src/lzo_swd.ch
index 20bc4617..20bc4617 100644
--- a/main/lzo/src/lzo_swd.ch
+++ b/main/src/main/cpp/lzo/src/lzo_swd.ch
diff --git a/main/lzo/src/lzo_util.c b/main/src/main/cpp/lzo/src/lzo_util.c
index f1d72e31..f1d72e31 100644
--- a/main/lzo/src/lzo_util.c
+++ b/main/src/main/cpp/lzo/src/lzo_util.c
diff --git a/main/lzo/src/stats1a.h b/main/src/main/cpp/lzo/src/stats1a.h
index c72d2c1c..c72d2c1c 100644
--- a/main/lzo/src/stats1a.h
+++ b/main/src/main/cpp/lzo/src/stats1a.h
diff --git a/main/lzo/src/stats1b.h b/main/src/main/cpp/lzo/src/stats1b.h
index 52011b98..52011b98 100644
--- a/main/lzo/src/stats1b.h
+++ b/main/src/main/cpp/lzo/src/stats1b.h
diff --git a/main/lzo/src/stats1c.h b/main/src/main/cpp/lzo/src/stats1c.h
index 0bbd841e..0bbd841e 100644
--- a/main/lzo/src/stats1c.h
+++ b/main/src/main/cpp/lzo/src/stats1c.h
diff --git a/main/lzo/tests/align.c b/main/src/main/cpp/lzo/tests/align.c
index e159bf0e..e159bf0e 100644
--- a/main/lzo/tests/align.c
+++ b/main/src/main/cpp/lzo/tests/align.c
diff --git a/main/lzo/tests/chksum.c b/main/src/main/cpp/lzo/tests/chksum.c
index fc492da2..fc492da2 100644
--- a/main/lzo/tests/chksum.c
+++ b/main/src/main/cpp/lzo/tests/chksum.c
diff --git a/main/lzo/tests/promote.c b/main/src/main/cpp/lzo/tests/promote.c
index f516f28a..f516f28a 100644
--- a/main/lzo/tests/promote.c
+++ b/main/src/main/cpp/lzo/tests/promote.c
diff --git a/main/lzo/tests/sizes.c b/main/src/main/cpp/lzo/tests/sizes.c
index 18a81b04..18a81b04 100644
--- a/main/lzo/tests/sizes.c
+++ b/main/src/main/cpp/lzo/tests/sizes.c
diff --git a/main/lzo/util/check.sh b/main/src/main/cpp/lzo/util/check.sh
index 806c8406..806c8406 100644
--- a/main/lzo/util/check.sh
+++ b/main/src/main/cpp/lzo/util/check.sh
diff --git a/main/lzo/util/checkasm.sh b/main/src/main/cpp/lzo/util/checkasm.sh
index 668a8753..668a8753 100644
--- a/main/lzo/util/checkasm.sh
+++ b/main/src/main/cpp/lzo/util/checkasm.sh
diff --git a/main/lzo/util/notime.pl b/main/src/main/cpp/lzo/util/notime.pl
index b5be12d6..b5be12d6 100644
--- a/main/lzo/util/notime.pl
+++ b/main/src/main/cpp/lzo/util/notime.pl
diff --git a/main/lzo/util/overlap.sh b/main/src/main/cpp/lzo/util/overlap.sh
index 439844e7..439844e7 100644
--- a/main/lzo/util/overlap.sh
+++ b/main/src/main/cpp/lzo/util/overlap.sh
diff --git a/main/lzo/util/shortf.pl b/main/src/main/cpp/lzo/util/shortf.pl
index 500eb450..500eb450 100644
--- a/main/lzo/util/shortf.pl
+++ b/main/src/main/cpp/lzo/util/shortf.pl
diff --git a/main/lzo/util/table.pl b/main/src/main/cpp/lzo/util/table.pl
index 3fc977ff..3fc977ff 100644
--- a/main/lzo/util/table.pl
+++ b/main/src/main/cpp/lzo/util/table.pl
diff --git a/main/lzo/util/uncompr.pl b/main/src/main/cpp/lzo/util/uncompr.pl
index a487ca68..a487ca68 100644
--- a/main/lzo/util/uncompr.pl
+++ b/main/src/main/cpp/lzo/util/uncompr.pl
diff --git a/main/src/main/cpp/mbedtls b/main/src/main/cpp/mbedtls
new file mode 160000
+Subproject ce40c23b6b8df2ccb403ec33b5b16bc2fc6c48a
diff --git a/main/src/main/cpp/minivpn/minivpn.c b/main/src/main/cpp/minivpn/minivpn.c
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/main/src/main/cpp/minivpn/minivpn.c
diff --git a/main/openssl b/main/src/main/cpp/openssl
-Subproject 2b0fd26192c4014eabe8cbacbc87e0a2aec2d04
+Subproject 2b0fd26192c4014eabe8cbacbc87e0a2aec2d04
diff --git a/main/src/main/cpp/openssl.cmake b/main/src/main/cpp/openssl.cmake
new file mode 100644
index 00000000..d6e939e8
--- /dev/null
+++ b/main/src/main/cpp/openssl.cmake
@@ -0,0 +1,828 @@
+enable_language(ASM)
+
+set(crypto_srcs
+  crypto/aes/aes_cbc.c 
+  crypto/aes/aes_cfb.c 
+  crypto/aes/aes_core.c 
+  crypto/aes/aes_ecb.c 
+  crypto/aes/aes_ige.c 
+  crypto/aes/aes_misc.c 
+  crypto/aes/aes_ofb.c 
+  crypto/aes/aes_wrap.c 
+  crypto/asn1/a_bitstr.c 
+  crypto/asn1/a_d2i_fp.c 
+  crypto/asn1/a_digest.c 
+  crypto/asn1/a_dup.c 
+  crypto/asn1/a_gentm.c 
+  crypto/asn1/a_i2d_fp.c 
+  crypto/asn1/a_int.c 
+  crypto/asn1/a_mbstr.c 
+  crypto/asn1/a_object.c 
+  crypto/asn1/a_octet.c 
+  crypto/asn1/a_print.c 
+  crypto/asn1/a_sign.c 
+  crypto/asn1/a_strex.c 
+  crypto/asn1/a_strnid.c 
+  crypto/asn1/a_time.c 
+  crypto/asn1/a_type.c 
+  crypto/asn1/a_utctm.c 
+  crypto/asn1/a_utf8.c 
+  crypto/asn1/a_verify.c 
+  crypto/asn1/ameth_lib.c 
+  crypto/asn1/asn1_err.c 
+  crypto/asn1/asn1_gen.c 
+  crypto/asn1/asn1_lib.c 
+  crypto/asn1/asn1_par.c 
+  crypto/asn1/asn_mime.c 
+  crypto/asn1/asn_moid.c 
+  crypto/asn1/asn_mstbl.c 
+  crypto/asn1/asn_pack.c 
+  crypto/asn1/bio_asn1.c 
+  crypto/asn1/bio_ndef.c 
+  crypto/asn1/d2i_pr.c 
+  crypto/asn1/d2i_pu.c 
+  crypto/asn1/evp_asn1.c 
+  crypto/asn1/f_int.c 
+  crypto/asn1/f_string.c 
+  crypto/asn1/i2d_pr.c 
+  crypto/asn1/i2d_pu.c 
+  crypto/asn1/n_pkey.c 
+  crypto/asn1/nsseq.c 
+  crypto/asn1/p5_pbe.c 
+  crypto/asn1/p5_pbev2.c 
+  crypto/asn1/p5_scrypt.c 
+  crypto/asn1/p8_pkey.c 
+  crypto/asn1/t_bitst.c 
+  crypto/asn1/t_pkey.c 
+  crypto/asn1/tasn_dec.c 
+  crypto/asn1/tasn_enc.c 
+  crypto/asn1/tasn_fre.c 
+  crypto/asn1/tasn_new.c 
+  crypto/asn1/tasn_prn.c 
+  crypto/asn1/tasn_scn.c 
+  crypto/asn1/tasn_typ.c 
+  crypto/asn1/tasn_utl.c 
+  crypto/asn1/x_algor.c 
+  crypto/asn1/x_bignum.c 
+  crypto/asn1/x_info.c 
+  crypto/asn1/x_int64.c 
+  crypto/asn1/x_long.c 
+  crypto/asn1/x_pkey.c 
+  crypto/asn1/x_sig.c 
+  crypto/asn1/x_spki.c 
+  crypto/asn1/x_val.c 
+  crypto/async/arch/async_null.c 
+  crypto/async/arch/async_posix.c 
+  crypto/async/async.c 
+  crypto/async/async_err.c 
+  crypto/async/async_wait.c 
+  crypto/bf/bf_cfb64.c 
+  crypto/bf/bf_ecb.c 
+  crypto/bf/bf_enc.c 
+  crypto/bf/bf_ofb64.c 
+  crypto/bf/bf_skey.c 
+  crypto/bio/b_addr.c 
+  crypto/bio/b_dump.c 
+  crypto/bio/b_print.c 
+  crypto/bio/b_sock.c 
+  crypto/bio/b_sock2.c 
+  crypto/bio/bf_buff.c 
+  crypto/bio/bf_nbio.c 
+  crypto/bio/bf_null.c 
+  crypto/bio/bio_cb.c 
+  crypto/bio/bio_err.c 
+  crypto/bio/bio_lib.c 
+  crypto/bio/bio_meth.c 
+  crypto/bio/bss_acpt.c 
+  crypto/bio/bss_bio.c 
+  crypto/bio/bss_conn.c 
+  crypto/bio/bss_dgram.c 
+  crypto/bio/bss_fd.c 
+  crypto/bio/bss_file.c 
+  crypto/bio/bss_log.c 
+  crypto/bio/bss_mem.c 
+  crypto/bio/bss_null.c 
+  crypto/bio/bss_sock.c 
+  crypto/blake2/blake2b.c 
+  crypto/blake2/blake2s.c 
+  crypto/blake2/m_blake2b.c 
+  crypto/blake2/m_blake2s.c 
+  crypto/bn/bn_add.c 
+  crypto/bn/bn_asm.c 
+  crypto/bn/bn_blind.c 
+  crypto/bn/bn_const.c 
+  crypto/bn/bn_ctx.c 
+  crypto/bn/bn_dh.c 
+  crypto/bn/bn_div.c 
+  crypto/bn/bn_err.c 
+  crypto/bn/bn_exp.c 
+  crypto/bn/bn_exp2.c 
+  crypto/bn/bn_gcd.c 
+  crypto/bn/bn_gf2m.c 
+  crypto/bn/bn_intern.c 
+  crypto/bn/bn_kron.c 
+  crypto/bn/bn_lib.c 
+  crypto/bn/bn_mod.c 
+  crypto/bn/bn_mont.c 
+  crypto/bn/bn_mpi.c 
+  crypto/bn/bn_mul.c 
+  crypto/bn/bn_nist.c 
+  crypto/bn/bn_prime.c 
+  crypto/bn/bn_print.c 
+  crypto/bn/bn_rand.c 
+  crypto/bn/bn_recp.c 
+  crypto/bn/bn_shift.c 
+  crypto/bn/bn_sqr.c 
+  crypto/bn/bn_sqrt.c 
+  crypto/bn/bn_srp.c 
+  crypto/bn/bn_word.c 
+  crypto/bn/bn_x931p.c 
+  crypto/bn/rsaz_exp.c 
+  crypto/buffer/buf_err.c 
+  crypto/buffer/buffer.c 
+  crypto/chacha/chacha_enc.c 
+  crypto/cmac/cm_ameth.c 
+  crypto/cmac/cm_pmeth.c 
+  crypto/cmac/cmac.c 
+  crypto/cms/cms_asn1.c 
+  crypto/cms/cms_att.c 
+  crypto/cms/cms_cd.c 
+  crypto/cms/cms_dd.c 
+  crypto/cms/cms_enc.c 
+  crypto/cms/cms_env.c 
+  crypto/cms/cms_err.c 
+  crypto/cms/cms_ess.c 
+  crypto/cms/cms_io.c 
+  crypto/cms/cms_kari.c 
+  crypto/cms/cms_lib.c 
+  crypto/cms/cms_pwri.c 
+  crypto/cms/cms_sd.c 
+  crypto/cms/cms_smime.c 
+  crypto/comp/c_zlib.c 
+  crypto/comp/comp_err.c 
+  crypto/comp/comp_lib.c 
+  crypto/conf/conf_api.c 
+  crypto/conf/conf_def.c 
+  crypto/conf/conf_err.c 
+  crypto/conf/conf_lib.c 
+  crypto/conf/conf_mall.c 
+  crypto/conf/conf_mod.c 
+  crypto/conf/conf_sap.c 
+  crypto/cpt_err.c 
+  crypto/cryptlib.c 
+  crypto/ct/ct_b64.c 
+  crypto/ct/ct_err.c 
+  crypto/ct/ct_log.c 
+  crypto/ct/ct_oct.c 
+  crypto/ct/ct_policy.c 
+  crypto/ct/ct_prn.c 
+  crypto/ct/ct_sct.c 
+  crypto/ct/ct_sct_ctx.c 
+  crypto/ct/ct_vfy.c 
+  crypto/ct/ct_x509v3.c 
+  crypto/cversion.c 
+  crypto/des/cbc_cksm.c 
+  crypto/des/cbc_enc.c 
+  crypto/des/cfb64ede.c 
+  crypto/des/cfb64enc.c 
+  crypto/des/cfb_enc.c 
+  crypto/des/des_enc.c 
+  crypto/des/ecb3_enc.c 
+  crypto/des/ecb_enc.c 
+  crypto/des/fcrypt.c 
+  crypto/des/fcrypt_b.c 
+  crypto/des/ofb64ede.c 
+  crypto/des/ofb64enc.c 
+  crypto/des/ofb_enc.c 
+  crypto/des/pcbc_enc.c 
+  crypto/des/qud_cksm.c 
+  crypto/des/rand_key.c 
+  crypto/des/rpc_enc.c 
+  crypto/des/set_key.c 
+  crypto/des/str2key.c 
+  crypto/des/xcbc_enc.c 
+  crypto/dh/dh_ameth.c 
+  crypto/dh/dh_asn1.c 
+  crypto/dh/dh_check.c 
+  crypto/dh/dh_depr.c 
+  crypto/dh/dh_err.c 
+  crypto/dh/dh_gen.c 
+  crypto/dh/dh_kdf.c 
+  crypto/dh/dh_key.c 
+  crypto/dh/dh_lib.c 
+  crypto/dh/dh_meth.c 
+  crypto/dh/dh_pmeth.c 
+  crypto/dh/dh_rfc5114.c 
+  crypto/dsa/dsa_ameth.c 
+  crypto/dsa/dsa_asn1.c 
+  crypto/dsa/dsa_depr.c 
+  crypto/dsa/dsa_err.c 
+  crypto/dsa/dsa_gen.c 
+  crypto/dsa/dsa_key.c 
+  crypto/dsa/dsa_lib.c 
+  crypto/dsa/dsa_meth.c 
+  crypto/dsa/dsa_ossl.c 
+  crypto/dsa/dsa_pmeth.c 
+  crypto/dsa/dsa_prn.c 
+  crypto/dsa/dsa_sign.c 
+  crypto/dsa/dsa_vrf.c 
+  crypto/dso/dso_dl.c 
+  crypto/dso/dso_dlfcn.c 
+  crypto/dso/dso_err.c 
+  crypto/dso/dso_lib.c 
+  crypto/dso/dso_openssl.c 
+  crypto/ebcdic.c 
+  crypto/ec/curve25519.c 
+  crypto/ec/ec2_mult.c 
+  crypto/ec/ec2_oct.c 
+  crypto/ec/ec2_smpl.c 
+  crypto/ec/ec_ameth.c 
+  crypto/ec/ec_asn1.c 
+  crypto/ec/ec_check.c 
+  crypto/ec/ec_curve.c 
+  crypto/ec/ec_cvt.c 
+  crypto/ec/ec_err.c 
+  crypto/ec/ec_key.c 
+  crypto/ec/ec_kmeth.c 
+  crypto/ec/ec_lib.c 
+  crypto/ec/ec_mult.c 
+  crypto/ec/ec_oct.c 
+  crypto/ec/ec_pmeth.c 
+  crypto/ec/ec_print.c 
+  crypto/ec/ecdh_kdf.c 
+  crypto/ec/ecdh_ossl.c 
+  crypto/ec/ecdsa_ossl.c 
+  crypto/ec/ecdsa_sign.c 
+  crypto/ec/ecdsa_vrf.c 
+  crypto/ec/eck_prn.c 
+  crypto/ec/ecp_mont.c 
+  crypto/ec/ecp_nist.c 
+  crypto/ec/ecp_nistz256.c 
+  crypto/ec/ecp_oct.c 
+  crypto/ec/ecp_smpl.c 
+  crypto/ec/ecx_meth.c 
+  crypto/engine/eng_all.c 
+  crypto/engine/eng_cnf.c 
+  crypto/engine/eng_ctrl.c 
+  crypto/engine/eng_dyn.c 
+  crypto/engine/eng_err.c 
+  crypto/engine/eng_fat.c 
+  crypto/engine/eng_init.c 
+  crypto/engine/eng_lib.c 
+  crypto/engine/eng_list.c 
+  crypto/engine/eng_openssl.c 
+  crypto/engine/eng_pkey.c 
+  crypto/engine/eng_table.c 
+  crypto/engine/tb_asnmth.c 
+  crypto/engine/tb_cipher.c 
+  crypto/engine/tb_dh.c 
+  crypto/engine/tb_digest.c 
+  crypto/engine/tb_dsa.c 
+  crypto/engine/tb_eckey.c 
+  crypto/engine/tb_pkmeth.c 
+  crypto/engine/tb_rand.c 
+  crypto/engine/tb_rsa.c 
+  crypto/err/err.c 
+  crypto/err/err_all.c 
+  crypto/err/err_prn.c 
+  crypto/evp/bio_b64.c 
+  crypto/evp/bio_enc.c 
+  crypto/evp/bio_md.c 
+  crypto/evp/bio_ok.c 
+  crypto/evp/c_allc.c 
+  crypto/evp/c_alld.c 
+  crypto/evp/cmeth_lib.c 
+  crypto/evp/digest.c 
+  crypto/evp/e_aes.c 
+  crypto/evp/e_aes_cbc_hmac_sha1.c 
+  crypto/evp/e_aes_cbc_hmac_sha256.c 
+  crypto/evp/e_bf.c 
+  crypto/evp/e_chacha20_poly1305.c 
+  crypto/evp/e_des.c 
+  crypto/evp/e_des3.c 
+  crypto/evp/e_null.c 
+  crypto/evp/e_old.c 
+  crypto/evp/e_rc2.c 
+  crypto/evp/e_rc4.c 
+  crypto/evp/e_rc4_hmac_md5.c 
+  crypto/evp/e_rc5.c 
+  crypto/evp/e_xcbc_d.c 
+  crypto/evp/encode.c 
+  crypto/evp/evp_cnf.c 
+  crypto/evp/evp_enc.c 
+  crypto/evp/evp_err.c 
+  crypto/evp/evp_key.c 
+  crypto/evp/evp_lib.c 
+  crypto/evp/evp_pbe.c 
+  crypto/evp/evp_pkey.c 
+  crypto/evp/m_md4.c 
+  crypto/evp/m_md5.c 
+  crypto/evp/m_md5_sha1.c 
+  crypto/evp/m_mdc2.c 
+  crypto/evp/m_null.c 
+  crypto/evp/m_sha1.c 
+  crypto/evp/m_sigver.c 
+  crypto/evp/m_wp.c 
+  crypto/evp/names.c 
+  crypto/evp/p5_crpt.c 
+  crypto/evp/p5_crpt2.c 
+  crypto/evp/p_dec.c 
+  crypto/evp/p_enc.c 
+  crypto/evp/p_lib.c 
+  crypto/evp/p_open.c 
+  crypto/evp/p_seal.c 
+  crypto/evp/p_sign.c 
+  crypto/evp/p_verify.c 
+  crypto/evp/pmeth_fn.c 
+  crypto/evp/pmeth_gn.c 
+  crypto/evp/pmeth_lib.c 
+  crypto/evp/scrypt.c 
+  crypto/ex_data.c 
+  crypto/hmac/hm_ameth.c 
+  crypto/hmac/hm_pmeth.c 
+  crypto/hmac/hmac.c 
+  crypto/init.c 
+  crypto/kdf/hkdf.c 
+  crypto/kdf/kdf_err.c 
+  crypto/kdf/tls1_prf.c 
+  crypto/lhash/lh_stats.c 
+  crypto/lhash/lhash.c 
+  crypto/md4/md4_dgst.c 
+  crypto/md4/md4_one.c 
+  crypto/md5/md5_dgst.c 
+  crypto/md5/md5_one.c 
+  crypto/mem.c 
+  crypto/mem_dbg.c 
+  crypto/mem_sec.c 
+  crypto/modes/cbc128.c 
+  crypto/modes/ccm128.c 
+  crypto/modes/cfb128.c 
+  crypto/modes/ctr128.c 
+  crypto/modes/gcm128.c 
+  crypto/modes/ocb128.c 
+  crypto/modes/ofb128.c 
+  crypto/modes/wrap128.c 
+  crypto/modes/xts128.c 
+  crypto/o_dir.c 
+  crypto/o_fips.c 
+  crypto/o_fopen.c 
+  crypto/o_init.c 
+  crypto/o_str.c 
+  crypto/o_time.c 
+  crypto/objects/o_names.c 
+  crypto/objects/obj_dat.c 
+  crypto/objects/obj_err.c 
+  crypto/objects/obj_lib.c 
+  crypto/objects/obj_xref.c 
+  crypto/ocsp/ocsp_asn.c 
+  crypto/ocsp/ocsp_cl.c 
+  crypto/ocsp/ocsp_err.c 
+  crypto/ocsp/ocsp_ext.c 
+  crypto/ocsp/ocsp_ht.c 
+  crypto/ocsp/ocsp_lib.c 
+  crypto/ocsp/ocsp_prn.c 
+  crypto/ocsp/ocsp_srv.c 
+  crypto/ocsp/ocsp_vfy.c 
+  crypto/ocsp/v3_ocsp.c 
+  crypto/pem/pem_all.c 
+  crypto/pem/pem_err.c 
+  crypto/pem/pem_info.c 
+  crypto/pem/pem_lib.c 
+  crypto/pem/pem_oth.c 
+  crypto/pem/pem_pk8.c 
+  crypto/pem/pem_pkey.c 
+  crypto/pem/pem_sign.c 
+  crypto/pem/pem_x509.c 
+  crypto/pem/pem_xaux.c 
+  crypto/pem/pvkfmt.c 
+  crypto/pkcs12/p12_add.c 
+  crypto/pkcs12/p12_asn.c 
+  crypto/pkcs12/p12_attr.c 
+  crypto/pkcs12/p12_crpt.c 
+  crypto/pkcs12/p12_crt.c 
+  crypto/pkcs12/p12_decr.c 
+  crypto/pkcs12/p12_init.c 
+  crypto/pkcs12/p12_key.c 
+  crypto/pkcs12/p12_kiss.c 
+  crypto/pkcs12/p12_mutl.c 
+  crypto/pkcs12/p12_npas.c 
+  crypto/pkcs12/p12_p8d.c 
+  crypto/pkcs12/p12_p8e.c 
+  crypto/pkcs12/p12_sbag.c 
+  crypto/pkcs12/p12_utl.c 
+  crypto/pkcs12/pk12err.c 
+  crypto/pkcs7/pk7_asn1.c 
+  crypto/pkcs7/pk7_attr.c 
+  crypto/pkcs7/pk7_doit.c 
+  crypto/pkcs7/pk7_lib.c 
+  crypto/pkcs7/pk7_mime.c 
+  crypto/pkcs7/pk7_smime.c 
+  crypto/pkcs7/pkcs7err.c 
+  crypto/poly1305/poly1305.c 
+  crypto/rand/md_rand.c 
+  crypto/rand/rand_egd.c 
+  crypto/rand/rand_err.c 
+  crypto/rand/rand_lib.c 
+  crypto/rand/rand_unix.c 
+  crypto/rand/rand_win.c 
+  crypto/rand/randfile.c 
+  crypto/rc2/rc2_cbc.c 
+  crypto/rc2/rc2_ecb.c 
+  crypto/rc2/rc2_skey.c 
+  crypto/rc2/rc2cfb64.c 
+  crypto/rc2/rc2ofb64.c 
+  crypto/rc4/rc4_enc.c 
+  crypto/rc4/rc4_skey.c 
+  crypto/rsa/rsa_ameth.c 
+  crypto/rsa/rsa_asn1.c 
+  crypto/rsa/rsa_chk.c 
+  crypto/rsa/rsa_crpt.c 
+  crypto/rsa/rsa_err.c 
+  crypto/rsa/rsa_gen.c 
+  crypto/rsa/rsa_lib.c 
+  crypto/rsa/rsa_meth.c 
+  crypto/rsa/rsa_none.c 
+  crypto/rsa/rsa_null.c 
+  crypto/rsa/rsa_oaep.c 
+  crypto/rsa/rsa_ossl.c 
+  crypto/rsa/rsa_pk1.c 
+  crypto/rsa/rsa_pmeth.c 
+  crypto/rsa/rsa_prn.c 
+  crypto/rsa/rsa_pss.c 
+  crypto/rsa/rsa_saos.c 
+  crypto/rsa/rsa_sign.c 
+  crypto/rsa/rsa_ssl.c 
+  crypto/rsa/rsa_x931.c 
+  crypto/rsa/rsa_x931g.c 
+  crypto/sha/sha1_one.c 
+  crypto/sha/sha1dgst.c 
+  crypto/sha/sha256.c 
+  crypto/sha/sha512.c 
+  crypto/srp/srp_lib.c 
+  crypto/srp/srp_vfy.c 
+  crypto/stack/stack.c 
+  crypto/threads_none.c 
+  crypto/threads_pthread.c 
+  crypto/threads_win.c 
+  crypto/ts/ts_err.c 
+  crypto/txt_db/txt_db.c 
+  crypto/ui/ui_err.c 
+  crypto/ui/ui_lib.c 
+  crypto/ui/ui_openssl.c 
+  crypto/ui/ui_util.c 
+  crypto/uid.c 
+  crypto/x509/by_dir.c 
+  crypto/x509/by_file.c 
+  crypto/x509/t_crl.c 
+  crypto/x509/t_req.c 
+  crypto/x509/t_x509.c 
+  crypto/x509/x509_att.c 
+  crypto/x509/x509_cmp.c 
+  crypto/x509/x509_d2.c 
+  crypto/x509/x509_def.c 
+  crypto/x509/x509_err.c 
+  crypto/x509/x509_ext.c 
+  crypto/x509/x509_lu.c 
+  crypto/x509/x509_obj.c 
+  crypto/x509/x509_r2x.c 
+  crypto/x509/x509_req.c 
+  crypto/x509/x509_set.c 
+  crypto/x509/x509_trs.c 
+  crypto/x509/x509_txt.c 
+  crypto/x509/x509_v3.c 
+  crypto/x509/x509_vfy.c 
+  crypto/x509/x509_vpm.c 
+  crypto/x509/x509cset.c 
+  crypto/x509/x509name.c 
+  crypto/x509/x509rset.c 
+  crypto/x509/x509spki.c 
+  crypto/x509/x509type.c 
+  crypto/x509/x_all.c 
+  crypto/x509/x_attrib.c 
+  crypto/x509/x_crl.c 
+  crypto/x509/x_exten.c 
+  crypto/x509/x_name.c 
+  crypto/x509/x_pubkey.c 
+  crypto/x509/x_req.c 
+  crypto/x509/x_x509.c 
+  crypto/x509/x_x509a.c 
+  crypto/x509v3/pcy_cache.c 
+  crypto/x509v3/pcy_data.c 
+  crypto/x509v3/pcy_lib.c 
+  crypto/x509v3/pcy_map.c 
+  crypto/x509v3/pcy_node.c 
+  crypto/x509v3/pcy_tree.c 
+  crypto/x509v3/v3_akey.c 
+  crypto/x509v3/v3_akeya.c 
+  crypto/x509v3/v3_alt.c 
+  crypto/x509v3/v3_bcons.c 
+  crypto/x509v3/v3_bitst.c 
+  crypto/x509v3/v3_conf.c 
+  crypto/x509v3/v3_cpols.c 
+  crypto/x509v3/v3_crld.c 
+  crypto/x509v3/v3_enum.c 
+  crypto/x509v3/v3_extku.c 
+  crypto/x509v3/v3_genn.c 
+  crypto/x509v3/v3_ia5.c 
+  crypto/x509v3/v3_info.c 
+  crypto/x509v3/v3_int.c 
+  crypto/x509v3/v3_lib.c 
+  crypto/x509v3/v3_ncons.c 
+  crypto/x509v3/v3_pci.c 
+  crypto/x509v3/v3_pcia.c 
+  crypto/x509v3/v3_pcons.c 
+  crypto/x509v3/v3_pku.c 
+  crypto/x509v3/v3_pmaps.c 
+  crypto/x509v3/v3_prn.c 
+  crypto/x509v3/v3_purp.c 
+  crypto/x509v3/v3_skey.c 
+  crypto/x509v3/v3_sxnet.c 
+  crypto/x509v3/v3_tlsf.c 
+  crypto/x509v3/v3_utl.c 
+  crypto/x509v3/v3err.c 
+)
+if (${ANDROID_ABI} STREQUAL "armeabi-v7a")
+  set(crypto_srcs ${crypto_srcs}
+    crypto/aes/asm/aes-armv4.S 
+    crypto/aes/asm/aesv8-armx.S 
+    crypto/aes/asm/bsaes-armv7.S 
+    crypto/armcap.c 
+    crypto/armv4cpuid.S 
+    crypto/bn/asm/armv4-gf2m.S 
+    crypto/bn/asm/armv4-mont.S 
+    crypto/ec/asm/ecp_nistz256-armv4.S 
+    crypto/modes/asm/ghash-armv4.S 
+    crypto/modes/asm/ghashv8-armx.S 
+    crypto/sha/asm/sha1-armv4-large.S 
+    crypto/sha/asm/sha256-armv4.S 
+    crypto/sha/asm/sha512-armv4.S
+    )
+  list(REMOVE_ITEM crypto_srcs
+    crypto/aes/aes_core.c 
+    )
+elseif(${ANDROID_ABI} STREQUAL "arm64-v8a")
+  set(crypto_srcs ${crypto_srcs}
+    crypto/aes/asm/aesv8-armx-64.S 
+    crypto/aes/asm/vpaes-armv8.S 
+    crypto/arm64cpuid.S 
+    crypto/armcap.c 
+    crypto/bn/asm/armv8-mont.S 
+    crypto/ec/asm/ecp_nistz256-armv8.S 
+    crypto/modes/asm/ghashv8-armx-64.S 
+    crypto/poly1305/asm/poly1305-armv8.S 
+    crypto/sha/asm/sha1-armv8.S 
+    crypto/sha/asm/sha256-armv8.S 
+    crypto/sha/asm/sha512-armv8.S
+    )
+elseif(${ANDROID_ABI} STREQUAL "x86")
+  set(crypto_srcs ${crypto_srcs}
+    crypto/aes/asm/aes-586.S 
+    crypto/aes/asm/aesni-x86.S 
+    crypto/aes/asm/vpaes-x86.S 
+    crypto/bf/asm/bf-586.S 
+    crypto/bn/asm/bn-586.S 
+    crypto/bn/asm/co-586.S 
+    crypto/bn/asm/x86-gf2m.S 
+    crypto/bn/asm/x86-mont.S 
+    crypto/des/asm/crypt586.S 
+    crypto/des/asm/des-586.S 
+    crypto/ec/asm/ecp_nistz256-x86.S 
+    crypto/md5/asm/md5-586.S 
+    crypto/modes/asm/ghash-x86.S 
+    crypto/poly1305/asm/poly1305-x86.S 
+    crypto/sha/asm/sha1-586.S 
+    crypto/sha/asm/sha256-586.S 
+    crypto/sha/asm/sha512-586.S 
+    crypto/x86cpuid.S  
+    )
+  list(REMOVE_ITEM crypto_srcs
+    crypto/aes/aes_cbc.c 
+    crypto/aes/aes_core.c 
+    crypto/bf/bf_enc.c 
+    crypto/bn/bn_asm.c 
+    crypto/des/des_enc.c 
+    crypto/des/fcrypt_b.c 
+    )
+elseif(${ANDROID_ABI} STREQUAL "x86_64")
+  set(crypto_srcs ${crypto_srcs}
+    crypto/aes/asm/aes-x86_64.S 
+    crypto/aes/asm/aesni-mb-x86_64.S 
+    crypto/aes/asm/aesni-sha1-x86_64.S 
+    crypto/aes/asm/aesni-sha256-x86_64.S 
+    crypto/aes/asm/aesni-x86_64.S 
+    crypto/aes/asm/bsaes-x86_64.S 
+    crypto/aes/asm/vpaes-x86_64.S 
+    crypto/bn/asm/rsaz-avx2.S 
+    crypto/bn/asm/rsaz-x86_64.S 
+    crypto/bn/asm/x86_64-gcc.c 
+    crypto/bn/asm/x86_64-gf2m.S 
+    crypto/bn/asm/x86_64-mont.S 
+    crypto/bn/asm/x86_64-mont5.S 
+    crypto/ec/asm/ecp_nistz256-x86_64.S 
+    crypto/md5/asm/md5-x86_64.S 
+    crypto/modes/asm/aesni-gcm-x86_64.S 
+    crypto/modes/asm/ghash-x86_64.S 
+    crypto/poly1305/asm/poly1305-x86_64.S 
+    crypto/rc4/asm/rc4-md5-x86_64.S 
+    crypto/rc4/asm/rc4-x86_64.S 
+    crypto/sha/asm/sha1-mb-x86_64.S 
+    crypto/sha/asm/sha1-x86_64.S 
+    crypto/sha/asm/sha256-mb-x86_64.S 
+    crypto/sha/asm/sha256-x86_64.S 
+    crypto/sha/asm/sha512-x86_64.S 
+    crypto/x86_64cpuid.S 
+    )
+
+  list(REMOVE_ITEM crypto_srcs
+    crypto/aes/aes_cbc.c 
+    crypto/aes/aes_core.c 
+    crypto/bn/bn_asm.c 
+    crypto/mem_clr.c 
+    crypto/rc4/rc4_enc.c 
+    crypto/rc4/rc4_skey.c
+    )
+else()
+  message( FATAL_ERROR "Unknown arch ${ANDROID_ABI} for source files" )
+endif()
+
+PREPEND(crypto_srcs_with_path "openssl" ${crypto_srcs})
+add_library(crypto ${crypto_srcs_with_path})
+
+target_include_directories(crypto PUBLIC
+  ${CMAKE_CURRENT_SOURCE_DIR}/crypto/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/openssl/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/openssl/crypto/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/openssl/
+  ${CMAKE_CURRENT_SOURCE_DIR}/openssl/crypto/
+  )
+
+target_include_directories(crypto PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}/openssl/crypto/modes
+  
+  )
+
+target_compile_definitions(crypto PRIVATE -DNO_WINDOWS_BRAINDEATH)
+target_compile_options(crypto PRIVATE -Wno-missing-field-initializers -Wno-unused-parameter)
+
+if (${ANDROID_ABI} STREQUAL "armeabi-v7a") 
+    target_compile_definitions(crypto PRIVATE
+      -DAES_ASM
+      -DBSAES_ASM 
+      -DDSO_DLFCN 
+      -DECP_NISTZ256_ASM 
+      -DGHASH_ASM 
+      -DHAVE_DLFCN_H 
+      -DL_ENDIAN 
+      -DNDEBUG 
+      -DOPENSSL_BN_ASM_GF2m 
+      -DOPENSSL_BN_ASM_MONT 
+      -DOPENSSL_CPUID_OBJ 
+      -DOPENSSL_NO_STATIC_ENGINE 
+      -DOPENSSL_PIC 
+      -DOPENSSL_THREADS 
+      -DSHA1_ASM 
+      -DSHA256_ASM 
+      -DSHA512_ASM 
+      )
+  elseif(${ANDROID_ABI} STREQUAL "arm64-v8a")
+    target_compile_definitions(crypto PRIVATE    
+      -DDSO_DLFCN 
+      -DECP_NISTZ256_ASM 
+      -DHAVE_DLFCN_H 
+      -DL_ENDIAN 
+      -DNDEBUG 
+      -DOPENSSL_BN_ASM_MONT 
+      -DOPENSSL_CPUID_OBJ 
+      -DOPENSSL_NO_STATIC_ENGINE 
+      -DOPENSSL_PIC 
+      -DOPENSSL_THREADS 
+      -DPOLY1305_ASM 
+      -DSHA1_ASM 
+      -DSHA256_ASM 
+      -DSHA512_ASM 
+      -DVPAES_ASM  
+      )
+  elseif(${ANDROID_ABI} STREQUAL "x86")
+    target_compile_definitions(crypto PRIVATE    
+      -DAES_ASM 
+      -DDSO_DLFCN 
+      -DECP_NISTZ256_ASM 
+      -DGHASH_ASM 
+      -DHAVE_DLFCN_H 
+      -DL_ENDIAN 
+      -DMD5_ASM 
+      -DNDEBUG 
+      -DOPENSSL_BN_ASM_GF2m 
+      -DOPENSSL_BN_ASM_MONT 
+      -DOPENSSL_BN_ASM_PART_WORDS 
+      -DOPENSSL_CPUID_OBJ 
+      -DOPENSSL_IA32_SSE2 
+      -DOPENSSL_NO_STATIC_ENGINE 
+      -DOPENSSL_PIC 
+      -DOPENSSL_THREADS 
+      -DPADLOCK_ASM 
+      -DPOLY1305_ASM 
+      -DRC4_ASM 
+      -DRMD160_ASM 
+      -DSHA1_ASM 
+      -DSHA256_ASM 
+      -DSHA512_ASM 
+      -DVPAES_ASM 
+      )
+  elseif(${ANDROID_ABI} STREQUAL "x86_64")
+    target_compile_definitions(crypto PRIVATE
+      -DAES_ASM 
+      -DBSAES_ASM 
+      -DDSO_DLFCN 
+      -DECP_NISTZ256_ASM 
+      -DGHASH_ASM 
+      -DHAVE_DLFCN_H 
+      -DL_ENDIAN 
+      -DMD5_ASM 
+      -DNDEBUG 
+      -DOPENSSL_BN_ASM_GF2m 
+      -DOPENSSL_BN_ASM_MONT 
+      -DOPENSSL_BN_ASM_MONT5 
+      -DOPENSSL_CPUID_OBJ 
+      -DOPENSSL_IA32_SSE2 
+      -DOPENSSL_NO_STATIC_ENGINE 
+      -DOPENSSL_PIC 
+      -DOPENSSL_THREADS 
+      -DPADLOCK_ASM 
+      -DPOLY1305_ASM 
+      -DRC4_ASM 
+      -DSHA1_ASM 
+      -DSHA256_ASM 
+      -DSHA512_ASM 
+      -DVPAES_ASM 
+
+      )
+  else()
+    message( FATAL_ERROR "Unknown arch ${ANDROID_ABI} for flags" )
+endif()
+
+if (${ANDROID_ABI} STREQUAL "x86_64" OR ${ANDROID_ABI} STREQUAL "arm64-v8a")
+  target_compile_definitions(crypto PRIVATE    
+    -DOPENSSLDIR=\"/system/lib/ssl\" 
+    -DENGINESDIR=\"/system/lib/ssl/engines\"
+    )
+else()
+  target_compile_definitions(crypto PRIVATE    
+    -DOPENSSLDIR=\"/system/lib64/ssl\"
+    -DENGINESDIR=\"/system/lib64/ssl/engines\"
+    )
+endif()
+
+
+
+################## SSL Library ###########################################
+
+set (ssl_srcs
+  ssl/bio_ssl.c 
+  ssl/d1_lib.c 
+  ssl/d1_msg.c 
+  ssl/d1_srtp.c 
+  ssl/methods.c 
+  ssl/pqueue.c 
+  ssl/record/dtls1_bitmap.c 
+  ssl/record/rec_layer_d1.c 
+  ssl/record/rec_layer_s3.c 
+  ssl/record/ssl3_buffer.c 
+  ssl/record/ssl3_record.c 
+  ssl/s3_cbc.c 
+  ssl/s3_enc.c 
+  ssl/s3_lib.c 
+  ssl/s3_msg.c 
+  ssl/ssl_asn1.c 
+  ssl/ssl_cert.c 
+  ssl/ssl_ciph.c 
+  ssl/ssl_conf.c 
+  ssl/ssl_err.c 
+  ssl/ssl_init.c 
+  ssl/ssl_lib.c 
+  ssl/ssl_mcnf.c 
+  ssl/ssl_rsa.c 
+  ssl/ssl_sess.c 
+  ssl/ssl_stat.c 
+  ssl/ssl_txt.c 
+  ssl/ssl_utst.c 
+  ssl/statem/statem.c 
+  ssl/statem/statem_clnt.c 
+  ssl/statem/statem_dtls.c 
+  ssl/statem/statem_lib.c 
+  ssl/statem/statem_srvr.c 
+  ssl/t1_enc.c 
+  ssl/t1_ext.c 
+  ssl/t1_lib.c 
+  ssl/t1_reneg.c 
+  ssl/t1_trce.c 
+  ssl/tls_srp.c 
+)
+
+PREPEND(ssl_srcs_with_path "openssl" ${ssl_srcs})
+add_library(ssl ${ssl_srcs_with_path})
+
+
+target_link_libraries(ssl crypto)
+
+#MESSAGE(FATAL_ERROR "ASM is ${CMAKE_ASM_SOURCE_FILE_EXTENSIONS} and ${CMAKE_CXX_SOURCE_FILE_EXTENSIONS}")
diff --git a/main/src/main/cpp/openvpn b/main/src/main/cpp/openvpn
new file mode 160000
+Subproject badf99f453270412506a1f8e6bd99c15fb58401
diff --git a/main/src/main/cpp/openvpn3 b/main/src/main/cpp/openvpn3
new file mode 160000
+Subproject 015763be304640ad27e1cea65bbfcfd5fdcd603
diff --git a/main/jni/jniglue.c b/main/src/main/cpp/opvpnutil/jniglue.c
index bb5ec688..bb5ec688 100644
--- a/main/jni/jniglue.c
+++ b/main/src/main/cpp/opvpnutil/jniglue.c
diff --git a/main/jni/jniglue.h b/main/src/main/cpp/opvpnutil/jniglue.h
index 8f813b64..8f813b64 100644
--- a/main/jni/jniglue.h
+++ b/main/src/main/cpp/opvpnutil/jniglue.h
diff --git a/main/jni/scan_ifs.c b/main/src/main/cpp/opvpnutil/scan_ifs.c
index a26e2b36..a26e2b36 100644
--- a/main/jni/scan_ifs.c
+++ b/main/src/main/cpp/opvpnutil/scan_ifs.c
diff --git a/main/jni/sslspeed.c b/main/src/main/cpp/opvpnutil/sslspeed.c
index 0ce9ede2..0ce9ede2 100644
--- a/main/jni/sslspeed.c
+++ b/main/src/main/cpp/opvpnutil/sslspeed.c
diff --git a/main/src/main/cpp/tools.cmake b/main/src/main/cpp/tools.cmake
new file mode 100644
index 00000000..2bd25b4b
--- /dev/null
+++ b/main/src/main/cpp/tools.cmake
@@ -0,0 +1,7 @@
+FUNCTION(PREPEND var prefix)
+   SET(listVar "")
+   FOREACH(f ${ARGN})
+      LIST(APPEND listVar "${prefix}/${f}")
+   ENDFOREACH(f)
+   SET(${var} "${listVar}" PARENT_SCOPE)
+ENDFUNCTION(PREPEND)
diff --git a/remoteExample/build.gradle b/remoteExample/build.gradle
index cae24e03..f3b0c749 100644
--- a/remoteExample/build.gradle
+++ b/remoteExample/build.gradle
@@ -5,9 +5,16 @@
 
 apply plugin: 'com.android.application'
 
+repositories {
+    jcenter()
+    maven { url "https://jitpack.io" }
+    maven { url 'https://maven.google.com' }
+}
+
+
 android {
     compileSdkVersion 27
-    buildToolsVersion '27.0.1'
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
         minSdkVersion 15
@@ -18,5 +25,4 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
 }