2152 files changed, 174 insertions, 158 deletions

diff --git a/.classpath b/.classpath
deleted file mode 100644
index 0b084083..00000000
--- a/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/.project b/.project
deleted file mode 100644
index b9e0fd8f..00000000
--- a/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>icsopenvpn</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/build.gradle b/main/build.gradle
index 0bce7ac3..8b03c862 100644
--- a/build.gradle
+++ b/main/build.gradle
@@ -30,25 +30,10 @@ android {
 
     sourceSets {
         main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            resources.srcDirs = ['src']
-            aidl.srcDirs = ['src']
-            renderscript.srcDirs = ['src']
-            res.srcDirs = ['res']
-            assets.srcDirs = ['assets']
+           assets.srcDirs = ['main/src/assets', 'ovpnlibs/assets'] 
+            jniLibs.srcDirs = ['ovpnlibs/jniLibs']
+            jni.srcDirs = [] //disable automatic ndk-build
         }
-
-        xposedmodule {
-            manifest.srcFile 'xposed/AndroidManifest.xml'
-            java.srcDirs = ['xposed/src']
-            resources.srcDirs = ['xposed/src']
-            aidl.srcDirs = ['xposed/src']
-            renderscript.srcDirs = ['xposed/src']
-            res.srcDirs = ['xposed/res']
-            assets.srcDirs = ['xposed/assets']
-        }
-
     }
     
     /*
@@ -85,8 +70,9 @@ if (project.hasProperty('keystoreFile') &&
     android.buildTypes.release.signingConfig = null
 }
 
-tasks.withType(com.android.build.gradle.tasks.PackageApplication) { pkgTask ->
+/*tasks.withType(com.android.build.gradle.tasks.PackageApplication) { pkgTask ->
     pkgTask.jniFolders = new HashSet<File>()
     pkgTask.jniFolders.add(new File(buildDir, 'native-libs'))
 }
+*/
 
diff --git a/jni/Android.mk b/main/jni/Android.mk
index fc2158d2..fc2158d2 100644
--- a/jni/Android.mk
+++ b/main/jni/Android.mk
diff --git a/jni/Application.mk b/main/jni/Application.mk
index b69669ac..b69669ac 100644
--- a/jni/Application.mk
+++ b/main/jni/Application.mk
diff --git a/jni/dummy.cpp b/main/jni/dummy.cpp
index 58466656..58466656 100644
--- a/jni/dummy.cpp
+++ b/main/jni/dummy.cpp
diff --git a/jni/jbcrypto.cpp b/main/jni/jbcrypto.cpp
index 2fd1262a..2fd1262a 100644
--- a/jni/jbcrypto.cpp
+++ b/main/jni/jbcrypto.cpp
diff --git a/jni/jniglue.c b/main/jni/jniglue.c
index 36ad8fe7..36ad8fe7 100644
--- a/jni/jniglue.c
+++ b/main/jni/jniglue.c
diff --git a/jni/jniglue.h b/main/jni/jniglue.h
index a86d52da..a86d52da 100644
--- a/jni/jniglue.h
+++ b/main/jni/jniglue.h
diff --git a/jni/minivpn.c b/main/jni/minivpn.c
index e69de29b..e69de29b 100644
--- a/jni/minivpn.c
+++ b/main/jni/minivpn.c
diff --git a/lzo/AUTHORS b/main/lzo/AUTHORS
index d53d32cd..d53d32cd 100644
--- a/lzo/AUTHORS
+++ b/main/lzo/AUTHORS
diff --git a/lzo/Android.mk b/main/lzo/Android.mk
index 004be5fb..004be5fb 100644
--- a/lzo/Android.mk
+++ b/main/lzo/Android.mk
diff --git a/lzo/B/00README.TXT b/main/lzo/B/00README.TXT
index 45bdf7b8..45bdf7b8 100644
--- a/lzo/B/00README.TXT
+++ b/main/lzo/B/00README.TXT
diff --git a/lzo/B/clean.bat b/main/lzo/B/clean.bat
index 1f7de592..1f7de592 100644
--- a/lzo/B/clean.bat
+++ b/main/lzo/B/clean.bat
diff --git a/lzo/B/done.bat b/main/lzo/B/done.bat
index b9bf6aa0..b9bf6aa0 100644
--- a/lzo/B/done.bat
+++ b/main/lzo/B/done.bat
diff --git a/lzo/B/dos16/bc.bat b/main/lzo/B/dos16/bc.bat
index 292b793a..292b793a 100644
--- a/lzo/B/dos16/bc.bat
+++ b/main/lzo/B/dos16/bc.bat
diff --git a/lzo/B/dos16/bc.rsp b/main/lzo/B/dos16/bc.rsp
index 8a1d83e4..8a1d83e4 100644
--- a/lzo/B/dos16/bc.rsp
+++ b/main/lzo/B/dos16/bc.rsp
diff --git a/lzo/B/dos16/bc_286.bat b/main/lzo/B/dos16/bc_286.bat
index 025a48ea..025a48ea 100644
--- a/lzo/B/dos16/bc_286.bat
+++ b/main/lzo/B/dos16/bc_286.bat
diff --git a/lzo/B/dos16/bc_pp.bat b/main/lzo/B/dos16/bc_pp.bat
index 6c0aac37..6c0aac37 100644
--- a/lzo/B/dos16/bc_pp.bat
+++ b/main/lzo/B/dos16/bc_pp.bat
diff --git a/lzo/B/dos16/dm.bat b/main/lzo/B/dos16/dm.bat
index 1ec6feca..1ec6feca 100644
--- a/lzo/B/dos16/dm.bat
+++ b/main/lzo/B/dos16/dm.bat
diff --git a/lzo/B/dos16/mc.bat b/main/lzo/B/dos16/mc.bat
index 4f34a36f..4f34a36f 100644
--- a/lzo/B/dos16/mc.bat
+++ b/main/lzo/B/dos16/mc.bat
diff --git a/lzo/B/dos16/mc_qc.bat b/main/lzo/B/dos16/mc_qc.bat
index 1c2ce940..1c2ce940 100644
--- a/lzo/B/dos16/mc_qc.bat
+++ b/main/lzo/B/dos16/mc_qc.bat
diff --git a/lzo/B/dos16/qc.bat b/main/lzo/B/dos16/qc.bat
index 82734fd7..82734fd7 100644
--- a/lzo/B/dos16/qc.bat
+++ b/main/lzo/B/dos16/qc.bat
diff --git a/lzo/B/dos16/sc.bat b/main/lzo/B/dos16/sc.bat
index 056c04a9..056c04a9 100644
--- a/lzo/B/dos16/sc.bat
+++ b/main/lzo/B/dos16/sc.bat
diff --git a/lzo/B/dos16/tc.bat b/main/lzo/B/dos16/tc.bat
index a3c32770..a3c32770 100644
--- a/lzo/B/dos16/tc.bat
+++ b/main/lzo/B/dos16/tc.bat
diff --git a/lzo/B/dos16/vc.bat b/main/lzo/B/dos16/vc.bat
index b0617859..b0617859 100644
--- a/lzo/B/dos16/vc.bat
+++ b/main/lzo/B/dos16/vc.bat
diff --git a/lzo/B/dos16/vc_qc.bat b/main/lzo/B/dos16/vc_qc.bat
index 329b092f..329b092f 100644
--- a/lzo/B/dos16/vc_qc.bat
+++ b/main/lzo/B/dos16/vc_qc.bat
diff --git a/lzo/B/dos16/wc.bat b/main/lzo/B/dos16/wc.bat
index c92135c0..c92135c0 100644
--- a/lzo/B/dos16/wc.bat
+++ b/main/lzo/B/dos16/wc.bat
diff --git a/lzo/B/dos16/wc.rsp b/main/lzo/B/dos16/wc.rsp
index c8e1c9ff..c8e1c9ff 100644
--- a/lzo/B/dos16/wc.rsp
+++ b/main/lzo/B/dos16/wc.rsp
diff --git a/lzo/B/dos32/bc_pp.bat b/main/lzo/B/dos32/bc_pp.bat
index 7cd86dd4..7cd86dd4 100644
--- a/lzo/B/dos32/bc_pp.bat
+++ b/main/lzo/B/dos32/bc_pp.bat
diff --git a/lzo/B/dos32/dj2.bat b/main/lzo/B/dos32/dj2.bat
index ac493992..ac493992 100644
--- a/lzo/B/dos32/dj2.bat
+++ b/main/lzo/B/dos32/dj2.bat
diff --git a/lzo/B/dos32/dj2.opt b/main/lzo/B/dos32/dj2.opt
index 9cd02cd0..9cd02cd0 100644
--- a/lzo/B/dos32/dj2.opt
+++ b/main/lzo/B/dos32/dj2.opt
diff --git a/lzo/B/dos32/dm.bat b/main/lzo/B/dos32/dm.bat
index 0449668c..0449668c 100644
--- a/lzo/B/dos32/dm.bat
+++ b/main/lzo/B/dos32/dm.bat
diff --git a/lzo/B/dos32/emx.bat b/main/lzo/B/dos32/emx.bat
index ceb97e4d..ceb97e4d 100644
--- a/lzo/B/dos32/emx.bat
+++ b/main/lzo/B/dos32/emx.bat
diff --git a/lzo/B/dos32/highc.bat b/main/lzo/B/dos32/highc.bat
index e3e28a7c..e3e28a7c 100644
--- a/lzo/B/dos32/highc.bat
+++ b/main/lzo/B/dos32/highc.bat
diff --git a/lzo/B/dos32/highc.rsp b/main/lzo/B/dos32/highc.rsp
index ef2dc7fa..ef2dc7fa 100644
--- a/lzo/B/dos32/highc.rsp
+++ b/main/lzo/B/dos32/highc.rsp
diff --git a/lzo/B/dos32/ndp.bat b/main/lzo/B/dos32/ndp.bat
index 64b04ed4..64b04ed4 100644
--- a/lzo/B/dos32/ndp.bat
+++ b/main/lzo/B/dos32/ndp.bat
diff --git a/lzo/B/dos32/ndp.rsp b/main/lzo/B/dos32/ndp.rsp
index c62b19eb..c62b19eb 100644
--- a/lzo/B/dos32/ndp.rsp
+++ b/main/lzo/B/dos32/ndp.rsp
diff --git a/lzo/B/dos32/sc.bat b/main/lzo/B/dos32/sc.bat
index 1b233336..1b233336 100644
--- a/lzo/B/dos32/sc.bat
+++ b/main/lzo/B/dos32/sc.bat
diff --git a/lzo/B/dos32/wc.bat b/main/lzo/B/dos32/wc.bat
index bfa776d5..bfa776d5 100644
--- a/lzo/B/dos32/wc.bat
+++ b/main/lzo/B/dos32/wc.bat
diff --git a/lzo/B/dos32/zc.bat b/main/lzo/B/dos32/zc.bat
index 0da77941..0da77941 100644
--- a/lzo/B/dos32/zc.bat
+++ b/main/lzo/B/dos32/zc.bat
diff --git a/lzo/B/generic/Makefile b/main/lzo/B/generic/Makefile
index acddb04e..acddb04e 100644
--- a/lzo/B/generic/Makefile
+++ b/main/lzo/B/generic/Makefile
diff --git a/lzo/B/generic/build.sh b/main/lzo/B/generic/build.sh
index 1bf5585b..1bf5585b 100755
--- a/lzo/B/generic/build.sh
+++ b/main/lzo/B/generic/build.sh
diff --git a/lzo/B/generic/build_freestanding.sh b/main/lzo/B/generic/build_freestanding.sh
index 9473dd6d..9473dd6d 100755
--- a/lzo/B/generic/build_freestanding.sh
+++ b/main/lzo/B/generic/build_freestanding.sh
diff --git a/lzo/B/generic/build_gcc.sh b/main/lzo/B/generic/build_gcc.sh
index 179d8c0f..179d8c0f 100755
--- a/lzo/B/generic/build_gcc.sh
+++ b/main/lzo/B/generic/build_gcc.sh
diff --git a/lzo/B/generic/clean.sh b/main/lzo/B/generic/clean.sh
index 11c23951..11c23951 100755
--- a/lzo/B/generic/clean.sh
+++ b/main/lzo/B/generic/clean.sh
diff --git a/lzo/B/os2/emx.bat b/main/lzo/B/os2/emx.bat
index 01d7dfa4..01d7dfa4 100644
--- a/lzo/B/os2/emx.bat
+++ b/main/lzo/B/os2/emx.bat
diff --git a/lzo/B/os2/wc.bat b/main/lzo/B/os2/wc.bat
index 79e2082b..79e2082b 100644
--- a/lzo/B/os2/wc.bat
+++ b/main/lzo/B/os2/wc.bat
diff --git a/lzo/B/os2/zc.bat b/main/lzo/B/os2/zc.bat
index 47a6d51b..47a6d51b 100644
--- a/lzo/B/os2/zc.bat
+++ b/main/lzo/B/os2/zc.bat
diff --git a/lzo/B/os2_16/mc.bat b/main/lzo/B/os2_16/mc.bat
index 95742d41..95742d41 100644
--- a/lzo/B/os2_16/mc.bat
+++ b/main/lzo/B/os2_16/mc.bat
diff --git a/lzo/B/os2_16/wc.bat b/main/lzo/B/os2_16/wc.bat
index bbe17430..bbe17430 100644
--- a/lzo/B/os2_16/wc.bat
+++ b/main/lzo/B/os2_16/wc.bat
diff --git a/lzo/B/prepare.bat b/main/lzo/B/prepare.bat
index 34bac191..34bac191 100644
--- a/lzo/B/prepare.bat
+++ b/main/lzo/B/prepare.bat
diff --git a/lzo/B/src.rsp b/main/lzo/B/src.rsp
index 2a1dbce6..2a1dbce6 100644
--- a/lzo/B/src.rsp
+++ b/main/lzo/B/src.rsp
diff --git a/lzo/B/unset.bat b/main/lzo/B/unset.bat
index 21672dd6..21672dd6 100644
--- a/lzo/B/unset.bat
+++ b/main/lzo/B/unset.bat
diff --git a/lzo/B/win16/bc.bat b/main/lzo/B/win16/bc.bat
index f252ada8..f252ada8 100644
--- a/lzo/B/win16/bc.bat
+++ b/main/lzo/B/win16/bc.bat
diff --git a/lzo/B/win16/dm.bat b/main/lzo/B/win16/dm.bat
index 8009a996..8009a996 100644
--- a/lzo/B/win16/dm.bat
+++ b/main/lzo/B/win16/dm.bat
diff --git a/lzo/B/win16/mc.bat b/main/lzo/B/win16/mc.bat
index 4404e421..4404e421 100644
--- a/lzo/B/win16/mc.bat
+++ b/main/lzo/B/win16/mc.bat
diff --git a/lzo/B/win16/sc.bat b/main/lzo/B/win16/sc.bat
index 0dab9e3c..0dab9e3c 100644
--- a/lzo/B/win16/sc.bat
+++ b/main/lzo/B/win16/sc.bat
diff --git a/lzo/B/win16/vc.bat b/main/lzo/B/win16/vc.bat
index 2c35cfc4..2c35cfc4 100644
--- a/lzo/B/win16/vc.bat
+++ b/main/lzo/B/win16/vc.bat
diff --git a/lzo/B/win16/wc.bat b/main/lzo/B/win16/wc.bat
index b5dbf22a..b5dbf22a 100644
--- a/lzo/B/win16/wc.bat
+++ b/main/lzo/B/win16/wc.bat
diff --git a/lzo/B/win32/bc.bat b/main/lzo/B/win32/bc.bat
index 2aa9028c..2aa9028c 100644
--- a/lzo/B/win32/bc.bat
+++ b/main/lzo/B/win32/bc.bat
diff --git a/lzo/B/win32/bc.rsp b/main/lzo/B/win32/bc.rsp
index 477f1ffd..477f1ffd 100644
--- a/lzo/B/win32/bc.rsp
+++ b/main/lzo/B/win32/bc.rsp
diff --git a/lzo/B/win32/cygwin.bat b/main/lzo/B/win32/cygwin.bat
index 661badba..661badba 100644
--- a/lzo/B/win32/cygwin.bat
+++ b/main/lzo/B/win32/cygwin.bat
diff --git a/lzo/B/win32/cygwin.rsp b/main/lzo/B/win32/cygwin.rsp
index 2c9c9f99..2c9c9f99 100644
--- a/lzo/B/win32/cygwin.rsp
+++ b/main/lzo/B/win32/cygwin.rsp
diff --git a/lzo/B/win32/dm.bat b/main/lzo/B/win32/dm.bat
index c06498d7..c06498d7 100644
--- a/lzo/B/win32/dm.bat
+++ b/main/lzo/B/win32/dm.bat
diff --git a/lzo/B/win32/ic.bat b/main/lzo/B/win32/ic.bat
index 807e33d9..807e33d9 100644
--- a/lzo/B/win32/ic.bat
+++ b/main/lzo/B/win32/ic.bat
diff --git a/lzo/B/win32/lccwin32.bat b/main/lzo/B/win32/lccwin32.bat
index e9a1c5f9..e9a1c5f9 100644
--- a/lzo/B/win32/lccwin32.bat
+++ b/main/lzo/B/win32/lccwin32.bat
diff --git a/lzo/B/win32/mingw.bat b/main/lzo/B/win32/mingw.bat
index 1a747bbd..1a747bbd 100644
--- a/lzo/B/win32/mingw.bat
+++ b/main/lzo/B/win32/mingw.bat
diff --git a/lzo/B/win32/mwerks.bat b/main/lzo/B/win32/mwerks.bat
index 99395cc0..99395cc0 100644
--- a/lzo/B/win32/mwerks.bat
+++ b/main/lzo/B/win32/mwerks.bat
diff --git a/lzo/B/win32/pellesc.bat b/main/lzo/B/win32/pellesc.bat
index 4c9569f1..4c9569f1 100644
--- a/lzo/B/win32/pellesc.bat
+++ b/main/lzo/B/win32/pellesc.bat
diff --git a/lzo/B/win32/pgi.bat b/main/lzo/B/win32/pgi.bat
index 73be86ed..73be86ed 100644
--- a/lzo/B/win32/pgi.bat
+++ b/main/lzo/B/win32/pgi.bat
diff --git a/lzo/B/win32/pw32.bat b/main/lzo/B/win32/pw32.bat
index b863dd0a..b863dd0a 100644
--- a/lzo/B/win32/pw32.bat
+++ b/main/lzo/B/win32/pw32.bat
diff --git a/lzo/B/win32/rsxnt.bat b/main/lzo/B/win32/rsxnt.bat
index 8f7b5795..8f7b5795 100644
--- a/lzo/B/win32/rsxnt.bat
+++ b/main/lzo/B/win32/rsxnt.bat
diff --git a/lzo/B/win32/sc.bat b/main/lzo/B/win32/sc.bat
index 83a4e565..83a4e565 100644
--- a/lzo/B/win32/sc.bat
+++ b/main/lzo/B/win32/sc.bat
diff --git a/lzo/B/win32/vc.bat b/main/lzo/B/win32/vc.bat
index 5a8a394b..5a8a394b 100644
--- a/lzo/B/win32/vc.bat
+++ b/main/lzo/B/win32/vc.bat
diff --git a/lzo/B/win32/vc.rsp b/main/lzo/B/win32/vc.rsp
index 6c5ca7ea..6c5ca7ea 100644
--- a/lzo/B/win32/vc.rsp
+++ b/main/lzo/B/win32/vc.rsp
diff --git a/lzo/B/win32/vc_dll.bat b/main/lzo/B/win32/vc_dll.bat
index f6aa14c0..f6aa14c0 100644
--- a/lzo/B/win32/vc_dll.bat
+++ b/main/lzo/B/win32/vc_dll.bat
diff --git a/lzo/B/win32/vc_dll.def b/main/lzo/B/win32/vc_dll.def
index cade569c..cade569c 100644
--- a/lzo/B/win32/vc_dll.def
+++ b/main/lzo/B/win32/vc_dll.def
diff --git a/lzo/B/win32/wc.bat b/main/lzo/B/win32/wc.bat
index ffdbe636..ffdbe636 100644
--- a/lzo/B/win32/wc.bat
+++ b/main/lzo/B/win32/wc.bat
diff --git a/lzo/B/win32/wc.rsp b/main/lzo/B/win32/wc.rsp
index 5bf8b8c1..5bf8b8c1 100644
--- a/lzo/B/win32/wc.rsp
+++ b/main/lzo/B/win32/wc.rsp
diff --git a/lzo/B/win64/ic.bat b/main/lzo/B/win64/ic.bat
index c5d367a9..c5d367a9 100644
--- a/lzo/B/win64/ic.bat
+++ b/main/lzo/B/win64/ic.bat
diff --git a/lzo/B/win64/ic_dll.bat b/main/lzo/B/win64/ic_dll.bat
index 6e5b7df7..6e5b7df7 100644
--- a/lzo/B/win64/ic_dll.bat
+++ b/main/lzo/B/win64/ic_dll.bat
diff --git a/lzo/B/win64/vc.bat b/main/lzo/B/win64/vc.bat
index 67245460..67245460 100644
--- a/lzo/B/win64/vc.bat
+++ b/main/lzo/B/win64/vc.bat
diff --git a/lzo/B/win64/vc.rsp b/main/lzo/B/win64/vc.rsp
index 182de60c..182de60c 100644
--- a/lzo/B/win64/vc.rsp
+++ b/main/lzo/B/win64/vc.rsp
diff --git a/lzo/B/win64/vc_dll.bat b/main/lzo/B/win64/vc_dll.bat
index 73bf6d3f..73bf6d3f 100644
--- a/lzo/B/win64/vc_dll.bat
+++ b/main/lzo/B/win64/vc_dll.bat
diff --git a/lzo/B/win64/vc_dll.def b/main/lzo/B/win64/vc_dll.def
index e80a637a..e80a637a 100644
--- a/lzo/B/win64/vc_dll.def
+++ b/main/lzo/B/win64/vc_dll.def
diff --git a/lzo/BUGS b/main/lzo/BUGS
index aed77990..aed77990 100644
--- a/lzo/BUGS
+++ b/main/lzo/BUGS
diff --git a/lzo/COPYING b/main/lzo/COPYING
index d159169d..d159169d 100644
--- a/lzo/COPYING
+++ b/main/lzo/COPYING
diff --git a/lzo/ChangeLog b/main/lzo/ChangeLog
index 755db71e..755db71e 100644
--- a/lzo/ChangeLog
+++ b/main/lzo/ChangeLog
diff --git a/lzo/INSTALL b/main/lzo/INSTALL
index 886ee504..886ee504 100644
--- a/lzo/INSTALL
+++ b/main/lzo/INSTALL
diff --git a/lzo/Makefile b/main/lzo/Makefile
index a9bbba9a..a9bbba9a 100644
--- a/lzo/Makefile
+++ b/main/lzo/Makefile
diff --git a/lzo/Makefile.am b/main/lzo/Makefile.am
index 4b728046..4b728046 100644
--- a/lzo/Makefile.am
+++ b/main/lzo/Makefile.am
diff --git a/lzo/Makefile.in b/main/lzo/Makefile.in
index b0395ea8..b0395ea8 100644
--- a/lzo/Makefile.in
+++ b/main/lzo/Makefile.in
diff --git a/lzo/NEWS b/main/lzo/NEWS
index 15eedeff..15eedeff 100644
--- a/lzo/NEWS
+++ b/main/lzo/NEWS
diff --git a/lzo/README b/main/lzo/README
index 9d1d3319..9d1d3319 100644
--- a/lzo/README
+++ b/main/lzo/README
diff --git a/lzo/README.ANDROID b/main/lzo/README.ANDROID
index 6d463a52..6d463a52 100644
--- a/lzo/README.ANDROID
+++ b/main/lzo/README.ANDROID
diff --git a/lzo/THANKS b/main/lzo/THANKS
index cf09bdf6..cf09bdf6 100644
--- a/lzo/THANKS
+++ b/main/lzo/THANKS
diff --git a/lzo/aclocal.m4 b/main/lzo/aclocal.m4
index 4d774da0..4d774da0 100644
--- a/lzo/aclocal.m4
+++ b/main/lzo/aclocal.m4
diff --git a/lzo/asm/i386/00README.TXT b/main/lzo/asm/i386/00README.TXT
index 81b01423..81b01423 100644
--- a/lzo/asm/i386/00README.TXT
+++ b/main/lzo/asm/i386/00README.TXT
diff --git a/lzo/asm/i386/obj/coff32/lzo1c_s1.o b/main/lzo/asm/i386/obj/coff32/lzo1c_s1.o
index 8379dbe9..8379dbe9 100644
--- a/lzo/asm/i386/obj/coff32/lzo1c_s1.o
+++ b/main/lzo/asm/i386/obj/coff32/lzo1c_s1.o
diff --git a/lzo/asm/i386/obj/coff32/lzo1c_s2.o b/main/lzo/asm/i386/obj/coff32/lzo1c_s2.o
index 6a3fdf9f..6a3fdf9f 100644
--- a/lzo/asm/i386/obj/coff32/lzo1c_s2.o
+++ b/main/lzo/asm/i386/obj/coff32/lzo1c_s2.o
diff --git a/lzo/asm/i386/obj/coff32/lzo1f_f1.o b/main/lzo/asm/i386/obj/coff32/lzo1f_f1.o
index bce69fa9..bce69fa9 100644
--- a/lzo/asm/i386/obj/coff32/lzo1f_f1.o
+++ b/main/lzo/asm/i386/obj/coff32/lzo1f_f1.o
diff --git a/lzo/asm/i386/obj/coff32/lzo1f_f2.o b/main/lzo/asm/i386/obj/coff32/lzo1f_f2.o
index 79b5727f..79b5727f 100644
--- a/lzo/asm/i386/obj/coff32/lzo1f_f2.o
+++ b/main/lzo/asm/i386/obj/coff32/lzo1f_f2.o
diff --git a/lzo/asm/i386/obj/coff32/lzo1x_f1.o b/main/lzo/asm/i386/obj/coff32/lzo1x_f1.o
index 438d0263..438d0263 100644
--- a/lzo/asm/i386/obj/coff32/lzo1x_f1.o
+++ b/main/lzo/asm/i386/obj/coff32/lzo1x_f1.o
diff --git a/lzo/asm/i386/obj/coff32/lzo1x_f2.o b/main/lzo/asm/i386/obj/coff32/lzo1x_f2.o
index 3476817b..3476817b 100644
--- a/lzo/asm/i386/obj/coff32/lzo1x_f2.o
+++ b/main/lzo/asm/i386/obj/coff32/lzo1x_f2.o
diff --git a/lzo/asm/i386/obj/coff32/lzo1x_s1.o b/main/lzo/asm/i386/obj/coff32/lzo1x_s1.o
index b178f0d6..b178f0d6 100644
--- a/lzo/asm/i386/obj/coff32/lzo1x_s1.o
+++ b/main/lzo/asm/i386/obj/coff32/lzo1x_s1.o
diff --git a/lzo/asm/i386/obj/coff32/lzo1x_s2.o b/main/lzo/asm/i386/obj/coff32/lzo1x_s2.o
index f45ef13a..f45ef13a 100644
--- a/lzo/asm/i386/obj/coff32/lzo1x_s2.o
+++ b/main/lzo/asm/i386/obj/coff32/lzo1x_s2.o
diff --git a/lzo/asm/i386/obj/coff32/lzo1y_f1.o b/main/lzo/asm/i386/obj/coff32/lzo1y_f1.o
index f0ddcf98..f0ddcf98 100644
--- a/lzo/asm/i386/obj/coff32/lzo1y_f1.o
+++ b/main/lzo/asm/i386/obj/coff32/lzo1y_f1.o
diff --git a/lzo/asm/i386/obj/coff32/lzo1y_f2.o b/main/lzo/asm/i386/obj/coff32/lzo1y_f2.o
index 0ed51177..0ed51177 100644
--- a/lzo/asm/i386/obj/coff32/lzo1y_f2.o
+++ b/main/lzo/asm/i386/obj/coff32/lzo1y_f2.o
diff --git a/lzo/asm/i386/obj/coff32/lzo1y_s1.o b/main/lzo/asm/i386/obj/coff32/lzo1y_s1.o
index 0beadb14..0beadb14 100644
--- a/lzo/asm/i386/obj/coff32/lzo1y_s1.o
+++ b/main/lzo/asm/i386/obj/coff32/lzo1y_s1.o
diff --git a/lzo/asm/i386/obj/coff32/lzo1y_s2.o b/main/lzo/asm/i386/obj/coff32/lzo1y_s2.o
index efc08299..efc08299 100644
--- a/lzo/asm/i386/obj/coff32/lzo1y_s2.o
+++ b/main/lzo/asm/i386/obj/coff32/lzo1y_s2.o
diff --git a/lzo/asm/i386/obj/elf32/lzo1c_s1.o b/main/lzo/asm/i386/obj/elf32/lzo1c_s1.o
index e32b9531..e32b9531 100644
--- a/lzo/asm/i386/obj/elf32/lzo1c_s1.o
+++ b/main/lzo/asm/i386/obj/elf32/lzo1c_s1.o
diff --git a/lzo/asm/i386/obj/elf32/lzo1c_s2.o b/main/lzo/asm/i386/obj/elf32/lzo1c_s2.o
index 90622c99..90622c99 100644
--- a/lzo/asm/i386/obj/elf32/lzo1c_s2.o
+++ b/main/lzo/asm/i386/obj/elf32/lzo1c_s2.o
diff --git a/lzo/asm/i386/obj/elf32/lzo1f_f1.o b/main/lzo/asm/i386/obj/elf32/lzo1f_f1.o
index 58e67f67..58e67f67 100644
--- a/lzo/asm/i386/obj/elf32/lzo1f_f1.o
+++ b/main/lzo/asm/i386/obj/elf32/lzo1f_f1.o
diff --git a/lzo/asm/i386/obj/elf32/lzo1f_f2.o b/main/lzo/asm/i386/obj/elf32/lzo1f_f2.o
index f70f7909..f70f7909 100644
--- a/lzo/asm/i386/obj/elf32/lzo1f_f2.o
+++ b/main/lzo/asm/i386/obj/elf32/lzo1f_f2.o
diff --git a/lzo/asm/i386/obj/elf32/lzo1x_f1.o b/main/lzo/asm/i386/obj/elf32/lzo1x_f1.o
index eb37ab03..eb37ab03 100644
--- a/lzo/asm/i386/obj/elf32/lzo1x_f1.o
+++ b/main/lzo/asm/i386/obj/elf32/lzo1x_f1.o
diff --git a/lzo/asm/i386/obj/elf32/lzo1x_f2.o b/main/lzo/asm/i386/obj/elf32/lzo1x_f2.o
index bb2e720c..bb2e720c 100644
--- a/lzo/asm/i386/obj/elf32/lzo1x_f2.o
+++ b/main/lzo/asm/i386/obj/elf32/lzo1x_f2.o
diff --git a/lzo/asm/i386/obj/elf32/lzo1x_s1.o b/main/lzo/asm/i386/obj/elf32/lzo1x_s1.o
index 6b8f4199..6b8f4199 100644
--- a/lzo/asm/i386/obj/elf32/lzo1x_s1.o
+++ b/main/lzo/asm/i386/obj/elf32/lzo1x_s1.o
diff --git a/lzo/asm/i386/obj/elf32/lzo1x_s2.o b/main/lzo/asm/i386/obj/elf32/lzo1x_s2.o
index ce5dfc47..ce5dfc47 100644
--- a/lzo/asm/i386/obj/elf32/lzo1x_s2.o
+++ b/main/lzo/asm/i386/obj/elf32/lzo1x_s2.o
diff --git a/lzo/asm/i386/obj/elf32/lzo1y_f1.o b/main/lzo/asm/i386/obj/elf32/lzo1y_f1.o
index 431ec4e4..431ec4e4 100644
--- a/lzo/asm/i386/obj/elf32/lzo1y_f1.o
+++ b/main/lzo/asm/i386/obj/elf32/lzo1y_f1.o
diff --git a/lzo/asm/i386/obj/elf32/lzo1y_f2.o b/main/lzo/asm/i386/obj/elf32/lzo1y_f2.o
index 4d510760..4d510760 100644
--- a/lzo/asm/i386/obj/elf32/lzo1y_f2.o
+++ b/main/lzo/asm/i386/obj/elf32/lzo1y_f2.o
diff --git a/lzo/asm/i386/obj/elf32/lzo1y_s1.o b/main/lzo/asm/i386/obj/elf32/lzo1y_s1.o
index dcb71acf..dcb71acf 100644
--- a/lzo/asm/i386/obj/elf32/lzo1y_s1.o
+++ b/main/lzo/asm/i386/obj/elf32/lzo1y_s1.o
diff --git a/lzo/asm/i386/obj/elf32/lzo1y_s2.o b/main/lzo/asm/i386/obj/elf32/lzo1y_s2.o
index 691d4094..691d4094 100644
--- a/lzo/asm/i386/obj/elf32/lzo1y_s2.o
+++ b/main/lzo/asm/i386/obj/elf32/lzo1y_s2.o
diff --git a/lzo/asm/i386/obj/omf32/lzo1c_s1.obj b/main/lzo/asm/i386/obj/omf32/lzo1c_s1.obj
index 57bc1d70..57bc1d70 100644
--- a/lzo/asm/i386/obj/omf32/lzo1c_s1.obj
+++ b/main/lzo/asm/i386/obj/omf32/lzo1c_s1.obj
diff --git a/lzo/asm/i386/obj/omf32/lzo1c_s2.obj b/main/lzo/asm/i386/obj/omf32/lzo1c_s2.obj
index 77118989..77118989 100644
--- a/lzo/asm/i386/obj/omf32/lzo1c_s2.obj
+++ b/main/lzo/asm/i386/obj/omf32/lzo1c_s2.obj
diff --git a/lzo/asm/i386/obj/omf32/lzo1f_f1.obj b/main/lzo/asm/i386/obj/omf32/lzo1f_f1.obj
index 2b08c972..2b08c972 100644
--- a/lzo/asm/i386/obj/omf32/lzo1f_f1.obj
+++ b/main/lzo/asm/i386/obj/omf32/lzo1f_f1.obj
diff --git a/lzo/asm/i386/obj/omf32/lzo1f_f2.obj b/main/lzo/asm/i386/obj/omf32/lzo1f_f2.obj
index 7d117984..7d117984 100644
--- a/lzo/asm/i386/obj/omf32/lzo1f_f2.obj
+++ b/main/lzo/asm/i386/obj/omf32/lzo1f_f2.obj
diff --git a/lzo/asm/i386/obj/omf32/lzo1x_f1.obj b/main/lzo/asm/i386/obj/omf32/lzo1x_f1.obj
index 5720ecb9..5720ecb9 100644
--- a/lzo/asm/i386/obj/omf32/lzo1x_f1.obj
+++ b/main/lzo/asm/i386/obj/omf32/lzo1x_f1.obj
diff --git a/lzo/asm/i386/obj/omf32/lzo1x_f2.obj b/main/lzo/asm/i386/obj/omf32/lzo1x_f2.obj
index b3f6364e..b3f6364e 100644
--- a/lzo/asm/i386/obj/omf32/lzo1x_f2.obj
+++ b/main/lzo/asm/i386/obj/omf32/lzo1x_f2.obj
diff --git a/lzo/asm/i386/obj/omf32/lzo1x_s1.obj b/main/lzo/asm/i386/obj/omf32/lzo1x_s1.obj
index 68d6c159..68d6c159 100644
--- a/lzo/asm/i386/obj/omf32/lzo1x_s1.obj
+++ b/main/lzo/asm/i386/obj/omf32/lzo1x_s1.obj
diff --git a/lzo/asm/i386/obj/omf32/lzo1x_s2.obj b/main/lzo/asm/i386/obj/omf32/lzo1x_s2.obj
index 8af7727a..8af7727a 100644
--- a/lzo/asm/i386/obj/omf32/lzo1x_s2.obj
+++ b/main/lzo/asm/i386/obj/omf32/lzo1x_s2.obj
diff --git a/lzo/asm/i386/obj/omf32/lzo1y_f1.obj b/main/lzo/asm/i386/obj/omf32/lzo1y_f1.obj
index d5102cde..d5102cde 100644
--- a/lzo/asm/i386/obj/omf32/lzo1y_f1.obj
+++ b/main/lzo/asm/i386/obj/omf32/lzo1y_f1.obj
diff --git a/lzo/asm/i386/obj/omf32/lzo1y_f2.obj b/main/lzo/asm/i386/obj/omf32/lzo1y_f2.obj
index 0dde89a2..0dde89a2 100644
--- a/lzo/asm/i386/obj/omf32/lzo1y_f2.obj
+++ b/main/lzo/asm/i386/obj/omf32/lzo1y_f2.obj
diff --git a/lzo/asm/i386/obj/omf32/lzo1y_s1.obj b/main/lzo/asm/i386/obj/omf32/lzo1y_s1.obj
index 29859c28..29859c28 100644
--- a/lzo/asm/i386/obj/omf32/lzo1y_s1.obj
+++ b/main/lzo/asm/i386/obj/omf32/lzo1y_s1.obj
diff --git a/lzo/asm/i386/obj/omf32/lzo1y_s2.obj b/main/lzo/asm/i386/obj/omf32/lzo1y_s2.obj
index 85f6b811..85f6b811 100644
--- a/lzo/asm/i386/obj/omf32/lzo1y_s2.obj
+++ b/main/lzo/asm/i386/obj/omf32/lzo1y_s2.obj
diff --git a/lzo/asm/i386/obj/win32/lzo1c_s1.obj b/main/lzo/asm/i386/obj/win32/lzo1c_s1.obj
index b4d47ce2..b4d47ce2 100644
--- a/lzo/asm/i386/obj/win32/lzo1c_s1.obj
+++ b/main/lzo/asm/i386/obj/win32/lzo1c_s1.obj
diff --git a/lzo/asm/i386/obj/win32/lzo1c_s2.obj b/main/lzo/asm/i386/obj/win32/lzo1c_s2.obj
index a67fd5c5..a67fd5c5 100644
--- a/lzo/asm/i386/obj/win32/lzo1c_s2.obj
+++ b/main/lzo/asm/i386/obj/win32/lzo1c_s2.obj
diff --git a/lzo/asm/i386/obj/win32/lzo1f_f1.obj b/main/lzo/asm/i386/obj/win32/lzo1f_f1.obj
index 231fb2b5..231fb2b5 100644
--- a/lzo/asm/i386/obj/win32/lzo1f_f1.obj
+++ b/main/lzo/asm/i386/obj/win32/lzo1f_f1.obj
diff --git a/lzo/asm/i386/obj/win32/lzo1f_f2.obj b/main/lzo/asm/i386/obj/win32/lzo1f_f2.obj
index 7c6263ac..7c6263ac 100644
--- a/lzo/asm/i386/obj/win32/lzo1f_f2.obj
+++ b/main/lzo/asm/i386/obj/win32/lzo1f_f2.obj
diff --git a/lzo/asm/i386/obj/win32/lzo1x_f1.obj b/main/lzo/asm/i386/obj/win32/lzo1x_f1.obj
index 740ad7c9..740ad7c9 100644
--- a/lzo/asm/i386/obj/win32/lzo1x_f1.obj
+++ b/main/lzo/asm/i386/obj/win32/lzo1x_f1.obj
diff --git a/lzo/asm/i386/obj/win32/lzo1x_f2.obj b/main/lzo/asm/i386/obj/win32/lzo1x_f2.obj
index 6307e9ef..6307e9ef 100644
--- a/lzo/asm/i386/obj/win32/lzo1x_f2.obj
+++ b/main/lzo/asm/i386/obj/win32/lzo1x_f2.obj
diff --git a/lzo/asm/i386/obj/win32/lzo1x_s1.obj b/main/lzo/asm/i386/obj/win32/lzo1x_s1.obj
index ddd38b07..ddd38b07 100644
--- a/lzo/asm/i386/obj/win32/lzo1x_s1.obj
+++ b/main/lzo/asm/i386/obj/win32/lzo1x_s1.obj
diff --git a/lzo/asm/i386/obj/win32/lzo1x_s2.obj b/main/lzo/asm/i386/obj/win32/lzo1x_s2.obj
index c19f527f..c19f527f 100644
--- a/lzo/asm/i386/obj/win32/lzo1x_s2.obj
+++ b/main/lzo/asm/i386/obj/win32/lzo1x_s2.obj
diff --git a/lzo/asm/i386/obj/win32/lzo1y_f1.obj b/main/lzo/asm/i386/obj/win32/lzo1y_f1.obj
index 828cd062..828cd062 100644
--- a/lzo/asm/i386/obj/win32/lzo1y_f1.obj
+++ b/main/lzo/asm/i386/obj/win32/lzo1y_f1.obj
diff --git a/lzo/asm/i386/obj/win32/lzo1y_f2.obj b/main/lzo/asm/i386/obj/win32/lzo1y_f2.obj
index 75640fdd..75640fdd 100644
--- a/lzo/asm/i386/obj/win32/lzo1y_f2.obj
+++ b/main/lzo/asm/i386/obj/win32/lzo1y_f2.obj
diff --git a/lzo/asm/i386/obj/win32/lzo1y_s1.obj b/main/lzo/asm/i386/obj/win32/lzo1y_s1.obj
index 5b57c8e0..5b57c8e0 100644
--- a/lzo/asm/i386/obj/win32/lzo1y_s1.obj
+++ b/main/lzo/asm/i386/obj/win32/lzo1y_s1.obj
diff --git a/lzo/asm/i386/obj/win32/lzo1y_s2.obj b/main/lzo/asm/i386/obj/win32/lzo1y_s2.obj
index 38b025ee..38b025ee 100644
--- a/lzo/asm/i386/obj/win32/lzo1y_s2.obj
+++ b/main/lzo/asm/i386/obj/win32/lzo1y_s2.obj
diff --git a/lzo/asm/i386/src/enter.ash b/main/lzo/asm/i386/src/enter.ash
index c2aa0817..c2aa0817 100644
--- a/lzo/asm/i386/src/enter.ash
+++ b/main/lzo/asm/i386/src/enter.ash
diff --git a/lzo/asm/i386/src/leave.ash b/main/lzo/asm/i386/src/leave.ash
index 0fdb729f..0fdb729f 100644
--- a/lzo/asm/i386/src/leave.ash
+++ b/main/lzo/asm/i386/src/leave.ash
diff --git a/lzo/asm/i386/src/lzo1c_d.ash b/main/lzo/asm/i386/src/lzo1c_d.ash
index 56622ab5..56622ab5 100644
--- a/lzo/asm/i386/src/lzo1c_d.ash
+++ b/main/lzo/asm/i386/src/lzo1c_d.ash
diff --git a/lzo/asm/i386/src/lzo1c_s1.S b/main/lzo/asm/i386/src/lzo1c_s1.S
index b68ca293..b68ca293 100644
--- a/lzo/asm/i386/src/lzo1c_s1.S
+++ b/main/lzo/asm/i386/src/lzo1c_s1.S
diff --git a/lzo/asm/i386/src/lzo1c_s2.S b/main/lzo/asm/i386/src/lzo1c_s2.S
index f874002e..f874002e 100644
--- a/lzo/asm/i386/src/lzo1c_s2.S
+++ b/main/lzo/asm/i386/src/lzo1c_s2.S
diff --git a/lzo/asm/i386/src/lzo1f_d.ash b/main/lzo/asm/i386/src/lzo1f_d.ash
index 97a103c0..97a103c0 100644
--- a/lzo/asm/i386/src/lzo1f_d.ash
+++ b/main/lzo/asm/i386/src/lzo1f_d.ash
diff --git a/lzo/asm/i386/src/lzo1f_f1.S b/main/lzo/asm/i386/src/lzo1f_f1.S
index 46eb26b2..46eb26b2 100644
--- a/lzo/asm/i386/src/lzo1f_f1.S
+++ b/main/lzo/asm/i386/src/lzo1f_f1.S
diff --git a/lzo/asm/i386/src/lzo1f_f2.S b/main/lzo/asm/i386/src/lzo1f_f2.S
index 904a5f31..904a5f31 100644
--- a/lzo/asm/i386/src/lzo1f_f2.S
+++ b/main/lzo/asm/i386/src/lzo1f_f2.S
diff --git a/lzo/asm/i386/src/lzo1x_d.ash b/main/lzo/asm/i386/src/lzo1x_d.ash
index 782b47fe..782b47fe 100644
--- a/lzo/asm/i386/src/lzo1x_d.ash
+++ b/main/lzo/asm/i386/src/lzo1x_d.ash
diff --git a/lzo/asm/i386/src/lzo1x_f1.S b/main/lzo/asm/i386/src/lzo1x_f1.S
index ccdb9022..ccdb9022 100644
--- a/lzo/asm/i386/src/lzo1x_f1.S
+++ b/main/lzo/asm/i386/src/lzo1x_f1.S
diff --git a/lzo/asm/i386/src/lzo1x_f2.S b/main/lzo/asm/i386/src/lzo1x_f2.S
index f9ad6b32..f9ad6b32 100644
--- a/lzo/asm/i386/src/lzo1x_f2.S
+++ b/main/lzo/asm/i386/src/lzo1x_f2.S
diff --git a/lzo/asm/i386/src/lzo1x_s1.S b/main/lzo/asm/i386/src/lzo1x_s1.S
index 1e901ed6..1e901ed6 100644
--- a/lzo/asm/i386/src/lzo1x_s1.S
+++ b/main/lzo/asm/i386/src/lzo1x_s1.S
diff --git a/lzo/asm/i386/src/lzo1x_s2.S b/main/lzo/asm/i386/src/lzo1x_s2.S
index aaa294de..aaa294de 100644
--- a/lzo/asm/i386/src/lzo1x_s2.S
+++ b/main/lzo/asm/i386/src/lzo1x_s2.S
diff --git a/lzo/asm/i386/src/lzo1y_f1.S b/main/lzo/asm/i386/src/lzo1y_f1.S
index c993beef..c993beef 100644
--- a/lzo/asm/i386/src/lzo1y_f1.S
+++ b/main/lzo/asm/i386/src/lzo1y_f1.S
diff --git a/lzo/asm/i386/src/lzo1y_f2.S b/main/lzo/asm/i386/src/lzo1y_f2.S
index 2dace850..2dace850 100644
--- a/lzo/asm/i386/src/lzo1y_f2.S
+++ b/main/lzo/asm/i386/src/lzo1y_f2.S
diff --git a/lzo/asm/i386/src/lzo1y_s1.S b/main/lzo/asm/i386/src/lzo1y_s1.S
index c57a1c8c..c57a1c8c 100644
--- a/lzo/asm/i386/src/lzo1y_s1.S
+++ b/main/lzo/asm/i386/src/lzo1y_s1.S
diff --git a/lzo/asm/i386/src/lzo1y_s2.S b/main/lzo/asm/i386/src/lzo1y_s2.S
index 238c762e..238c762e 100644
--- a/lzo/asm/i386/src/lzo1y_s2.S
+++ b/main/lzo/asm/i386/src/lzo1y_s2.S
diff --git a/lzo/asm/i386/src/lzo_asm.h b/main/lzo/asm/i386/src/lzo_asm.h
index 1188dd60..1188dd60 100644
--- a/lzo/asm/i386/src/lzo_asm.h
+++ b/main/lzo/asm/i386/src/lzo_asm.h
diff --git a/lzo/asm/i386/src_gas/all/asm_all.S b/main/lzo/asm/i386/src_gas/all/asm_all.S
index cb859427..cb859427 100644
--- a/lzo/asm/i386/src_gas/all/asm_all.S
+++ b/main/lzo/asm/i386/src_gas/all/asm_all.S
diff --git a/lzo/asm/i386/src_gas/asminit.def b/main/lzo/asm/i386/src_gas/asminit.def
index 154b8a52..154b8a52 100644
--- a/lzo/asm/i386/src_gas/asminit.def
+++ b/main/lzo/asm/i386/src_gas/asminit.def
diff --git a/lzo/asm/i386/src_gas/lzo1c_s1.S b/main/lzo/asm/i386/src_gas/lzo1c_s1.S
index 8b01a3b0..8b01a3b0 100644
--- a/lzo/asm/i386/src_gas/lzo1c_s1.S
+++ b/main/lzo/asm/i386/src_gas/lzo1c_s1.S
diff --git a/lzo/asm/i386/src_gas/lzo1c_s2.S b/main/lzo/asm/i386/src_gas/lzo1c_s2.S
index 1797cc34..1797cc34 100644
--- a/lzo/asm/i386/src_gas/lzo1c_s2.S
+++ b/main/lzo/asm/i386/src_gas/lzo1c_s2.S
diff --git a/lzo/asm/i386/src_gas/lzo1f_f1.S b/main/lzo/asm/i386/src_gas/lzo1f_f1.S
index e3f5ccf8..e3f5ccf8 100644
--- a/lzo/asm/i386/src_gas/lzo1f_f1.S
+++ b/main/lzo/asm/i386/src_gas/lzo1f_f1.S
diff --git a/lzo/asm/i386/src_gas/lzo1f_f2.S b/main/lzo/asm/i386/src_gas/lzo1f_f2.S
index f2041bc7..f2041bc7 100644
--- a/lzo/asm/i386/src_gas/lzo1f_f2.S
+++ b/main/lzo/asm/i386/src_gas/lzo1f_f2.S
diff --git a/lzo/asm/i386/src_gas/lzo1x_f1.S b/main/lzo/asm/i386/src_gas/lzo1x_f1.S
index 26f42e91..26f42e91 100644
--- a/lzo/asm/i386/src_gas/lzo1x_f1.S
+++ b/main/lzo/asm/i386/src_gas/lzo1x_f1.S
diff --git a/lzo/asm/i386/src_gas/lzo1x_f2.S b/main/lzo/asm/i386/src_gas/lzo1x_f2.S
index 0ded30ee..0ded30ee 100644
--- a/lzo/asm/i386/src_gas/lzo1x_f2.S
+++ b/main/lzo/asm/i386/src_gas/lzo1x_f2.S
diff --git a/lzo/asm/i386/src_gas/lzo1x_s1.S b/main/lzo/asm/i386/src_gas/lzo1x_s1.S
index a18a7319..a18a7319 100644
--- a/lzo/asm/i386/src_gas/lzo1x_s1.S
+++ b/main/lzo/asm/i386/src_gas/lzo1x_s1.S
diff --git a/lzo/asm/i386/src_gas/lzo1x_s2.S b/main/lzo/asm/i386/src_gas/lzo1x_s2.S
index 46d60aa0..46d60aa0 100644
--- a/lzo/asm/i386/src_gas/lzo1x_s2.S
+++ b/main/lzo/asm/i386/src_gas/lzo1x_s2.S
diff --git a/lzo/asm/i386/src_gas/lzo1y_f1.S b/main/lzo/asm/i386/src_gas/lzo1y_f1.S
index e13fd08d..e13fd08d 100644
--- a/lzo/asm/i386/src_gas/lzo1y_f1.S
+++ b/main/lzo/asm/i386/src_gas/lzo1y_f1.S
diff --git a/lzo/asm/i386/src_gas/lzo1y_f2.S b/main/lzo/asm/i386/src_gas/lzo1y_f2.S
index de28ace9..de28ace9 100644
--- a/lzo/asm/i386/src_gas/lzo1y_f2.S
+++ b/main/lzo/asm/i386/src_gas/lzo1y_f2.S
diff --git a/lzo/asm/i386/src_gas/lzo1y_s1.S b/main/lzo/asm/i386/src_gas/lzo1y_s1.S
index 269955b0..269955b0 100644
--- a/lzo/asm/i386/src_gas/lzo1y_s1.S
+++ b/main/lzo/asm/i386/src_gas/lzo1y_s1.S
diff --git a/lzo/asm/i386/src_gas/lzo1y_s2.S b/main/lzo/asm/i386/src_gas/lzo1y_s2.S
index 4da81a3c..4da81a3c 100644
--- a/lzo/asm/i386/src_gas/lzo1y_s2.S
+++ b/main/lzo/asm/i386/src_gas/lzo1y_s2.S
diff --git a/lzo/asm/i386/src_masm/all/asm_all.asm b/main/lzo/asm/i386/src_masm/all/asm_all.asm
index ae982219..ae982219 100644
--- a/lzo/asm/i386/src_masm/all/asm_all.asm
+++ b/main/lzo/asm/i386/src_masm/all/asm_all.asm
diff --git a/lzo/asm/i386/src_masm/asminit.def b/main/lzo/asm/i386/src_masm/asminit.def
index df0455f3..df0455f3 100644
--- a/lzo/asm/i386/src_masm/asminit.def
+++ b/main/lzo/asm/i386/src_masm/asminit.def
diff --git a/lzo/asm/i386/src_masm/lzo1c_s1.asm b/main/lzo/asm/i386/src_masm/lzo1c_s1.asm
index 38910181..38910181 100644
--- a/lzo/asm/i386/src_masm/lzo1c_s1.asm
+++ b/main/lzo/asm/i386/src_masm/lzo1c_s1.asm
diff --git a/lzo/asm/i386/src_masm/lzo1c_s2.asm b/main/lzo/asm/i386/src_masm/lzo1c_s2.asm
index 08dfb401..08dfb401 100644
--- a/lzo/asm/i386/src_masm/lzo1c_s2.asm
+++ b/main/lzo/asm/i386/src_masm/lzo1c_s2.asm
diff --git a/lzo/asm/i386/src_masm/lzo1f_f1.asm b/main/lzo/asm/i386/src_masm/lzo1f_f1.asm
index 5a24d791..5a24d791 100644
--- a/lzo/asm/i386/src_masm/lzo1f_f1.asm
+++ b/main/lzo/asm/i386/src_masm/lzo1f_f1.asm
diff --git a/lzo/asm/i386/src_masm/lzo1f_f2.asm b/main/lzo/asm/i386/src_masm/lzo1f_f2.asm
index 7ec00573..7ec00573 100644
--- a/lzo/asm/i386/src_masm/lzo1f_f2.asm
+++ b/main/lzo/asm/i386/src_masm/lzo1f_f2.asm
diff --git a/lzo/asm/i386/src_masm/lzo1x_f1.asm b/main/lzo/asm/i386/src_masm/lzo1x_f1.asm
index 62fe70da..62fe70da 100644
--- a/lzo/asm/i386/src_masm/lzo1x_f1.asm
+++ b/main/lzo/asm/i386/src_masm/lzo1x_f1.asm
diff --git a/lzo/asm/i386/src_masm/lzo1x_f2.asm b/main/lzo/asm/i386/src_masm/lzo1x_f2.asm
index 5994e2de..5994e2de 100644
--- a/lzo/asm/i386/src_masm/lzo1x_f2.asm
+++ b/main/lzo/asm/i386/src_masm/lzo1x_f2.asm
diff --git a/lzo/asm/i386/src_masm/lzo1x_s1.asm b/main/lzo/asm/i386/src_masm/lzo1x_s1.asm
index 58edebc1..58edebc1 100644
--- a/lzo/asm/i386/src_masm/lzo1x_s1.asm
+++ b/main/lzo/asm/i386/src_masm/lzo1x_s1.asm
diff --git a/lzo/asm/i386/src_masm/lzo1x_s2.asm b/main/lzo/asm/i386/src_masm/lzo1x_s2.asm
index 7316e55b..7316e55b 100644
--- a/lzo/asm/i386/src_masm/lzo1x_s2.asm
+++ b/main/lzo/asm/i386/src_masm/lzo1x_s2.asm
diff --git a/lzo/asm/i386/src_masm/lzo1y_f1.asm b/main/lzo/asm/i386/src_masm/lzo1y_f1.asm
index 8ef5c407..8ef5c407 100644
--- a/lzo/asm/i386/src_masm/lzo1y_f1.asm
+++ b/main/lzo/asm/i386/src_masm/lzo1y_f1.asm
diff --git a/lzo/asm/i386/src_masm/lzo1y_f2.asm b/main/lzo/asm/i386/src_masm/lzo1y_f2.asm
index daf67e5a..daf67e5a 100644
--- a/lzo/asm/i386/src_masm/lzo1y_f2.asm
+++ b/main/lzo/asm/i386/src_masm/lzo1y_f2.asm
diff --git a/lzo/asm/i386/src_masm/lzo1y_s1.asm b/main/lzo/asm/i386/src_masm/lzo1y_s1.asm
index 18afd548..18afd548 100644
--- a/lzo/asm/i386/src_masm/lzo1y_s1.asm
+++ b/main/lzo/asm/i386/src_masm/lzo1y_s1.asm
diff --git a/lzo/asm/i386/src_masm/lzo1y_s2.asm b/main/lzo/asm/i386/src_masm/lzo1y_s2.asm
index c7ac80e2..c7ac80e2 100644
--- a/lzo/asm/i386/src_masm/lzo1y_s2.asm
+++ b/main/lzo/asm/i386/src_masm/lzo1y_s2.asm
diff --git a/lzo/asm/i386/src_nasm/all/asm_all.asm b/main/lzo/asm/i386/src_nasm/all/asm_all.asm
index 2751256a..2751256a 100644
--- a/lzo/asm/i386/src_nasm/all/asm_all.asm
+++ b/main/lzo/asm/i386/src_nasm/all/asm_all.asm
diff --git a/lzo/asm/i386/src_nasm/asminit.def b/main/lzo/asm/i386/src_nasm/asminit.def
index 3f2e0d6e..3f2e0d6e 100644
--- a/lzo/asm/i386/src_nasm/asminit.def
+++ b/main/lzo/asm/i386/src_nasm/asminit.def
diff --git a/lzo/asm/i386/src_nasm/lzo1c_s1.asm b/main/lzo/asm/i386/src_nasm/lzo1c_s1.asm
index c9bb264a..c9bb264a 100644
--- a/lzo/asm/i386/src_nasm/lzo1c_s1.asm
+++ b/main/lzo/asm/i386/src_nasm/lzo1c_s1.asm
diff --git a/lzo/asm/i386/src_nasm/lzo1c_s2.asm b/main/lzo/asm/i386/src_nasm/lzo1c_s2.asm
index 89fa7367..89fa7367 100644
--- a/lzo/asm/i386/src_nasm/lzo1c_s2.asm
+++ b/main/lzo/asm/i386/src_nasm/lzo1c_s2.asm
diff --git a/lzo/asm/i386/src_nasm/lzo1f_f1.asm b/main/lzo/asm/i386/src_nasm/lzo1f_f1.asm
index cdbaade2..cdbaade2 100644
--- a/lzo/asm/i386/src_nasm/lzo1f_f1.asm
+++ b/main/lzo/asm/i386/src_nasm/lzo1f_f1.asm
diff --git a/lzo/asm/i386/src_nasm/lzo1f_f2.asm b/main/lzo/asm/i386/src_nasm/lzo1f_f2.asm
index 70d6f36b..70d6f36b 100644
--- a/lzo/asm/i386/src_nasm/lzo1f_f2.asm
+++ b/main/lzo/asm/i386/src_nasm/lzo1f_f2.asm
diff --git a/lzo/asm/i386/src_nasm/lzo1x_f1.asm b/main/lzo/asm/i386/src_nasm/lzo1x_f1.asm
index a54585fa..a54585fa 100644
--- a/lzo/asm/i386/src_nasm/lzo1x_f1.asm
+++ b/main/lzo/asm/i386/src_nasm/lzo1x_f1.asm
diff --git a/lzo/asm/i386/src_nasm/lzo1x_f2.asm b/main/lzo/asm/i386/src_nasm/lzo1x_f2.asm
index ada1b886..ada1b886 100644
--- a/lzo/asm/i386/src_nasm/lzo1x_f2.asm
+++ b/main/lzo/asm/i386/src_nasm/lzo1x_f2.asm
diff --git a/lzo/asm/i386/src_nasm/lzo1x_s1.asm b/main/lzo/asm/i386/src_nasm/lzo1x_s1.asm
index 00d4f4e6..00d4f4e6 100644
--- a/lzo/asm/i386/src_nasm/lzo1x_s1.asm
+++ b/main/lzo/asm/i386/src_nasm/lzo1x_s1.asm
diff --git a/lzo/asm/i386/src_nasm/lzo1x_s2.asm b/main/lzo/asm/i386/src_nasm/lzo1x_s2.asm
index 5c655583..5c655583 100644
--- a/lzo/asm/i386/src_nasm/lzo1x_s2.asm
+++ b/main/lzo/asm/i386/src_nasm/lzo1x_s2.asm
diff --git a/lzo/asm/i386/src_nasm/lzo1y_f1.asm b/main/lzo/asm/i386/src_nasm/lzo1y_f1.asm
index 1c42cda8..1c42cda8 100644
--- a/lzo/asm/i386/src_nasm/lzo1y_f1.asm
+++ b/main/lzo/asm/i386/src_nasm/lzo1y_f1.asm
diff --git a/lzo/asm/i386/src_nasm/lzo1y_f2.asm b/main/lzo/asm/i386/src_nasm/lzo1y_f2.asm
index 9e6b37c5..9e6b37c5 100644
--- a/lzo/asm/i386/src_nasm/lzo1y_f2.asm
+++ b/main/lzo/asm/i386/src_nasm/lzo1y_f2.asm
diff --git a/lzo/asm/i386/src_nasm/lzo1y_s1.asm b/main/lzo/asm/i386/src_nasm/lzo1y_s1.asm
index f7e42782..f7e42782 100644
--- a/lzo/asm/i386/src_nasm/lzo1y_s1.asm
+++ b/main/lzo/asm/i386/src_nasm/lzo1y_s1.asm
diff --git a/lzo/asm/i386/src_nasm/lzo1y_s2.asm b/main/lzo/asm/i386/src_nasm/lzo1y_s2.asm
index 065508cb..065508cb 100644
--- a/lzo/asm/i386/src_nasm/lzo1y_s2.asm
+++ b/main/lzo/asm/i386/src_nasm/lzo1y_s2.asm
diff --git a/lzo/autoconf/compile b/main/lzo/autoconf/compile
index bac481cd..bac481cd 100755
--- a/lzo/autoconf/compile
+++ b/main/lzo/autoconf/compile
diff --git a/lzo/autoconf/config.guess b/main/lzo/autoconf/config.guess
index b02565c7..b02565c7 100755
--- a/lzo/autoconf/config.guess
+++ b/main/lzo/autoconf/config.guess
diff --git a/lzo/autoconf/config.rpath b/main/lzo/autoconf/config.rpath
index 8bd7f5d7..8bd7f5d7 100755
--- a/lzo/autoconf/config.rpath
+++ b/main/lzo/autoconf/config.rpath
diff --git a/lzo/autoconf/config.sub b/main/lzo/autoconf/config.sub
index f9fcdc87..f9fcdc87 100755
--- a/lzo/autoconf/config.sub
+++ b/main/lzo/autoconf/config.sub
diff --git a/lzo/autoconf/depcomp b/main/lzo/autoconf/depcomp
index 9825d56d..9825d56d 100755
--- a/lzo/autoconf/depcomp
+++ b/main/lzo/autoconf/depcomp
diff --git a/lzo/autoconf/install-sh b/main/lzo/autoconf/install-sh
index a9244eb0..a9244eb0 100755
--- a/lzo/autoconf/install-sh
+++ b/main/lzo/autoconf/install-sh
diff --git a/lzo/autoconf/local.m4 b/main/lzo/autoconf/local.m4
index 7cebb1dc..7cebb1dc 100644
--- a/lzo/autoconf/local.m4
+++ b/main/lzo/autoconf/local.m4
diff --git a/lzo/autoconf/ltmain.sh b/main/lzo/autoconf/ltmain.sh
index 04eaea40..04eaea40 100644
--- a/lzo/autoconf/ltmain.sh
+++ b/main/lzo/autoconf/ltmain.sh
diff --git a/lzo/autoconf/mdate-sh b/main/lzo/autoconf/mdate-sh
index 60dc485a..60dc485a 100755
--- a/lzo/autoconf/mdate-sh
+++ b/main/lzo/autoconf/mdate-sh
diff --git a/lzo/autoconf/missing b/main/lzo/autoconf/missing
index 28055d2a..28055d2a 100755
--- a/lzo/autoconf/missing
+++ b/main/lzo/autoconf/missing
diff --git a/lzo/autoconf/mkinstalldirs b/main/lzo/autoconf/mkinstalldirs
index 4191a45d..4191a45d 100755
--- a/lzo/autoconf/mkinstalldirs
+++ b/main/lzo/autoconf/mkinstalldirs
diff --git a/lzo/autoconf/py-compile b/main/lzo/autoconf/py-compile
index 3f9d05b6..3f9d05b6 100755
--- a/lzo/autoconf/py-compile
+++ b/main/lzo/autoconf/py-compile
diff --git a/lzo/autoconf/shtool b/main/lzo/autoconf/shtool
index a1f4e7ee..a1f4e7ee 100755
--- a/lzo/autoconf/shtool
+++ b/main/lzo/autoconf/shtool
diff --git a/lzo/autoconf/ylwrap b/main/lzo/autoconf/ylwrap
index 92b20117..92b20117 100755
--- a/lzo/autoconf/ylwrap
+++ b/main/lzo/autoconf/ylwrap
diff --git a/lzo/config.h b/main/lzo/config.h
index ec40c7da..ec40c7da 100644
--- a/lzo/config.h
+++ b/main/lzo/config.h
diff --git a/lzo/config.hin b/main/lzo/config.hin
index 94a6f18e..94a6f18e 100644
--- a/lzo/config.hin
+++ b/main/lzo/config.hin
diff --git a/lzo/config.log b/main/lzo/config.log
index bd09f04b..bd09f04b 100644
--- a/lzo/config.log
+++ b/main/lzo/config.log
diff --git a/lzo/config.status b/main/lzo/config.status
index 4d39ecc0..4d39ecc0 100755
--- a/lzo/config.status
+++ b/main/lzo/config.status
diff --git a/lzo/configure b/main/lzo/configure
index a72c8ab8..a72c8ab8 100755
--- a/lzo/configure
+++ b/main/lzo/configure
diff --git a/lzo/configure.ac b/main/lzo/configure.ac
index cda9734a..cda9734a 100644
--- a/lzo/configure.ac
+++ b/main/lzo/configure.ac
diff --git a/lzo/doc/LZO.FAQ b/main/lzo/doc/LZO.FAQ
index cb1f38aa..cb1f38aa 100644
--- a/lzo/doc/LZO.FAQ
+++ b/main/lzo/doc/LZO.FAQ
diff --git a/lzo/doc/LZO.TXT b/main/lzo/doc/LZO.TXT
index 7426ab2b..7426ab2b 100644
--- a/lzo/doc/LZO.TXT
+++ b/main/lzo/doc/LZO.TXT
diff --git a/lzo/doc/LZOAPI.TXT b/main/lzo/doc/LZOAPI.TXT
index 5ae73532..5ae73532 100644
--- a/lzo/doc/LZOAPI.TXT
+++ b/main/lzo/doc/LZOAPI.TXT
diff --git a/lzo/doc/LZOTEST.TXT b/main/lzo/doc/LZOTEST.TXT
index 93c86591..93c86591 100644
--- a/lzo/doc/LZOTEST.TXT
+++ b/main/lzo/doc/LZOTEST.TXT
diff --git a/lzo/examples/.deps/dict.Po b/main/lzo/examples/.deps/dict.Po
index 9ce06a81..9ce06a81 100644
--- a/lzo/examples/.deps/dict.Po
+++ b/main/lzo/examples/.deps/dict.Po
diff --git a/lzo/examples/.deps/lzopack.Po b/main/lzo/examples/.deps/lzopack.Po
index 9ce06a81..9ce06a81 100644
--- a/lzo/examples/.deps/lzopack.Po
+++ b/main/lzo/examples/.deps/lzopack.Po
diff --git a/lzo/examples/.deps/overlap.Po b/main/lzo/examples/.deps/overlap.Po
index 9ce06a81..9ce06a81 100644
--- a/lzo/examples/.deps/overlap.Po
+++ b/main/lzo/examples/.deps/overlap.Po
diff --git a/lzo/examples/.deps/precomp.Po b/main/lzo/examples/.deps/precomp.Po
index 9ce06a81..9ce06a81 100644
--- a/lzo/examples/.deps/precomp.Po
+++ b/main/lzo/examples/.deps/precomp.Po
diff --git a/lzo/examples/.deps/precomp2.Po b/main/lzo/examples/.deps/precomp2.Po
index 9ce06a81..9ce06a81 100644
--- a/lzo/examples/.deps/precomp2.Po
+++ b/main/lzo/examples/.deps/precomp2.Po
diff --git a/lzo/examples/.deps/simple.Po b/main/lzo/examples/.deps/simple.Po
index 9ce06a81..9ce06a81 100644
--- a/lzo/examples/.deps/simple.Po
+++ b/main/lzo/examples/.deps/simple.Po
diff --git a/lzo/examples/Makefile b/main/lzo/examples/Makefile
index 41e32c29..41e32c29 100644
--- a/lzo/examples/Makefile
+++ b/main/lzo/examples/Makefile
diff --git a/lzo/examples/Makefile.am b/main/lzo/examples/Makefile.am
index 2c5b527e..2c5b527e 100644
--- a/lzo/examples/Makefile.am
+++ b/main/lzo/examples/Makefile.am
diff --git a/lzo/examples/Makefile.in b/main/lzo/examples/Makefile.in
index 4199078b..4199078b 100644
--- a/lzo/examples/Makefile.in
+++ b/main/lzo/examples/Makefile.in
diff --git a/lzo/examples/dict.c b/main/lzo/examples/dict.c
index 04db2453..04db2453 100644
--- a/lzo/examples/dict.c
+++ b/main/lzo/examples/dict.c
diff --git a/lzo/examples/lzopack.c b/main/lzo/examples/lzopack.c
index e4e745df..e4e745df 100644
--- a/lzo/examples/lzopack.c
+++ b/main/lzo/examples/lzopack.c
diff --git a/lzo/examples/overlap.c b/main/lzo/examples/overlap.c
index b2337680..b2337680 100644
--- a/lzo/examples/overlap.c
+++ b/main/lzo/examples/overlap.c
diff --git a/lzo/examples/portab.h b/main/lzo/examples/portab.h
index b4b5a21a..b4b5a21a 100644
--- a/lzo/examples/portab.h
+++ b/main/lzo/examples/portab.h
diff --git a/lzo/examples/portab_a.h b/main/lzo/examples/portab_a.h
index 2706022d..2706022d 100644
--- a/lzo/examples/portab_a.h
+++ b/main/lzo/examples/portab_a.h
diff --git a/lzo/examples/precomp.c b/main/lzo/examples/precomp.c
index a953827b..a953827b 100644
--- a/lzo/examples/precomp.c
+++ b/main/lzo/examples/precomp.c
diff --git a/lzo/examples/precomp2.c b/main/lzo/examples/precomp2.c
index d9e1b47b..d9e1b47b 100644
--- a/lzo/examples/precomp2.c
+++ b/main/lzo/examples/precomp2.c
diff --git a/lzo/examples/simple.c b/main/lzo/examples/simple.c
index 9d06cb5c..9d06cb5c 100644
--- a/lzo/examples/simple.c
+++ b/main/lzo/examples/simple.c
diff --git a/lzo/include/Makefile b/main/lzo/include/Makefile
index ce13657c..ce13657c 100644
--- a/lzo/include/Makefile
+++ b/main/lzo/include/Makefile
diff --git a/lzo/include/Makefile.am b/main/lzo/include/Makefile.am
index 5ad18f48..5ad18f48 100644
--- a/lzo/include/Makefile.am
+++ b/main/lzo/include/Makefile.am
diff --git a/lzo/include/Makefile.in b/main/lzo/include/Makefile.in
index c5cb4e79..c5cb4e79 100644
--- a/lzo/include/Makefile.in
+++ b/main/lzo/include/Makefile.in
diff --git a/lzo/include/lzo/Makefile b/main/lzo/include/lzo/Makefile
index fd2af055..fd2af055 100644
--- a/lzo/include/lzo/Makefile
+++ b/main/lzo/include/lzo/Makefile
diff --git a/lzo/include/lzo/Makefile.am b/main/lzo/include/lzo/Makefile.am
index 39537bb2..39537bb2 100644
--- a/lzo/include/lzo/Makefile.am
+++ b/main/lzo/include/lzo/Makefile.am
diff --git a/lzo/include/lzo/Makefile.in b/main/lzo/include/lzo/Makefile.in
index 8bd26ceb..8bd26ceb 100644
--- a/lzo/include/lzo/Makefile.in
+++ b/main/lzo/include/lzo/Makefile.in
diff --git a/lzo/include/lzo/lzo1.h b/main/lzo/include/lzo/lzo1.h
index de0fba57..de0fba57 100644
--- a/lzo/include/lzo/lzo1.h
+++ b/main/lzo/include/lzo/lzo1.h
diff --git a/lzo/include/lzo/lzo1a.h b/main/lzo/include/lzo/lzo1a.h
index 0969c67d..0969c67d 100644
--- a/lzo/include/lzo/lzo1a.h
+++ b/main/lzo/include/lzo/lzo1a.h
diff --git a/lzo/include/lzo/lzo1b.h b/main/lzo/include/lzo/lzo1b.h
index da3b597c..da3b597c 100644
--- a/lzo/include/lzo/lzo1b.h
+++ b/main/lzo/include/lzo/lzo1b.h
diff --git a/lzo/include/lzo/lzo1c.h b/main/lzo/include/lzo/lzo1c.h
index d5b1b8c5..d5b1b8c5 100644
--- a/lzo/include/lzo/lzo1c.h
+++ b/main/lzo/include/lzo/lzo1c.h
diff --git a/lzo/include/lzo/lzo1f.h b/main/lzo/include/lzo/lzo1f.h
index 77130703..77130703 100644
--- a/lzo/include/lzo/lzo1f.h
+++ b/main/lzo/include/lzo/lzo1f.h
diff --git a/lzo/include/lzo/lzo1x.h b/main/lzo/include/lzo/lzo1x.h
index 9bb993cc..9bb993cc 100644
--- a/lzo/include/lzo/lzo1x.h
+++ b/main/lzo/include/lzo/lzo1x.h
diff --git a/lzo/include/lzo/lzo1y.h b/main/lzo/include/lzo/lzo1y.h
index 359e3580..359e3580 100644
--- a/lzo/include/lzo/lzo1y.h
+++ b/main/lzo/include/lzo/lzo1y.h
diff --git a/lzo/include/lzo/lzo1z.h b/main/lzo/include/lzo/lzo1z.h
index f385ca39..f385ca39 100644
--- a/lzo/include/lzo/lzo1z.h
+++ b/main/lzo/include/lzo/lzo1z.h
diff --git a/lzo/include/lzo/lzo2a.h b/main/lzo/include/lzo/lzo2a.h
index ef65155e..ef65155e 100644
--- a/lzo/include/lzo/lzo2a.h
+++ b/main/lzo/include/lzo/lzo2a.h
diff --git a/lzo/include/lzo/lzo_asm.h b/main/lzo/include/lzo/lzo_asm.h
index 51bea657..51bea657 100644
--- a/lzo/include/lzo/lzo_asm.h
+++ b/main/lzo/include/lzo/lzo_asm.h
diff --git a/lzo/include/lzo/lzoconf.h b/main/lzo/include/lzo/lzoconf.h
index 23c6ca93..23c6ca93 100644
--- a/lzo/include/lzo/lzoconf.h
+++ b/main/lzo/include/lzo/lzoconf.h
diff --git a/lzo/include/lzo/lzodefs.h b/main/lzo/include/lzo/lzodefs.h
index 0e40e332..0e40e332 100644
--- a/lzo/include/lzo/lzodefs.h
+++ b/main/lzo/include/lzo/lzodefs.h
diff --git a/lzo/include/lzo/lzoutil.h b/main/lzo/include/lzo/lzoutil.h
index eb741ce2..eb741ce2 100644
--- a/lzo/include/lzo/lzoutil.h
+++ b/main/lzo/include/lzo/lzoutil.h
diff --git a/lzo/libtool b/main/lzo/libtool
index 0130dbd5..0130dbd5 100755
--- a/lzo/libtool
+++ b/main/lzo/libtool
diff --git a/lzo/lzotest/.deps/lzotest.Po b/main/lzo/lzotest/.deps/lzotest.Po
index 9ce06a81..9ce06a81 100644
--- a/lzo/lzotest/.deps/lzotest.Po
+++ b/main/lzo/lzotest/.deps/lzotest.Po
diff --git a/lzo/lzotest/Makefile b/main/lzo/lzotest/Makefile
index 44391091..44391091 100644
--- a/lzo/lzotest/Makefile
+++ b/main/lzo/lzotest/Makefile
diff --git a/lzo/lzotest/Makefile.am b/main/lzo/lzotest/Makefile.am
index 842ccfb3..842ccfb3 100644
--- a/lzo/lzotest/Makefile.am
+++ b/main/lzo/lzotest/Makefile.am
diff --git a/lzo/lzotest/Makefile.in b/main/lzo/lzotest/Makefile.in
index d2df9024..d2df9024 100644
--- a/lzo/lzotest/Makefile.in
+++ b/main/lzo/lzotest/Makefile.in
diff --git a/lzo/lzotest/asm.h b/main/lzo/lzotest/asm.h
index a368fbed..a368fbed 100644
--- a/lzo/lzotest/asm.h
+++ b/main/lzo/lzotest/asm.h
diff --git a/lzo/lzotest/db.h b/main/lzo/lzotest/db.h
index 5bccc25d..5bccc25d 100644
--- a/lzo/lzotest/db.h
+++ b/main/lzo/lzotest/db.h
diff --git a/lzo/lzotest/lzotest.c b/main/lzo/lzotest/lzotest.c
index 3a9874e7..3a9874e7 100644
--- a/lzo/lzotest/lzotest.c
+++ b/main/lzo/lzotest/lzotest.c
diff --git a/lzo/lzotest/mygetopt.ch b/main/lzo/lzotest/mygetopt.ch
index af4d282c..af4d282c 100644
--- a/lzo/lzotest/mygetopt.ch
+++ b/main/lzo/lzotest/mygetopt.ch
diff --git a/lzo/lzotest/mygetopt.h b/main/lzo/lzotest/mygetopt.h
index a0de9af3..a0de9af3 100644
--- a/lzo/lzotest/mygetopt.h
+++ b/main/lzo/lzotest/mygetopt.h
diff --git a/lzo/lzotest/wrap.h b/main/lzo/lzotest/wrap.h
index bd627df6..bd627df6 100644
--- a/lzo/lzotest/wrap.h
+++ b/main/lzo/lzotest/wrap.h
diff --git a/lzo/lzotest/wrapmisc.h b/main/lzo/lzotest/wrapmisc.h
index 559ffac3..559ffac3 100644
--- a/lzo/lzotest/wrapmisc.h
+++ b/main/lzo/lzotest/wrapmisc.h
diff --git a/lzo/minilzo/.deps/minilzo.Po b/main/lzo/minilzo/.deps/minilzo.Po
index 9ce06a81..9ce06a81 100644
--- a/lzo/minilzo/.deps/minilzo.Po
+++ b/main/lzo/minilzo/.deps/minilzo.Po
diff --git a/lzo/minilzo/.deps/testmini.Po b/main/lzo/minilzo/.deps/testmini.Po
index 9ce06a81..9ce06a81 100644
--- a/lzo/minilzo/.deps/testmini.Po
+++ b/main/lzo/minilzo/.deps/testmini.Po
diff --git a/lzo/minilzo/Makefile b/main/lzo/minilzo/Makefile
index 78258d88..78258d88 100644
--- a/lzo/minilzo/Makefile
+++ b/main/lzo/minilzo/Makefile
diff --git a/lzo/minilzo/Makefile.am b/main/lzo/minilzo/Makefile.am
index 4b3693c9..4b3693c9 100644
--- a/lzo/minilzo/Makefile.am
+++ b/main/lzo/minilzo/Makefile.am
diff --git a/lzo/minilzo/Makefile.in b/main/lzo/minilzo/Makefile.in
index c12dc8b4..c12dc8b4 100644
--- a/lzo/minilzo/Makefile.in
+++ b/main/lzo/minilzo/Makefile.in
diff --git a/lzo/minilzo/Makefile.minilzo b/main/lzo/minilzo/Makefile.minilzo
index 9da6d596..9da6d596 100644
--- a/lzo/minilzo/Makefile.minilzo
+++ b/main/lzo/minilzo/Makefile.minilzo
diff --git a/lzo/minilzo/README.LZO b/main/lzo/minilzo/README.LZO
index 058eace7..058eace7 100644
--- a/lzo/minilzo/README.LZO
+++ b/main/lzo/minilzo/README.LZO
diff --git a/lzo/minilzo/minilzo.c b/main/lzo/minilzo/minilzo.c
index 34ce0f09..34ce0f09 100644
--- a/lzo/minilzo/minilzo.c
+++ b/main/lzo/minilzo/minilzo.c
diff --git a/lzo/minilzo/minilzo.h b/main/lzo/minilzo/minilzo.h
index 4c7b2378..4c7b2378 100644
--- a/lzo/minilzo/minilzo.h
+++ b/main/lzo/minilzo/minilzo.h
diff --git a/lzo/minilzo/testmini.c b/main/lzo/minilzo/testmini.c
index 991f8789..991f8789 100644
--- a/lzo/minilzo/testmini.c
+++ b/main/lzo/minilzo/testmini.c
diff --git a/lzo/src/.deps/lzo1.Plo b/main/lzo/src/.deps/lzo1.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1.Plo
+++ b/main/lzo/src/.deps/lzo1.Plo
diff --git a/lzo/src/.deps/lzo1_99.Plo b/main/lzo/src/.deps/lzo1_99.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1_99.Plo
+++ b/main/lzo/src/.deps/lzo1_99.Plo
diff --git a/lzo/src/.deps/lzo1a.Plo b/main/lzo/src/.deps/lzo1a.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1a.Plo
+++ b/main/lzo/src/.deps/lzo1a.Plo
diff --git a/lzo/src/.deps/lzo1a_99.Plo b/main/lzo/src/.deps/lzo1a_99.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1a_99.Plo
+++ b/main/lzo/src/.deps/lzo1a_99.Plo
diff --git a/lzo/src/.deps/lzo1b_1.Plo b/main/lzo/src/.deps/lzo1b_1.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1b_1.Plo
+++ b/main/lzo/src/.deps/lzo1b_1.Plo
diff --git a/lzo/src/.deps/lzo1b_2.Plo b/main/lzo/src/.deps/lzo1b_2.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1b_2.Plo
+++ b/main/lzo/src/.deps/lzo1b_2.Plo
diff --git a/lzo/src/.deps/lzo1b_3.Plo b/main/lzo/src/.deps/lzo1b_3.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1b_3.Plo
+++ b/main/lzo/src/.deps/lzo1b_3.Plo
diff --git a/lzo/src/.deps/lzo1b_4.Plo b/main/lzo/src/.deps/lzo1b_4.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1b_4.Plo
+++ b/main/lzo/src/.deps/lzo1b_4.Plo
diff --git a/lzo/src/.deps/lzo1b_5.Plo b/main/lzo/src/.deps/lzo1b_5.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1b_5.Plo
+++ b/main/lzo/src/.deps/lzo1b_5.Plo
diff --git a/lzo/src/.deps/lzo1b_6.Plo b/main/lzo/src/.deps/lzo1b_6.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1b_6.Plo
+++ b/main/lzo/src/.deps/lzo1b_6.Plo
diff --git a/lzo/src/.deps/lzo1b_7.Plo b/main/lzo/src/.deps/lzo1b_7.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1b_7.Plo
+++ b/main/lzo/src/.deps/lzo1b_7.Plo
diff --git a/lzo/src/.deps/lzo1b_8.Plo b/main/lzo/src/.deps/lzo1b_8.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1b_8.Plo
+++ b/main/lzo/src/.deps/lzo1b_8.Plo
diff --git a/lzo/src/.deps/lzo1b_9.Plo b/main/lzo/src/.deps/lzo1b_9.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1b_9.Plo
+++ b/main/lzo/src/.deps/lzo1b_9.Plo
diff --git a/lzo/src/.deps/lzo1b_99.Plo b/main/lzo/src/.deps/lzo1b_99.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1b_99.Plo
+++ b/main/lzo/src/.deps/lzo1b_99.Plo
diff --git a/lzo/src/.deps/lzo1b_9x.Plo b/main/lzo/src/.deps/lzo1b_9x.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1b_9x.Plo
+++ b/main/lzo/src/.deps/lzo1b_9x.Plo
diff --git a/lzo/src/.deps/lzo1b_cc.Plo b/main/lzo/src/.deps/lzo1b_cc.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1b_cc.Plo
+++ b/main/lzo/src/.deps/lzo1b_cc.Plo
diff --git a/lzo/src/.deps/lzo1b_d1.Plo b/main/lzo/src/.deps/lzo1b_d1.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1b_d1.Plo
+++ b/main/lzo/src/.deps/lzo1b_d1.Plo
diff --git a/lzo/src/.deps/lzo1b_d2.Plo b/main/lzo/src/.deps/lzo1b_d2.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1b_d2.Plo
+++ b/main/lzo/src/.deps/lzo1b_d2.Plo
diff --git a/lzo/src/.deps/lzo1b_rr.Plo b/main/lzo/src/.deps/lzo1b_rr.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1b_rr.Plo
+++ b/main/lzo/src/.deps/lzo1b_rr.Plo
diff --git a/lzo/src/.deps/lzo1b_xx.Plo b/main/lzo/src/.deps/lzo1b_xx.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1b_xx.Plo
+++ b/main/lzo/src/.deps/lzo1b_xx.Plo
diff --git a/lzo/src/.deps/lzo1c_1.Plo b/main/lzo/src/.deps/lzo1c_1.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1c_1.Plo
+++ b/main/lzo/src/.deps/lzo1c_1.Plo
diff --git a/lzo/src/.deps/lzo1c_2.Plo b/main/lzo/src/.deps/lzo1c_2.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1c_2.Plo
+++ b/main/lzo/src/.deps/lzo1c_2.Plo
diff --git a/lzo/src/.deps/lzo1c_3.Plo b/main/lzo/src/.deps/lzo1c_3.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1c_3.Plo
+++ b/main/lzo/src/.deps/lzo1c_3.Plo
diff --git a/lzo/src/.deps/lzo1c_4.Plo b/main/lzo/src/.deps/lzo1c_4.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1c_4.Plo
+++ b/main/lzo/src/.deps/lzo1c_4.Plo
diff --git a/lzo/src/.deps/lzo1c_5.Plo b/main/lzo/src/.deps/lzo1c_5.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1c_5.Plo
+++ b/main/lzo/src/.deps/lzo1c_5.Plo
diff --git a/lzo/src/.deps/lzo1c_6.Plo b/main/lzo/src/.deps/lzo1c_6.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1c_6.Plo
+++ b/main/lzo/src/.deps/lzo1c_6.Plo
diff --git a/lzo/src/.deps/lzo1c_7.Plo b/main/lzo/src/.deps/lzo1c_7.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1c_7.Plo
+++ b/main/lzo/src/.deps/lzo1c_7.Plo
diff --git a/lzo/src/.deps/lzo1c_8.Plo b/main/lzo/src/.deps/lzo1c_8.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1c_8.Plo
+++ b/main/lzo/src/.deps/lzo1c_8.Plo
diff --git a/lzo/src/.deps/lzo1c_9.Plo b/main/lzo/src/.deps/lzo1c_9.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1c_9.Plo
+++ b/main/lzo/src/.deps/lzo1c_9.Plo
diff --git a/lzo/src/.deps/lzo1c_99.Plo b/main/lzo/src/.deps/lzo1c_99.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1c_99.Plo
+++ b/main/lzo/src/.deps/lzo1c_99.Plo
diff --git a/lzo/src/.deps/lzo1c_9x.Plo b/main/lzo/src/.deps/lzo1c_9x.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1c_9x.Plo
+++ b/main/lzo/src/.deps/lzo1c_9x.Plo
diff --git a/lzo/src/.deps/lzo1c_cc.Plo b/main/lzo/src/.deps/lzo1c_cc.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1c_cc.Plo
+++ b/main/lzo/src/.deps/lzo1c_cc.Plo
diff --git a/lzo/src/.deps/lzo1c_d1.Plo b/main/lzo/src/.deps/lzo1c_d1.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1c_d1.Plo
+++ b/main/lzo/src/.deps/lzo1c_d1.Plo
diff --git a/lzo/src/.deps/lzo1c_d2.Plo b/main/lzo/src/.deps/lzo1c_d2.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1c_d2.Plo
+++ b/main/lzo/src/.deps/lzo1c_d2.Plo
diff --git a/lzo/src/.deps/lzo1c_rr.Plo b/main/lzo/src/.deps/lzo1c_rr.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1c_rr.Plo
+++ b/main/lzo/src/.deps/lzo1c_rr.Plo
diff --git a/lzo/src/.deps/lzo1c_xx.Plo b/main/lzo/src/.deps/lzo1c_xx.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1c_xx.Plo
+++ b/main/lzo/src/.deps/lzo1c_xx.Plo
diff --git a/lzo/src/.deps/lzo1f_1.Plo b/main/lzo/src/.deps/lzo1f_1.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1f_1.Plo
+++ b/main/lzo/src/.deps/lzo1f_1.Plo
diff --git a/lzo/src/.deps/lzo1f_9x.Plo b/main/lzo/src/.deps/lzo1f_9x.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1f_9x.Plo
+++ b/main/lzo/src/.deps/lzo1f_9x.Plo
diff --git a/lzo/src/.deps/lzo1f_d1.Plo b/main/lzo/src/.deps/lzo1f_d1.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1f_d1.Plo
+++ b/main/lzo/src/.deps/lzo1f_d1.Plo
diff --git a/lzo/src/.deps/lzo1f_d2.Plo b/main/lzo/src/.deps/lzo1f_d2.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1f_d2.Plo
+++ b/main/lzo/src/.deps/lzo1f_d2.Plo
diff --git a/lzo/src/.deps/lzo1x_1.Plo b/main/lzo/src/.deps/lzo1x_1.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1x_1.Plo
+++ b/main/lzo/src/.deps/lzo1x_1.Plo
diff --git a/lzo/src/.deps/lzo1x_1k.Plo b/main/lzo/src/.deps/lzo1x_1k.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1x_1k.Plo
+++ b/main/lzo/src/.deps/lzo1x_1k.Plo
diff --git a/lzo/src/.deps/lzo1x_1l.Plo b/main/lzo/src/.deps/lzo1x_1l.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1x_1l.Plo
+++ b/main/lzo/src/.deps/lzo1x_1l.Plo
diff --git a/lzo/src/.deps/lzo1x_1o.Plo b/main/lzo/src/.deps/lzo1x_1o.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1x_1o.Plo
+++ b/main/lzo/src/.deps/lzo1x_1o.Plo
diff --git a/lzo/src/.deps/lzo1x_9x.Plo b/main/lzo/src/.deps/lzo1x_9x.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1x_9x.Plo
+++ b/main/lzo/src/.deps/lzo1x_9x.Plo
diff --git a/lzo/src/.deps/lzo1x_d1.Plo b/main/lzo/src/.deps/lzo1x_d1.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1x_d1.Plo
+++ b/main/lzo/src/.deps/lzo1x_d1.Plo
diff --git a/lzo/src/.deps/lzo1x_d2.Plo b/main/lzo/src/.deps/lzo1x_d2.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1x_d2.Plo
+++ b/main/lzo/src/.deps/lzo1x_d2.Plo
diff --git a/lzo/src/.deps/lzo1x_d3.Plo b/main/lzo/src/.deps/lzo1x_d3.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1x_d3.Plo
+++ b/main/lzo/src/.deps/lzo1x_d3.Plo
diff --git a/lzo/src/.deps/lzo1x_o.Plo b/main/lzo/src/.deps/lzo1x_o.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1x_o.Plo
+++ b/main/lzo/src/.deps/lzo1x_o.Plo
diff --git a/lzo/src/.deps/lzo1y_1.Plo b/main/lzo/src/.deps/lzo1y_1.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1y_1.Plo
+++ b/main/lzo/src/.deps/lzo1y_1.Plo
diff --git a/lzo/src/.deps/lzo1y_9x.Plo b/main/lzo/src/.deps/lzo1y_9x.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1y_9x.Plo
+++ b/main/lzo/src/.deps/lzo1y_9x.Plo
diff --git a/lzo/src/.deps/lzo1y_d1.Plo b/main/lzo/src/.deps/lzo1y_d1.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1y_d1.Plo
+++ b/main/lzo/src/.deps/lzo1y_d1.Plo
diff --git a/lzo/src/.deps/lzo1y_d2.Plo b/main/lzo/src/.deps/lzo1y_d2.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1y_d2.Plo
+++ b/main/lzo/src/.deps/lzo1y_d2.Plo
diff --git a/lzo/src/.deps/lzo1y_d3.Plo b/main/lzo/src/.deps/lzo1y_d3.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1y_d3.Plo
+++ b/main/lzo/src/.deps/lzo1y_d3.Plo
diff --git a/lzo/src/.deps/lzo1y_o.Plo b/main/lzo/src/.deps/lzo1y_o.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1y_o.Plo
+++ b/main/lzo/src/.deps/lzo1y_o.Plo
diff --git a/lzo/src/.deps/lzo1z_9x.Plo b/main/lzo/src/.deps/lzo1z_9x.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1z_9x.Plo
+++ b/main/lzo/src/.deps/lzo1z_9x.Plo
diff --git a/lzo/src/.deps/lzo1z_d1.Plo b/main/lzo/src/.deps/lzo1z_d1.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1z_d1.Plo
+++ b/main/lzo/src/.deps/lzo1z_d1.Plo
diff --git a/lzo/src/.deps/lzo1z_d2.Plo b/main/lzo/src/.deps/lzo1z_d2.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1z_d2.Plo
+++ b/main/lzo/src/.deps/lzo1z_d2.Plo
diff --git a/lzo/src/.deps/lzo1z_d3.Plo b/main/lzo/src/.deps/lzo1z_d3.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo1z_d3.Plo
+++ b/main/lzo/src/.deps/lzo1z_d3.Plo
diff --git a/lzo/src/.deps/lzo2a_9x.Plo b/main/lzo/src/.deps/lzo2a_9x.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo2a_9x.Plo
+++ b/main/lzo/src/.deps/lzo2a_9x.Plo
diff --git a/lzo/src/.deps/lzo2a_d1.Plo b/main/lzo/src/.deps/lzo2a_d1.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo2a_d1.Plo
+++ b/main/lzo/src/.deps/lzo2a_d1.Plo
diff --git a/lzo/src/.deps/lzo2a_d2.Plo b/main/lzo/src/.deps/lzo2a_d2.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo2a_d2.Plo
+++ b/main/lzo/src/.deps/lzo2a_d2.Plo
diff --git a/lzo/src/.deps/lzo_crc.Plo b/main/lzo/src/.deps/lzo_crc.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo_crc.Plo
+++ b/main/lzo/src/.deps/lzo_crc.Plo
diff --git a/lzo/src/.deps/lzo_init.Plo b/main/lzo/src/.deps/lzo_init.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo_init.Plo
+++ b/main/lzo/src/.deps/lzo_init.Plo
diff --git a/lzo/src/.deps/lzo_ptr.Plo b/main/lzo/src/.deps/lzo_ptr.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo_ptr.Plo
+++ b/main/lzo/src/.deps/lzo_ptr.Plo
diff --git a/lzo/src/.deps/lzo_str.Plo b/main/lzo/src/.deps/lzo_str.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo_str.Plo
+++ b/main/lzo/src/.deps/lzo_str.Plo
diff --git a/lzo/src/.deps/lzo_util.Plo b/main/lzo/src/.deps/lzo_util.Plo
index 9ce06a81..9ce06a81 100644
--- a/lzo/src/.deps/lzo_util.Plo
+++ b/main/lzo/src/.deps/lzo_util.Plo
diff --git a/lzo/src/Makefile b/main/lzo/src/Makefile
index 2765207c..2765207c 100644
--- a/lzo/src/Makefile
+++ b/main/lzo/src/Makefile
diff --git a/lzo/src/Makefile.am b/main/lzo/src/Makefile.am
index e5f6ca01..e5f6ca01 100644
--- a/lzo/src/Makefile.am
+++ b/main/lzo/src/Makefile.am
diff --git a/lzo/src/Makefile.in b/main/lzo/src/Makefile.in
index 90cf4e22..90cf4e22 100644
--- a/lzo/src/Makefile.in
+++ b/main/lzo/src/Makefile.in
diff --git a/lzo/src/compr1b.h b/main/lzo/src/compr1b.h
index de46b0a5..de46b0a5 100644
--- a/lzo/src/compr1b.h
+++ b/main/lzo/src/compr1b.h
diff --git a/lzo/src/compr1c.h b/main/lzo/src/compr1c.h
index 44dcdcf2..44dcdcf2 100644
--- a/lzo/src/compr1c.h
+++ b/main/lzo/src/compr1c.h
diff --git a/lzo/src/config1.h b/main/lzo/src/config1.h
index 14dc1317..14dc1317 100644
--- a/lzo/src/config1.h
+++ b/main/lzo/src/config1.h
diff --git a/lzo/src/config1a.h b/main/lzo/src/config1a.h
index 3c0f24cf..3c0f24cf 100644
--- a/lzo/src/config1a.h
+++ b/main/lzo/src/config1a.h
diff --git a/lzo/src/config1b.h b/main/lzo/src/config1b.h
index 33bb638d..33bb638d 100644
--- a/lzo/src/config1b.h
+++ b/main/lzo/src/config1b.h
diff --git a/lzo/src/config1c.h b/main/lzo/src/config1c.h
index 32ca1f3a..32ca1f3a 100644
--- a/lzo/src/config1c.h
+++ b/main/lzo/src/config1c.h
diff --git a/lzo/src/config1f.h b/main/lzo/src/config1f.h
index 6a77efc2..6a77efc2 100644
--- a/lzo/src/config1f.h
+++ b/main/lzo/src/config1f.h
diff --git a/lzo/src/config1x.h b/main/lzo/src/config1x.h
index f52d1b88..f52d1b88 100644
--- a/lzo/src/config1x.h
+++ b/main/lzo/src/config1x.h
diff --git a/lzo/src/config1y.h b/main/lzo/src/config1y.h
index ed5a7e4e..ed5a7e4e 100644
--- a/lzo/src/config1y.h
+++ b/main/lzo/src/config1y.h
diff --git a/lzo/src/config1z.h b/main/lzo/src/config1z.h
index 27ef74e0..27ef74e0 100644
--- a/lzo/src/config1z.h
+++ b/main/lzo/src/config1z.h
diff --git a/lzo/src/config2a.h b/main/lzo/src/config2a.h
index f290132d..f290132d 100644
--- a/lzo/src/config2a.h
+++ b/main/lzo/src/config2a.h
diff --git a/lzo/src/lzo1.c b/main/lzo/src/lzo1.c
index edf1c3af..edf1c3af 100644
--- a/lzo/src/lzo1.c
+++ b/main/lzo/src/lzo1.c
diff --git a/lzo/src/lzo1_99.c b/main/lzo/src/lzo1_99.c
index b23695d2..b23695d2 100644
--- a/lzo/src/lzo1_99.c
+++ b/main/lzo/src/lzo1_99.c
diff --git a/lzo/src/lzo1_cm.ch b/main/lzo/src/lzo1_cm.ch
index 148c9faf..148c9faf 100644
--- a/lzo/src/lzo1_cm.ch
+++ b/main/lzo/src/lzo1_cm.ch
diff --git a/lzo/src/lzo1_d.ch b/main/lzo/src/lzo1_d.ch
index 40a5bfdc..40a5bfdc 100644
--- a/lzo/src/lzo1_d.ch
+++ b/main/lzo/src/lzo1_d.ch
diff --git a/lzo/src/lzo1a.c b/main/lzo/src/lzo1a.c
index 37020dd6..37020dd6 100644
--- a/lzo/src/lzo1a.c
+++ b/main/lzo/src/lzo1a.c
diff --git a/lzo/src/lzo1a_99.c b/main/lzo/src/lzo1a_99.c
index 57f5f32d..57f5f32d 100644
--- a/lzo/src/lzo1a_99.c
+++ b/main/lzo/src/lzo1a_99.c
diff --git a/lzo/src/lzo1a_cm.ch b/main/lzo/src/lzo1a_cm.ch
index d86b891e..d86b891e 100644
--- a/lzo/src/lzo1a_cm.ch
+++ b/main/lzo/src/lzo1a_cm.ch
diff --git a/lzo/src/lzo1a_cr.ch b/main/lzo/src/lzo1a_cr.ch
index 9e58e23a..9e58e23a 100644
--- a/lzo/src/lzo1a_cr.ch
+++ b/main/lzo/src/lzo1a_cr.ch
diff --git a/lzo/src/lzo1a_de.h b/main/lzo/src/lzo1a_de.h
index 3e4b05a0..3e4b05a0 100644
--- a/lzo/src/lzo1a_de.h
+++ b/main/lzo/src/lzo1a_de.h
diff --git a/lzo/src/lzo1b_1.c b/main/lzo/src/lzo1b_1.c
index bad1486a..bad1486a 100644
--- a/lzo/src/lzo1b_1.c
+++ b/main/lzo/src/lzo1b_1.c
diff --git a/lzo/src/lzo1b_2.c b/main/lzo/src/lzo1b_2.c
index 0d456b8a..0d456b8a 100644
--- a/lzo/src/lzo1b_2.c
+++ b/main/lzo/src/lzo1b_2.c
diff --git a/lzo/src/lzo1b_3.c b/main/lzo/src/lzo1b_3.c
index af7b12da..af7b12da 100644
--- a/lzo/src/lzo1b_3.c
+++ b/main/lzo/src/lzo1b_3.c
diff --git a/lzo/src/lzo1b_4.c b/main/lzo/src/lzo1b_4.c
index 9ce8abf3..9ce8abf3 100644
--- a/lzo/src/lzo1b_4.c
+++ b/main/lzo/src/lzo1b_4.c
diff --git a/lzo/src/lzo1b_5.c b/main/lzo/src/lzo1b_5.c
index 6052f5fd..6052f5fd 100644
--- a/lzo/src/lzo1b_5.c
+++ b/main/lzo/src/lzo1b_5.c
diff --git a/lzo/src/lzo1b_6.c b/main/lzo/src/lzo1b_6.c
index d31511ab..d31511ab 100644
--- a/lzo/src/lzo1b_6.c
+++ b/main/lzo/src/lzo1b_6.c
diff --git a/lzo/src/lzo1b_7.c b/main/lzo/src/lzo1b_7.c
index 5545458b..5545458b 100644
--- a/lzo/src/lzo1b_7.c
+++ b/main/lzo/src/lzo1b_7.c
diff --git a/lzo/src/lzo1b_8.c b/main/lzo/src/lzo1b_8.c
index 693d90ed..693d90ed 100644
--- a/lzo/src/lzo1b_8.c
+++ b/main/lzo/src/lzo1b_8.c
diff --git a/lzo/src/lzo1b_9.c b/main/lzo/src/lzo1b_9.c
index e6d3fb46..e6d3fb46 100644
--- a/lzo/src/lzo1b_9.c
+++ b/main/lzo/src/lzo1b_9.c
diff --git a/lzo/src/lzo1b_99.c b/main/lzo/src/lzo1b_99.c
index a0e44462..a0e44462 100644
--- a/lzo/src/lzo1b_99.c
+++ b/main/lzo/src/lzo1b_99.c
diff --git a/lzo/src/lzo1b_9x.c b/main/lzo/src/lzo1b_9x.c
index e00186d5..e00186d5 100644
--- a/lzo/src/lzo1b_9x.c
+++ b/main/lzo/src/lzo1b_9x.c
diff --git a/lzo/src/lzo1b_c.ch b/main/lzo/src/lzo1b_c.ch
index a17e3adb..a17e3adb 100644
--- a/lzo/src/lzo1b_c.ch
+++ b/main/lzo/src/lzo1b_c.ch
diff --git a/lzo/src/lzo1b_cc.c b/main/lzo/src/lzo1b_cc.c
index cc7c2e87..cc7c2e87 100644
--- a/lzo/src/lzo1b_cc.c
+++ b/main/lzo/src/lzo1b_cc.c
diff --git a/lzo/src/lzo1b_cc.h b/main/lzo/src/lzo1b_cc.h
index fef3556c..fef3556c 100644
--- a/lzo/src/lzo1b_cc.h
+++ b/main/lzo/src/lzo1b_cc.h
diff --git a/lzo/src/lzo1b_cm.ch b/main/lzo/src/lzo1b_cm.ch
index 7bd50a78..7bd50a78 100644
--- a/lzo/src/lzo1b_cm.ch
+++ b/main/lzo/src/lzo1b_cm.ch
diff --git a/lzo/src/lzo1b_cr.ch b/main/lzo/src/lzo1b_cr.ch
index 61cc7f6e..61cc7f6e 100644
--- a/lzo/src/lzo1b_cr.ch
+++ b/main/lzo/src/lzo1b_cr.ch
diff --git a/lzo/src/lzo1b_d.ch b/main/lzo/src/lzo1b_d.ch
index fe5f3611..fe5f3611 100644
--- a/lzo/src/lzo1b_d.ch
+++ b/main/lzo/src/lzo1b_d.ch
diff --git a/lzo/src/lzo1b_d1.c b/main/lzo/src/lzo1b_d1.c
index 3b15686b..3b15686b 100644
--- a/lzo/src/lzo1b_d1.c
+++ b/main/lzo/src/lzo1b_d1.c
diff --git a/lzo/src/lzo1b_d2.c b/main/lzo/src/lzo1b_d2.c
index 1c54d583..1c54d583 100644
--- a/lzo/src/lzo1b_d2.c
+++ b/main/lzo/src/lzo1b_d2.c
diff --git a/lzo/src/lzo1b_de.h b/main/lzo/src/lzo1b_de.h
index 5cba46f3..5cba46f3 100644
--- a/lzo/src/lzo1b_de.h
+++ b/main/lzo/src/lzo1b_de.h
diff --git a/lzo/src/lzo1b_r.ch b/main/lzo/src/lzo1b_r.ch
index c8ebbc54..c8ebbc54 100644
--- a/lzo/src/lzo1b_r.ch
+++ b/main/lzo/src/lzo1b_r.ch
diff --git a/lzo/src/lzo1b_rr.c b/main/lzo/src/lzo1b_rr.c
index e9eb24c8..e9eb24c8 100644
--- a/lzo/src/lzo1b_rr.c
+++ b/main/lzo/src/lzo1b_rr.c
diff --git a/lzo/src/lzo1b_sm.ch b/main/lzo/src/lzo1b_sm.ch
index 89ba3a77..89ba3a77 100644
--- a/lzo/src/lzo1b_sm.ch
+++ b/main/lzo/src/lzo1b_sm.ch
diff --git a/lzo/src/lzo1b_tm.ch b/main/lzo/src/lzo1b_tm.ch
index 94c79e2a..94c79e2a 100644
--- a/lzo/src/lzo1b_tm.ch
+++ b/main/lzo/src/lzo1b_tm.ch
diff --git a/lzo/src/lzo1b_xx.c b/main/lzo/src/lzo1b_xx.c
index 49d4dd12..49d4dd12 100644
--- a/lzo/src/lzo1b_xx.c
+++ b/main/lzo/src/lzo1b_xx.c
diff --git a/lzo/src/lzo1c_1.c b/main/lzo/src/lzo1c_1.c
index 98dbfae7..98dbfae7 100644
--- a/lzo/src/lzo1c_1.c
+++ b/main/lzo/src/lzo1c_1.c
diff --git a/lzo/src/lzo1c_2.c b/main/lzo/src/lzo1c_2.c
index 181fa9dc..181fa9dc 100644
--- a/lzo/src/lzo1c_2.c
+++ b/main/lzo/src/lzo1c_2.c
diff --git a/lzo/src/lzo1c_3.c b/main/lzo/src/lzo1c_3.c
index 9f5ea878..9f5ea878 100644
--- a/lzo/src/lzo1c_3.c
+++ b/main/lzo/src/lzo1c_3.c
diff --git a/lzo/src/lzo1c_4.c b/main/lzo/src/lzo1c_4.c
index 61e4b5d3..61e4b5d3 100644
--- a/lzo/src/lzo1c_4.c
+++ b/main/lzo/src/lzo1c_4.c
diff --git a/lzo/src/lzo1c_5.c b/main/lzo/src/lzo1c_5.c
index 0efcf2ad..0efcf2ad 100644
--- a/lzo/src/lzo1c_5.c
+++ b/main/lzo/src/lzo1c_5.c
diff --git a/lzo/src/lzo1c_6.c b/main/lzo/src/lzo1c_6.c
index 5074171b..5074171b 100644
--- a/lzo/src/lzo1c_6.c
+++ b/main/lzo/src/lzo1c_6.c
diff --git a/lzo/src/lzo1c_7.c b/main/lzo/src/lzo1c_7.c
index 437f0445..437f0445 100644
--- a/lzo/src/lzo1c_7.c
+++ b/main/lzo/src/lzo1c_7.c
diff --git a/lzo/src/lzo1c_8.c b/main/lzo/src/lzo1c_8.c
index 2a6a67ed..2a6a67ed 100644
--- a/lzo/src/lzo1c_8.c
+++ b/main/lzo/src/lzo1c_8.c
diff --git a/lzo/src/lzo1c_9.c b/main/lzo/src/lzo1c_9.c
index df961e18..df961e18 100644
--- a/lzo/src/lzo1c_9.c
+++ b/main/lzo/src/lzo1c_9.c
diff --git a/lzo/src/lzo1c_99.c b/main/lzo/src/lzo1c_99.c
index 0cc1c2d3..0cc1c2d3 100644
--- a/lzo/src/lzo1c_99.c
+++ b/main/lzo/src/lzo1c_99.c
diff --git a/lzo/src/lzo1c_9x.c b/main/lzo/src/lzo1c_9x.c
index 4b7091ff..4b7091ff 100644
--- a/lzo/src/lzo1c_9x.c
+++ b/main/lzo/src/lzo1c_9x.c
diff --git a/lzo/src/lzo1c_cc.c b/main/lzo/src/lzo1c_cc.c
index 9618cf3c..9618cf3c 100644
--- a/lzo/src/lzo1c_cc.c
+++ b/main/lzo/src/lzo1c_cc.c
diff --git a/lzo/src/lzo1c_cc.h b/main/lzo/src/lzo1c_cc.h
index c2f081da..c2f081da 100644
--- a/lzo/src/lzo1c_cc.h
+++ b/main/lzo/src/lzo1c_cc.h
diff --git a/lzo/src/lzo1c_d1.c b/main/lzo/src/lzo1c_d1.c
index 940820cf..940820cf 100644
--- a/lzo/src/lzo1c_d1.c
+++ b/main/lzo/src/lzo1c_d1.c
diff --git a/lzo/src/lzo1c_d2.c b/main/lzo/src/lzo1c_d2.c
index b055311f..b055311f 100644
--- a/lzo/src/lzo1c_d2.c
+++ b/main/lzo/src/lzo1c_d2.c
diff --git a/lzo/src/lzo1c_rr.c b/main/lzo/src/lzo1c_rr.c
index 6a516f68..6a516f68 100644
--- a/lzo/src/lzo1c_rr.c
+++ b/main/lzo/src/lzo1c_rr.c
diff --git a/lzo/src/lzo1c_xx.c b/main/lzo/src/lzo1c_xx.c
index c9af645d..c9af645d 100644
--- a/lzo/src/lzo1c_xx.c
+++ b/main/lzo/src/lzo1c_xx.c
diff --git a/lzo/src/lzo1f_1.c b/main/lzo/src/lzo1f_1.c
index 269887ef..269887ef 100644
--- a/lzo/src/lzo1f_1.c
+++ b/main/lzo/src/lzo1f_1.c
diff --git a/lzo/src/lzo1f_9x.c b/main/lzo/src/lzo1f_9x.c
index 3846651a..3846651a 100644
--- a/lzo/src/lzo1f_9x.c
+++ b/main/lzo/src/lzo1f_9x.c
diff --git a/lzo/src/lzo1f_d.ch b/main/lzo/src/lzo1f_d.ch
index 9e942f51..9e942f51 100644
--- a/lzo/src/lzo1f_d.ch
+++ b/main/lzo/src/lzo1f_d.ch
diff --git a/lzo/src/lzo1f_d1.c b/main/lzo/src/lzo1f_d1.c
index 0b80696d..0b80696d 100644
--- a/lzo/src/lzo1f_d1.c
+++ b/main/lzo/src/lzo1f_d1.c
diff --git a/lzo/src/lzo1f_d2.c b/main/lzo/src/lzo1f_d2.c
index 7bc407d1..7bc407d1 100644
--- a/lzo/src/lzo1f_d2.c
+++ b/main/lzo/src/lzo1f_d2.c
diff --git a/lzo/src/lzo1x_1.c b/main/lzo/src/lzo1x_1.c
index ca60c44a..ca60c44a 100644
--- a/lzo/src/lzo1x_1.c
+++ b/main/lzo/src/lzo1x_1.c
diff --git a/lzo/src/lzo1x_1k.c b/main/lzo/src/lzo1x_1k.c
index 4d312221..4d312221 100644
--- a/lzo/src/lzo1x_1k.c
+++ b/main/lzo/src/lzo1x_1k.c
diff --git a/lzo/src/lzo1x_1l.c b/main/lzo/src/lzo1x_1l.c
index 018bedd9..018bedd9 100644
--- a/lzo/src/lzo1x_1l.c
+++ b/main/lzo/src/lzo1x_1l.c
diff --git a/lzo/src/lzo1x_1o.c b/main/lzo/src/lzo1x_1o.c
index b3cba7e0..b3cba7e0 100644
--- a/lzo/src/lzo1x_1o.c
+++ b/main/lzo/src/lzo1x_1o.c
diff --git a/lzo/src/lzo1x_9x.c b/main/lzo/src/lzo1x_9x.c
index f910a69e..f910a69e 100644
--- a/lzo/src/lzo1x_9x.c
+++ b/main/lzo/src/lzo1x_9x.c
diff --git a/lzo/src/lzo1x_c.ch b/main/lzo/src/lzo1x_c.ch
index b2646249..b2646249 100644
--- a/lzo/src/lzo1x_c.ch
+++ b/main/lzo/src/lzo1x_c.ch
diff --git a/lzo/src/lzo1x_d.ch b/main/lzo/src/lzo1x_d.ch
index 49cf3266..49cf3266 100644
--- a/lzo/src/lzo1x_d.ch
+++ b/main/lzo/src/lzo1x_d.ch
diff --git a/lzo/src/lzo1x_d1.c b/main/lzo/src/lzo1x_d1.c
index aa61399f..aa61399f 100644
--- a/lzo/src/lzo1x_d1.c
+++ b/main/lzo/src/lzo1x_d1.c
diff --git a/lzo/src/lzo1x_d2.c b/main/lzo/src/lzo1x_d2.c
index 10a3efe1..10a3efe1 100644
--- a/lzo/src/lzo1x_d2.c
+++ b/main/lzo/src/lzo1x_d2.c
diff --git a/lzo/src/lzo1x_d3.c b/main/lzo/src/lzo1x_d3.c
index 93cea502..93cea502 100644
--- a/lzo/src/lzo1x_d3.c
+++ b/main/lzo/src/lzo1x_d3.c
diff --git a/lzo/src/lzo1x_o.c b/main/lzo/src/lzo1x_o.c
index 76a5353e..76a5353e 100644
--- a/lzo/src/lzo1x_o.c
+++ b/main/lzo/src/lzo1x_o.c
diff --git a/lzo/src/lzo1x_oo.ch b/main/lzo/src/lzo1x_oo.ch
index 6bd2cf17..6bd2cf17 100644
--- a/lzo/src/lzo1x_oo.ch
+++ b/main/lzo/src/lzo1x_oo.ch
diff --git a/lzo/src/lzo1y_1.c b/main/lzo/src/lzo1y_1.c
index e5490098..e5490098 100644
--- a/lzo/src/lzo1y_1.c
+++ b/main/lzo/src/lzo1y_1.c
diff --git a/lzo/src/lzo1y_9x.c b/main/lzo/src/lzo1y_9x.c
index dc875768..dc875768 100644
--- a/lzo/src/lzo1y_9x.c
+++ b/main/lzo/src/lzo1y_9x.c
diff --git a/lzo/src/lzo1y_d1.c b/main/lzo/src/lzo1y_d1.c
index 59129bde..59129bde 100644
--- a/lzo/src/lzo1y_d1.c
+++ b/main/lzo/src/lzo1y_d1.c
diff --git a/lzo/src/lzo1y_d2.c b/main/lzo/src/lzo1y_d2.c
index d2da8fa5..d2da8fa5 100644
--- a/lzo/src/lzo1y_d2.c
+++ b/main/lzo/src/lzo1y_d2.c
diff --git a/lzo/src/lzo1y_d3.c b/main/lzo/src/lzo1y_d3.c
index 58cae1d7..58cae1d7 100644
--- a/lzo/src/lzo1y_d3.c
+++ b/main/lzo/src/lzo1y_d3.c
diff --git a/lzo/src/lzo1y_o.c b/main/lzo/src/lzo1y_o.c
index 702ca555..702ca555 100644
--- a/lzo/src/lzo1y_o.c
+++ b/main/lzo/src/lzo1y_o.c
diff --git a/lzo/src/lzo1z_9x.c b/main/lzo/src/lzo1z_9x.c
index 4c25ba39..4c25ba39 100644
--- a/lzo/src/lzo1z_9x.c
+++ b/main/lzo/src/lzo1z_9x.c
diff --git a/lzo/src/lzo1z_d1.c b/main/lzo/src/lzo1z_d1.c
index e4e865c8..e4e865c8 100644
--- a/lzo/src/lzo1z_d1.c
+++ b/main/lzo/src/lzo1z_d1.c
diff --git a/lzo/src/lzo1z_d2.c b/main/lzo/src/lzo1z_d2.c
index 96d12d61..96d12d61 100644
--- a/lzo/src/lzo1z_d2.c
+++ b/main/lzo/src/lzo1z_d2.c
diff --git a/lzo/src/lzo1z_d3.c b/main/lzo/src/lzo1z_d3.c
index 1e9db9df..1e9db9df 100644
--- a/lzo/src/lzo1z_d3.c
+++ b/main/lzo/src/lzo1z_d3.c
diff --git a/lzo/src/lzo2a_9x.c b/main/lzo/src/lzo2a_9x.c
index cd54f192..cd54f192 100644
--- a/lzo/src/lzo2a_9x.c
+++ b/main/lzo/src/lzo2a_9x.c
diff --git a/lzo/src/lzo2a_d.ch b/main/lzo/src/lzo2a_d.ch
index 48e51caa..48e51caa 100644
--- a/lzo/src/lzo2a_d.ch
+++ b/main/lzo/src/lzo2a_d.ch
diff --git a/lzo/src/lzo2a_d1.c b/main/lzo/src/lzo2a_d1.c
index 55446d03..55446d03 100644
--- a/lzo/src/lzo2a_d1.c
+++ b/main/lzo/src/lzo2a_d1.c
diff --git a/lzo/src/lzo2a_d2.c b/main/lzo/src/lzo2a_d2.c
index 29859b38..29859b38 100644
--- a/lzo/src/lzo2a_d2.c
+++ b/main/lzo/src/lzo2a_d2.c
diff --git a/lzo/src/lzo_conf.h b/main/lzo/src/lzo_conf.h
index 5fcf9635..5fcf9635 100644
--- a/lzo/src/lzo_conf.h
+++ b/main/lzo/src/lzo_conf.h
diff --git a/lzo/src/lzo_crc.c b/main/lzo/src/lzo_crc.c
index f5632cfc..f5632cfc 100644
--- a/lzo/src/lzo_crc.c
+++ b/main/lzo/src/lzo_crc.c
diff --git a/lzo/src/lzo_dict.h b/main/lzo/src/lzo_dict.h
index 961522c2..961522c2 100644
--- a/lzo/src/lzo_dict.h
+++ b/main/lzo/src/lzo_dict.h
diff --git a/lzo/src/lzo_dll.ch b/main/lzo/src/lzo_dll.ch
index 3f56a3b8..3f56a3b8 100644
--- a/lzo/src/lzo_dll.ch
+++ b/main/lzo/src/lzo_dll.ch
diff --git a/lzo/src/lzo_func.ch b/main/lzo/src/lzo_func.ch
index a85b71f0..a85b71f0 100644
--- a/lzo/src/lzo_func.ch
+++ b/main/lzo/src/lzo_func.ch
diff --git a/lzo/src/lzo_init.c b/main/lzo/src/lzo_init.c
index 2872949c..2872949c 100644
--- a/lzo/src/lzo_init.c
+++ b/main/lzo/src/lzo_init.c
diff --git a/lzo/src/lzo_mchw.ch b/main/lzo/src/lzo_mchw.ch
index fec8d92b..fec8d92b 100644
--- a/lzo/src/lzo_mchw.ch
+++ b/main/lzo/src/lzo_mchw.ch
diff --git a/lzo/src/lzo_ptr.c b/main/lzo/src/lzo_ptr.c
index 46e6e353..46e6e353 100644
--- a/lzo/src/lzo_ptr.c
+++ b/main/lzo/src/lzo_ptr.c
diff --git a/lzo/src/lzo_ptr.h b/main/lzo/src/lzo_ptr.h
index 6aa1fc84..6aa1fc84 100644
--- a/lzo/src/lzo_ptr.h
+++ b/main/lzo/src/lzo_ptr.h
diff --git a/lzo/src/lzo_str.c b/main/lzo/src/lzo_str.c
index faeb5b54..faeb5b54 100644
--- a/lzo/src/lzo_str.c
+++ b/main/lzo/src/lzo_str.c
diff --git a/lzo/src/lzo_swd.ch b/main/lzo/src/lzo_swd.ch
index a8d8b396..a8d8b396 100644
--- a/lzo/src/lzo_swd.ch
+++ b/main/lzo/src/lzo_swd.ch
diff --git a/lzo/src/lzo_util.c b/main/lzo/src/lzo_util.c
index 1e4a9e33..1e4a9e33 100644
--- a/lzo/src/lzo_util.c
+++ b/main/lzo/src/lzo_util.c
diff --git a/lzo/src/miniacc.h b/main/lzo/src/miniacc.h
index 0487a004..0487a004 100644
--- a/lzo/src/miniacc.h
+++ b/main/lzo/src/miniacc.h
diff --git a/lzo/src/stats1a.h b/main/lzo/src/stats1a.h
index 577f50c8..577f50c8 100644
--- a/lzo/src/stats1a.h
+++ b/main/lzo/src/stats1a.h
diff --git a/lzo/src/stats1b.h b/main/lzo/src/stats1b.h
index e3ced967..e3ced967 100644
--- a/lzo/src/stats1b.h
+++ b/main/lzo/src/stats1b.h
diff --git a/lzo/src/stats1c.h b/main/lzo/src/stats1c.h
index 8a0d3a5d..8a0d3a5d 100644
--- a/lzo/src/stats1c.h
+++ b/main/lzo/src/stats1c.h
diff --git a/lzo/stamp-h1 b/main/lzo/stamp-h1
index 4547fe1b..4547fe1b 100644
--- a/lzo/stamp-h1
+++ b/main/lzo/stamp-h1
diff --git a/lzo/tests/.deps/align.Po b/main/lzo/tests/.deps/align.Po
index 9ce06a81..9ce06a81 100644
--- a/lzo/tests/.deps/align.Po
+++ b/main/lzo/tests/.deps/align.Po
diff --git a/lzo/tests/.deps/chksum.Po b/main/lzo/tests/.deps/chksum.Po
index 9ce06a81..9ce06a81 100644
--- a/lzo/tests/.deps/chksum.Po
+++ b/main/lzo/tests/.deps/chksum.Po
diff --git a/lzo/tests/.deps/promote.Po b/main/lzo/tests/.deps/promote.Po
index 9ce06a81..9ce06a81 100644
--- a/lzo/tests/.deps/promote.Po
+++ b/main/lzo/tests/.deps/promote.Po
diff --git a/lzo/tests/.deps/sizes.Po b/main/lzo/tests/.deps/sizes.Po
index 9ce06a81..9ce06a81 100644
--- a/lzo/tests/.deps/sizes.Po
+++ b/main/lzo/tests/.deps/sizes.Po
diff --git a/lzo/tests/Makefile b/main/lzo/tests/Makefile
index d69cdc66..d69cdc66 100644
--- a/lzo/tests/Makefile
+++ b/main/lzo/tests/Makefile
diff --git a/lzo/tests/Makefile.am b/main/lzo/tests/Makefile.am
index 08246b33..08246b33 100644
--- a/lzo/tests/Makefile.am
+++ b/main/lzo/tests/Makefile.am
diff --git a/lzo/tests/Makefile.in b/main/lzo/tests/Makefile.in
index d86aa1f4..d86aa1f4 100644
--- a/lzo/tests/Makefile.in
+++ b/main/lzo/tests/Makefile.in
diff --git a/lzo/tests/align.c b/main/lzo/tests/align.c
index bc15663d..bc15663d 100644
--- a/lzo/tests/align.c
+++ b/main/lzo/tests/align.c
diff --git a/lzo/tests/chksum.c b/main/lzo/tests/chksum.c
index 7fbcb417..7fbcb417 100644
--- a/lzo/tests/chksum.c
+++ b/main/lzo/tests/chksum.c
diff --git a/lzo/tests/promote.c b/main/lzo/tests/promote.c
index 21fff2c4..21fff2c4 100644
--- a/lzo/tests/promote.c
+++ b/main/lzo/tests/promote.c
diff --git a/lzo/tests/sizes.c b/main/lzo/tests/sizes.c
index aea8cc2e..aea8cc2e 100644
--- a/lzo/tests/sizes.c
+++ b/main/lzo/tests/sizes.c
diff --git a/lzo/util/check.sh b/main/lzo/util/check.sh
index 6fbd141f..6fbd141f 100644
--- a/lzo/util/check.sh
+++ b/main/lzo/util/check.sh
diff --git a/lzo/util/checkasm.sh b/main/lzo/util/checkasm.sh
index 63ed2b87..63ed2b87 100644
--- a/lzo/util/checkasm.sh
+++ b/main/lzo/util/checkasm.sh
diff --git a/lzo/util/notime.pl b/main/lzo/util/notime.pl
index 9d8a6d14..9d8a6d14 100644
--- a/lzo/util/notime.pl
+++ b/main/lzo/util/notime.pl
diff --git a/lzo/util/overlap.sh b/main/lzo/util/overlap.sh
index 727c86f1..727c86f1 100644
--- a/lzo/util/overlap.sh
+++ b/main/lzo/util/overlap.sh
diff --git a/lzo/util/shortf.pl b/main/lzo/util/shortf.pl
index 380d3ebe..380d3ebe 100644
--- a/lzo/util/shortf.pl
+++ b/main/lzo/util/shortf.pl
diff --git a/lzo/util/table.pl b/main/lzo/util/table.pl
index 8ccbad6f..8ccbad6f 100644
--- a/lzo/util/table.pl
+++ b/main/lzo/util/table.pl
diff --git a/lzo/util/uncompr.pl b/main/lzo/util/uncompr.pl
index df3e969d..df3e969d 100644
--- a/lzo/util/uncompr.pl
+++ b/main/lzo/util/uncompr.pl
diff --git a/misc/build-native.bat b/main/misc/build-native.bat
index 2af86c5b..73a19a00 100644
--- a/misc/build-native.bat
+++ b/main/misc/build-native.bat
@@ -1,7 +1,11 @@
 
 @echo on
+echo Currently broken, feel free to fix and send me a patch, see .sh file
+exit 1
+
 call ndk-build APP_API=all -j 8
 
+
 cd libs
 mkdir ..\assets
 mkdir ..\build\
diff --git a/misc/build-native.sh b/main/misc/build-native.sh
index e1825e7d..37648bd1 100755
--- a/misc/build-native.sh
+++ b/main/misc/build-native.sh
@@ -25,13 +25,13 @@ fi
 ndk-build APP_API=all -j 8
 
 if [ $? = 0 ]; then
-	rm -rf build/native-libs/
+	rm -rf ovpnlibs/
 
 	cd libs
-	mkdir -p ../assets
+	mkdir -p ../ovpnlibs/assets
 	for i in *
 	do
-		cp -v $i/minivpn ../assets/minivpn.$i
+		cp -v $i/minivpn ../ovpnlibs/assets/minivpn.$i
 	done
 	# Removed compiled openssl libs, will use platform so libs 
 	# Reduces size of apk
@@ -39,7 +39,7 @@ if [ $? = 0 ]; then
 
   	for arch in *
   	do
-  	    builddir=../build/native-libs/$arch
+  	    builddir=../ovpnlibs/jniLibs/$arch
   	    mkdir -p $builddir
   		cp -v $arch/*.so  $builddir
   	done
diff --git a/openssl/Android.mk b/main/openssl/Android.mk
index 95f93718..95f93718 100644
--- a/openssl/Android.mk
+++ b/main/openssl/Android.mk
diff --git a/openssl/CleanSpec.mk b/main/openssl/CleanSpec.mk
index 7549ef98..7549ef98 100644
--- a/openssl/CleanSpec.mk
+++ b/main/openssl/CleanSpec.mk
diff --git a/openssl/MODULE_LICENSE_BSD_LIKE b/main/openssl/MODULE_LICENSE_BSD_LIKE
index e69de29b..e69de29b 100644
--- a/openssl/MODULE_LICENSE_BSD_LIKE
+++ b/main/openssl/MODULE_LICENSE_BSD_LIKE
diff --git a/openssl/NOTICE b/main/openssl/NOTICE
index e47d101f..e47d101f 100644
--- a/openssl/NOTICE
+++ b/main/openssl/NOTICE
diff --git a/openssl/README.android b/main/openssl/README.android
index e93fb005..e93fb005 100644
--- a/openssl/README.android
+++ b/main/openssl/README.android
diff --git a/openssl/ThirdPartyProject.prop b/main/openssl/ThirdPartyProject.prop
index 34ad609a..34ad609a 100644
--- a/openssl/ThirdPartyProject.prop
+++ b/main/openssl/ThirdPartyProject.prop
diff --git a/openssl/android-config.mk b/main/openssl/android-config.mk
index d76d6e30..d76d6e30 100644
--- a/openssl/android-config.mk
+++ b/main/openssl/android-config.mk
diff --git a/openssl/android.testssl/CAss.cnf b/main/openssl/android.testssl/CAss.cnf
index 1173c080..1173c080 100644
--- a/openssl/android.testssl/CAss.cnf
+++ b/main/openssl/android.testssl/CAss.cnf
diff --git a/openssl/android.testssl/Uss.cnf b/main/openssl/android.testssl/Uss.cnf
index 56dcdd5e..56dcdd5e 100644
--- a/openssl/android.testssl/Uss.cnf
+++ b/main/openssl/android.testssl/Uss.cnf
diff --git a/openssl/android.testssl/server2.pem b/main/openssl/android.testssl/server2.pem
index 8bb66419..8bb66419 100644
--- a/openssl/android.testssl/server2.pem
+++ b/main/openssl/android.testssl/server2.pem
diff --git a/openssl/android.testssl/testssl b/main/openssl/android.testssl/testssl
index 3f24b1d0..3f24b1d0 100755
--- a/openssl/android.testssl/testssl
+++ b/main/openssl/android.testssl/testssl
diff --git a/openssl/android.testssl/testssl.sh b/main/openssl/android.testssl/testssl.sh
index cd560928..cd560928 100755
--- a/openssl/android.testssl/testssl.sh
+++ b/main/openssl/android.testssl/testssl.sh
diff --git a/openssl/apps/Android.mk b/main/openssl/apps/Android.mk
index 1ad078de..1ad078de 100644
--- a/openssl/apps/Android.mk
+++ b/main/openssl/apps/Android.mk
diff --git a/openssl/apps/CA.pl b/main/openssl/apps/CA.pl
index a3965ece..a3965ece 100644
--- a/openssl/apps/CA.pl
+++ b/main/openssl/apps/CA.pl
diff --git a/openssl/apps/CA.pl.in b/main/openssl/apps/CA.pl.in
index c783a6e6..c783a6e6 100644
--- a/openssl/apps/CA.pl.in
+++ b/main/openssl/apps/CA.pl.in
diff --git a/openssl/apps/CA.sh b/main/openssl/apps/CA.sh
index 7ad6b8c5..7ad6b8c5 100644
--- a/openssl/apps/CA.sh
+++ b/main/openssl/apps/CA.sh
diff --git a/openssl/apps/app_rand.c b/main/openssl/apps/app_rand.c
index b7b6128c..b7b6128c 100644
--- a/openssl/apps/app_rand.c
+++ b/main/openssl/apps/app_rand.c
diff --git a/openssl/apps/apps.c b/main/openssl/apps/apps.c
index 38e61970..38e61970 100644
--- a/openssl/apps/apps.c
+++ b/main/openssl/apps/apps.c
diff --git a/openssl/apps/apps.h b/main/openssl/apps/apps.h
index 42072ec4..42072ec4 100644
--- a/openssl/apps/apps.h
+++ b/main/openssl/apps/apps.h
diff --git a/openssl/apps/asn1pars.c b/main/openssl/apps/asn1pars.c
index 0d660707..0d660707 100644
--- a/openssl/apps/asn1pars.c
+++ b/main/openssl/apps/asn1pars.c
diff --git a/openssl/apps/ca-cert.srl b/main/openssl/apps/ca-cert.srl
index 2c7456e3..2c7456e3 100644
--- a/openssl/apps/ca-cert.srl
+++ b/main/openssl/apps/ca-cert.srl
diff --git a/openssl/apps/ca-key.pem b/main/openssl/apps/ca-key.pem
index 3a520b23..3a520b23 100644
--- a/openssl/apps/ca-key.pem
+++ b/main/openssl/apps/ca-key.pem
diff --git a/openssl/apps/ca-req.pem b/main/openssl/apps/ca-req.pem
index 77bf7ec3..77bf7ec3 100644
--- a/openssl/apps/ca-req.pem
+++ b/main/openssl/apps/ca-req.pem
diff --git a/openssl/apps/ca.c b/main/openssl/apps/ca.c
index 6b8b0ef8..6b8b0ef8 100644
--- a/openssl/apps/ca.c
+++ b/main/openssl/apps/ca.c
diff --git a/openssl/apps/cert.pem b/main/openssl/apps/cert.pem
index de4a77ac..de4a77ac 100644
--- a/openssl/apps/cert.pem
+++ b/main/openssl/apps/cert.pem
diff --git a/openssl/apps/ciphers.c b/main/openssl/apps/ciphers.c
index 3d4c60db..3d4c60db 100644
--- a/openssl/apps/ciphers.c
+++ b/main/openssl/apps/ciphers.c
diff --git a/openssl/apps/client.pem b/main/openssl/apps/client.pem
index 307910e5..307910e5 100644
--- a/openssl/apps/client.pem
+++ b/main/openssl/apps/client.pem
diff --git a/openssl/apps/cms.c b/main/openssl/apps/cms.c
index d29a8849..d29a8849 100644
--- a/openssl/apps/cms.c
+++ b/main/openssl/apps/cms.c
diff --git a/openssl/apps/crl.c b/main/openssl/apps/crl.c
index c395b2af..c395b2af 100644
--- a/openssl/apps/crl.c
+++ b/main/openssl/apps/crl.c
diff --git a/openssl/apps/crl2p7.c b/main/openssl/apps/crl2p7.c
index bbc83774..bbc83774 100644
--- a/openssl/apps/crl2p7.c
+++ b/main/openssl/apps/crl2p7.c
diff --git a/openssl/apps/dgst.c b/main/openssl/apps/dgst.c
index 9bf38ce7..9bf38ce7 100644
--- a/openssl/apps/dgst.c
+++ b/main/openssl/apps/dgst.c
diff --git a/openssl/apps/dh.c b/main/openssl/apps/dh.c
index dee9c01f..dee9c01f 100644
--- a/openssl/apps/dh.c
+++ b/main/openssl/apps/dh.c
diff --git a/openssl/apps/dh1024.pem b/main/openssl/apps/dh1024.pem
index 6eaeca9b..6eaeca9b 100644
--- a/openssl/apps/dh1024.pem
+++ b/main/openssl/apps/dh1024.pem
diff --git a/openssl/apps/dh2048.pem b/main/openssl/apps/dh2048.pem
index dcd0b8d0..dcd0b8d0 100644
--- a/openssl/apps/dh2048.pem
+++ b/main/openssl/apps/dh2048.pem
diff --git a/openssl/apps/dh4096.pem b/main/openssl/apps/dh4096.pem
index 1b35ad8e..1b35ad8e 100644
--- a/openssl/apps/dh4096.pem
+++ b/main/openssl/apps/dh4096.pem
diff --git a/openssl/apps/dh512.pem b/main/openssl/apps/dh512.pem
index 200d16cd..200d16cd 100644
--- a/openssl/apps/dh512.pem
+++ b/main/openssl/apps/dh512.pem
diff --git a/openssl/apps/dhparam.c b/main/openssl/apps/dhparam.c
index b47097cb..b47097cb 100644
--- a/openssl/apps/dhparam.c
+++ b/main/openssl/apps/dhparam.c
diff --git a/openssl/apps/dsa-ca.pem b/main/openssl/apps/dsa-ca.pem
index cccc1420..cccc1420 100644
--- a/openssl/apps/dsa-ca.pem
+++ b/main/openssl/apps/dsa-ca.pem
diff --git a/openssl/apps/dsa-pca.pem b/main/openssl/apps/dsa-pca.pem
index d23774ed..d23774ed 100644
--- a/openssl/apps/dsa-pca.pem
+++ b/main/openssl/apps/dsa-pca.pem
diff --git a/openssl/apps/dsa.c b/main/openssl/apps/dsa.c
index 5222487a..5222487a 100644
--- a/openssl/apps/dsa.c
+++ b/main/openssl/apps/dsa.c
diff --git a/openssl/apps/dsa1024.pem b/main/openssl/apps/dsa1024.pem
index 082dec38..082dec38 100644
--- a/openssl/apps/dsa1024.pem
+++ b/main/openssl/apps/dsa1024.pem
diff --git a/openssl/apps/dsa512.pem b/main/openssl/apps/dsa512.pem
index 5f86d1a6..5f86d1a6 100644
--- a/openssl/apps/dsa512.pem
+++ b/main/openssl/apps/dsa512.pem
diff --git a/openssl/apps/dsap.pem b/main/openssl/apps/dsap.pem
index d4dfdb30..d4dfdb30 100644
--- a/openssl/apps/dsap.pem
+++ b/main/openssl/apps/dsap.pem
diff --git a/openssl/apps/dsaparam.c b/main/openssl/apps/dsaparam.c
index fe72c1d3..fe72c1d3 100644
--- a/openssl/apps/dsaparam.c
+++ b/main/openssl/apps/dsaparam.c
diff --git a/openssl/apps/ec.c b/main/openssl/apps/ec.c
index 896eabc1..896eabc1 100644
--- a/openssl/apps/ec.c
+++ b/main/openssl/apps/ec.c
diff --git a/openssl/apps/ecparam.c b/main/openssl/apps/ecparam.c
index 465480be..465480be 100644
--- a/openssl/apps/ecparam.c
+++ b/main/openssl/apps/ecparam.c
diff --git a/openssl/apps/enc.c b/main/openssl/apps/enc.c
index 076225c4..076225c4 100644
--- a/openssl/apps/enc.c
+++ b/main/openssl/apps/enc.c
diff --git a/openssl/apps/engine.c b/main/openssl/apps/engine.c
index 9a029439..9a029439 100644
--- a/openssl/apps/engine.c
+++ b/main/openssl/apps/engine.c
diff --git a/openssl/apps/errstr.c b/main/openssl/apps/errstr.c
index fe3b9807..fe3b9807 100644
--- a/openssl/apps/errstr.c
+++ b/main/openssl/apps/errstr.c
diff --git a/openssl/apps/gendh.c b/main/openssl/apps/gendh.c
index 4ec776ba..4ec776ba 100644
--- a/openssl/apps/gendh.c
+++ b/main/openssl/apps/gendh.c
diff --git a/openssl/apps/gendsa.c b/main/openssl/apps/gendsa.c
index 62ea9779..62ea9779 100644
--- a/openssl/apps/gendsa.c
+++ b/main/openssl/apps/gendsa.c
diff --git a/openssl/apps/genpkey.c b/main/openssl/apps/genpkey.c
index 6dfda08b..6dfda08b 100644
--- a/openssl/apps/genpkey.c
+++ b/main/openssl/apps/genpkey.c
diff --git a/openssl/apps/genrsa.c b/main/openssl/apps/genrsa.c
index 37e93109..37e93109 100644
--- a/openssl/apps/genrsa.c
+++ b/main/openssl/apps/genrsa.c
diff --git a/openssl/apps/md4.c b/main/openssl/apps/md4.c
index 141415ad..141415ad 100644
--- a/openssl/apps/md4.c
+++ b/main/openssl/apps/md4.c
diff --git a/openssl/apps/nseq.c b/main/openssl/apps/nseq.c
index e3c4dba5..e3c4dba5 100644
--- a/openssl/apps/nseq.c
+++ b/main/openssl/apps/nseq.c
diff --git a/openssl/apps/ocsp.c b/main/openssl/apps/ocsp.c
index 01847dfa..01847dfa 100644
--- a/openssl/apps/ocsp.c
+++ b/main/openssl/apps/ocsp.c
diff --git a/openssl/apps/oid.cnf b/main/openssl/apps/oid.cnf
index faf425a1..faf425a1 100644
--- a/openssl/apps/oid.cnf
+++ b/main/openssl/apps/oid.cnf
diff --git a/openssl/apps/openssl.c b/main/openssl/apps/openssl.c
index 10689573..10689573 100644
--- a/openssl/apps/openssl.c
+++ b/main/openssl/apps/openssl.c
diff --git a/openssl/apps/openssl.cnf b/main/openssl/apps/openssl.cnf
index 9d2cd5bf..9d2cd5bf 100644
--- a/openssl/apps/openssl.cnf
+++ b/main/openssl/apps/openssl.cnf
diff --git a/openssl/apps/passwd.c b/main/openssl/apps/passwd.c
index 9ca25dd1..9ca25dd1 100644
--- a/openssl/apps/passwd.c
+++ b/main/openssl/apps/passwd.c
diff --git a/openssl/apps/pca-cert.srl b/main/openssl/apps/pca-cert.srl
index 2c7456e3..2c7456e3 100644
--- a/openssl/apps/pca-cert.srl
+++ b/main/openssl/apps/pca-cert.srl
diff --git a/openssl/apps/pca-key.pem b/main/openssl/apps/pca-key.pem
index 20029ab7..20029ab7 100644
--- a/openssl/apps/pca-key.pem
+++ b/main/openssl/apps/pca-key.pem
diff --git a/openssl/apps/pca-req.pem b/main/openssl/apps/pca-req.pem
index 33f15533..33f15533 100644
--- a/openssl/apps/pca-req.pem
+++ b/main/openssl/apps/pca-req.pem
diff --git a/openssl/apps/pkcs12.c b/main/openssl/apps/pkcs12.c
index b54c6f84..b54c6f84 100644
--- a/openssl/apps/pkcs12.c
+++ b/main/openssl/apps/pkcs12.c
diff --git a/openssl/apps/pkcs7.c b/main/openssl/apps/pkcs7.c
index ae6cd33f..ae6cd33f 100644
--- a/openssl/apps/pkcs7.c
+++ b/main/openssl/apps/pkcs7.c
diff --git a/openssl/apps/pkcs8.c b/main/openssl/apps/pkcs8.c
index 7edeb179..7edeb179 100644
--- a/openssl/apps/pkcs8.c
+++ b/main/openssl/apps/pkcs8.c
diff --git a/openssl/apps/pkey.c b/main/openssl/apps/pkey.c
index 17e6702f..17e6702f 100644
--- a/openssl/apps/pkey.c
+++ b/main/openssl/apps/pkey.c
diff --git a/openssl/apps/pkeyparam.c b/main/openssl/apps/pkeyparam.c
index 6f7a357a..6f7a357a 100644
--- a/openssl/apps/pkeyparam.c
+++ b/main/openssl/apps/pkeyparam.c
diff --git a/openssl/apps/pkeyutl.c b/main/openssl/apps/pkeyutl.c
index 7eb3f5c5..7eb3f5c5 100644
--- a/openssl/apps/pkeyutl.c
+++ b/main/openssl/apps/pkeyutl.c
diff --git a/openssl/apps/prime.c b/main/openssl/apps/prime.c
index f1aaef87..f1aaef87 100644
--- a/openssl/apps/prime.c
+++ b/main/openssl/apps/prime.c
diff --git a/openssl/apps/privkey.pem b/main/openssl/apps/privkey.pem
index 0af46474..0af46474 100644
--- a/openssl/apps/privkey.pem
+++ b/main/openssl/apps/privkey.pem
diff --git a/openssl/apps/progs.h b/main/openssl/apps/progs.h
index 728bb6dd..728bb6dd 100644
--- a/openssl/apps/progs.h
+++ b/main/openssl/apps/progs.h
diff --git a/openssl/apps/progs.pl b/main/openssl/apps/progs.pl
index de6fdeab..de6fdeab 100644
--- a/openssl/apps/progs.pl
+++ b/main/openssl/apps/progs.pl
diff --git a/openssl/apps/rand.c b/main/openssl/apps/rand.c
index 790e7959..790e7959 100644
--- a/openssl/apps/rand.c
+++ b/main/openssl/apps/rand.c
diff --git a/openssl/apps/req.c b/main/openssl/apps/req.c
index 820cd18f..820cd18f 100644
--- a/openssl/apps/req.c
+++ b/main/openssl/apps/req.c
diff --git a/openssl/apps/req.pem b/main/openssl/apps/req.pem
index 5537df60..5537df60 100644
--- a/openssl/apps/req.pem
+++ b/main/openssl/apps/req.pem
diff --git a/openssl/apps/rsa.c b/main/openssl/apps/rsa.c
index a17708fe..a17708fe 100644
--- a/openssl/apps/rsa.c
+++ b/main/openssl/apps/rsa.c
diff --git a/openssl/apps/rsa8192.pem b/main/openssl/apps/rsa8192.pem
index 946a6e54..946a6e54 100644
--- a/openssl/apps/rsa8192.pem
+++ b/main/openssl/apps/rsa8192.pem
diff --git a/openssl/apps/rsautl.c b/main/openssl/apps/rsautl.c
index b01f004e..b01f004e 100644
--- a/openssl/apps/rsautl.c
+++ b/main/openssl/apps/rsautl.c
diff --git a/openssl/apps/s1024key.pem b/main/openssl/apps/s1024key.pem
index 19e04035..19e04035 100644
--- a/openssl/apps/s1024key.pem
+++ b/main/openssl/apps/s1024key.pem
diff --git a/openssl/apps/s1024req.pem b/main/openssl/apps/s1024req.pem
index bb75e7ee..bb75e7ee 100644
--- a/openssl/apps/s1024req.pem
+++ b/main/openssl/apps/s1024req.pem
diff --git a/openssl/apps/s512-key.pem b/main/openssl/apps/s512-key.pem
index 0e3ff2d3..0e3ff2d3 100644
--- a/openssl/apps/s512-key.pem
+++ b/main/openssl/apps/s512-key.pem
diff --git a/openssl/apps/s512-req.pem b/main/openssl/apps/s512-req.pem
index ea314be5..ea314be5 100644
--- a/openssl/apps/s512-req.pem
+++ b/main/openssl/apps/s512-req.pem
diff --git a/openssl/apps/s_apps.h b/main/openssl/apps/s_apps.h
index 820e5c58..820e5c58 100644
--- a/openssl/apps/s_apps.h
+++ b/main/openssl/apps/s_apps.h
diff --git a/openssl/apps/s_cb.c b/main/openssl/apps/s_cb.c
index c4f55122..c4f55122 100644
--- a/openssl/apps/s_cb.c
+++ b/main/openssl/apps/s_cb.c
diff --git a/openssl/apps/s_client.c b/main/openssl/apps/s_client.c
index b951513d..b951513d 100644
--- a/openssl/apps/s_client.c
+++ b/main/openssl/apps/s_client.c
diff --git a/openssl/apps/s_server.c b/main/openssl/apps/s_server.c
index a8e057ce..a8e057ce 100644
--- a/openssl/apps/s_server.c
+++ b/main/openssl/apps/s_server.c
diff --git a/openssl/apps/s_socket.c b/main/openssl/apps/s_socket.c
index c08544a1..c08544a1 100644
--- a/openssl/apps/s_socket.c
+++ b/main/openssl/apps/s_socket.c
diff --git a/openssl/apps/s_time.c b/main/openssl/apps/s_time.c
index b823c33c..b823c33c 100644
--- a/openssl/apps/s_time.c
+++ b/main/openssl/apps/s_time.c
diff --git a/openssl/apps/server.pem b/main/openssl/apps/server.pem
index 56248e57..56248e57 100644
--- a/openssl/apps/server.pem
+++ b/main/openssl/apps/server.pem
diff --git a/openssl/apps/server.srl b/main/openssl/apps/server.srl
index 8a0f05e1..8a0f05e1 100644
--- a/openssl/apps/server.srl
+++ b/main/openssl/apps/server.srl
diff --git a/openssl/apps/server2.pem b/main/openssl/apps/server2.pem
index 8bb66419..8bb66419 100644
--- a/openssl/apps/server2.pem
+++ b/main/openssl/apps/server2.pem
diff --git a/openssl/apps/sess_id.c b/main/openssl/apps/sess_id.c
index b99179f2..b99179f2 100644
--- a/openssl/apps/sess_id.c
+++ b/main/openssl/apps/sess_id.c
diff --git a/openssl/apps/smime.c b/main/openssl/apps/smime.c
index c583f8a0..c583f8a0 100644
--- a/openssl/apps/smime.c
+++ b/main/openssl/apps/smime.c
diff --git a/openssl/apps/speed.c b/main/openssl/apps/speed.c
index b3c54424..b3c54424 100644
--- a/openssl/apps/speed.c
+++ b/main/openssl/apps/speed.c
diff --git a/openssl/apps/spkac.c b/main/openssl/apps/spkac.c
index 0e01ea99..0e01ea99 100644
--- a/openssl/apps/spkac.c
+++ b/main/openssl/apps/spkac.c
diff --git a/openssl/apps/testCA.pem b/main/openssl/apps/testCA.pem
index dcb710aa..dcb710aa 100644
--- a/openssl/apps/testCA.pem
+++ b/main/openssl/apps/testCA.pem
diff --git a/openssl/apps/testdsa.h b/main/openssl/apps/testdsa.h
index 9e84e31c..9e84e31c 100644
--- a/openssl/apps/testdsa.h
+++ b/main/openssl/apps/testdsa.h
diff --git a/openssl/apps/testrsa.h b/main/openssl/apps/testrsa.h
index 3007d792..3007d792 100644
--- a/openssl/apps/testrsa.h
+++ b/main/openssl/apps/testrsa.h
diff --git a/openssl/apps/timeouts.h b/main/openssl/apps/timeouts.h
index 89b5dc76..89b5dc76 100644
--- a/openssl/apps/timeouts.h
+++ b/main/openssl/apps/timeouts.h
diff --git a/openssl/apps/verify.c b/main/openssl/apps/verify.c
index 9163997e..9163997e 100644
--- a/openssl/apps/verify.c
+++ b/main/openssl/apps/verify.c
diff --git a/openssl/apps/version.c b/main/openssl/apps/version.c
index e9555cbd..e9555cbd 100644
--- a/openssl/apps/version.c
+++ b/main/openssl/apps/version.c
diff --git a/openssl/apps/winrand.c b/main/openssl/apps/winrand.c
index 59bede3d..59bede3d 100644
--- a/openssl/apps/winrand.c
+++ b/main/openssl/apps/winrand.c
diff --git a/openssl/apps/x509.c b/main/openssl/apps/x509.c
index ed1e8c69..ed1e8c69 100644
--- a/openssl/apps/x509.c
+++ b/main/openssl/apps/x509.c
diff --git a/openssl/crypto/Android.mk b/main/openssl/crypto/Android.mk
index 70aef35d..70aef35d 100644
--- a/openssl/crypto/Android.mk
+++ b/main/openssl/crypto/Android.mk
diff --git a/openssl/crypto/LPdir_nyi.c b/main/openssl/crypto/LPdir_nyi.c
index 6c1a50e6..6c1a50e6 100644
--- a/openssl/crypto/LPdir_nyi.c
+++ b/main/openssl/crypto/LPdir_nyi.c
diff --git a/openssl/crypto/LPdir_unix.c b/main/openssl/crypto/LPdir_unix.c
index b004cd99..b004cd99 100644
--- a/openssl/crypto/LPdir_unix.c
+++ b/main/openssl/crypto/LPdir_unix.c
diff --git a/openssl/crypto/LPdir_win.c b/main/openssl/crypto/LPdir_win.c
index 702dbc73..702dbc73 100644
--- a/openssl/crypto/LPdir_win.c
+++ b/main/openssl/crypto/LPdir_win.c
diff --git a/openssl/crypto/LPdir_wince.c b/main/openssl/crypto/LPdir_wince.c
index ab0e1e6f..ab0e1e6f 100644
--- a/openssl/crypto/LPdir_wince.c
+++ b/main/openssl/crypto/LPdir_wince.c
diff --git a/openssl/crypto/aes/README b/main/openssl/crypto/aes/README
index 0f9620a8..0f9620a8 100644
--- a/openssl/crypto/aes/README
+++ b/main/openssl/crypto/aes/README
diff --git a/openssl/crypto/aes/aes.h b/main/openssl/crypto/aes/aes.h
index d2c99730..d2c99730 100644
--- a/openssl/crypto/aes/aes.h
+++ b/main/openssl/crypto/aes/aes.h
diff --git a/openssl/crypto/aes/aes_cbc.c b/main/openssl/crypto/aes/aes_cbc.c
index 227f7562..227f7562 100644
--- a/openssl/crypto/aes/aes_cbc.c
+++ b/main/openssl/crypto/aes/aes_cbc.c
diff --git a/openssl/crypto/aes/aes_cfb.c b/main/openssl/crypto/aes/aes_cfb.c
index 0c6d058c..0c6d058c 100644
--- a/openssl/crypto/aes/aes_cfb.c
+++ b/main/openssl/crypto/aes/aes_cfb.c
diff --git a/openssl/crypto/aes/aes_core.c b/main/openssl/crypto/aes/aes_core.c
index a7ec54f4..a7ec54f4 100644
--- a/openssl/crypto/aes/aes_core.c
+++ b/main/openssl/crypto/aes/aes_core.c
diff --git a/openssl/crypto/aes/aes_ctr.c b/main/openssl/crypto/aes/aes_ctr.c
index 7c9d165d..7c9d165d 100644
--- a/openssl/crypto/aes/aes_ctr.c
+++ b/main/openssl/crypto/aes/aes_ctr.c
diff --git a/openssl/crypto/aes/aes_ecb.c b/main/openssl/crypto/aes/aes_ecb.c
index 28aa561c..28aa561c 100644
--- a/openssl/crypto/aes/aes_ecb.c
+++ b/main/openssl/crypto/aes/aes_ecb.c
diff --git a/openssl/crypto/aes/aes_ige.c b/main/openssl/crypto/aes/aes_ige.c
index c161351e..c161351e 100644
--- a/openssl/crypto/aes/aes_ige.c
+++ b/main/openssl/crypto/aes/aes_ige.c
diff --git a/openssl/crypto/aes/aes_locl.h b/main/openssl/crypto/aes/aes_locl.h
index 054b442d..054b442d 100644
--- a/openssl/crypto/aes/aes_locl.h
+++ b/main/openssl/crypto/aes/aes_locl.h
diff --git a/openssl/crypto/aes/aes_misc.c b/main/openssl/crypto/aes/aes_misc.c
index 4fead1b4..4fead1b4 100644
--- a/openssl/crypto/aes/aes_misc.c
+++ b/main/openssl/crypto/aes/aes_misc.c
diff --git a/openssl/crypto/aes/aes_ofb.c b/main/openssl/crypto/aes/aes_ofb.c
index 50bf0b83..50bf0b83 100644
--- a/openssl/crypto/aes/aes_ofb.c
+++ b/main/openssl/crypto/aes/aes_ofb.c
diff --git a/openssl/crypto/aes/aes_wrap.c b/main/openssl/crypto/aes/aes_wrap.c
index e2d73d37..e2d73d37 100644
--- a/openssl/crypto/aes/aes_wrap.c
+++ b/main/openssl/crypto/aes/aes_wrap.c
diff --git a/openssl/crypto/aes/aes_x86core.c b/main/openssl/crypto/aes/aes_x86core.c
index d323e265..d323e265 100644
--- a/openssl/crypto/aes/aes_x86core.c
+++ b/main/openssl/crypto/aes/aes_x86core.c
diff --git a/openssl/crypto/aes/asm/aes-586.pl b/main/openssl/crypto/aes/asm/aes-586.pl
index aab40e6f..aab40e6f 100755
--- a/openssl/crypto/aes/asm/aes-586.pl
+++ b/main/openssl/crypto/aes/asm/aes-586.pl
diff --git a/openssl/crypto/aes/asm/aes-armv4.pl b/main/openssl/crypto/aes/asm/aes-armv4.pl
index c51ee1fb..c51ee1fb 100644
--- a/openssl/crypto/aes/asm/aes-armv4.pl
+++ b/main/openssl/crypto/aes/asm/aes-armv4.pl
diff --git a/openssl/crypto/aes/asm/aes-armv4.s b/main/openssl/crypto/aes/asm/aes-armv4.s
index 27c681c7..27c681c7 100644
--- a/openssl/crypto/aes/asm/aes-armv4.s
+++ b/main/openssl/crypto/aes/asm/aes-armv4.s
diff --git a/openssl/crypto/aes/asm/aes-ia64.S b/main/openssl/crypto/aes/asm/aes-ia64.S
index 7f6c4c36..7f6c4c36 100644
--- a/openssl/crypto/aes/asm/aes-ia64.S
+++ b/main/openssl/crypto/aes/asm/aes-ia64.S
diff --git a/openssl/crypto/aes/asm/aes-ppc.pl b/main/openssl/crypto/aes/asm/aes-ppc.pl
index f82c5e18..f82c5e18 100644
--- a/openssl/crypto/aes/asm/aes-ppc.pl
+++ b/main/openssl/crypto/aes/asm/aes-ppc.pl
diff --git a/openssl/crypto/aes/asm/aes-s390x.pl b/main/openssl/crypto/aes/asm/aes-s390x.pl
index 7e018892..7e018892 100644
--- a/openssl/crypto/aes/asm/aes-s390x.pl
+++ b/main/openssl/crypto/aes/asm/aes-s390x.pl
diff --git a/openssl/crypto/aes/asm/aes-sparcv9.pl b/main/openssl/crypto/aes/asm/aes-sparcv9.pl
index c57b3a2d..c57b3a2d 100755
--- a/openssl/crypto/aes/asm/aes-sparcv9.pl
+++ b/main/openssl/crypto/aes/asm/aes-sparcv9.pl
diff --git a/openssl/crypto/aes/asm/aes-x86_64.pl b/main/openssl/crypto/aes/asm/aes-x86_64.pl
index a545e892..a545e892 100755
--- a/openssl/crypto/aes/asm/aes-x86_64.pl
+++ b/main/openssl/crypto/aes/asm/aes-x86_64.pl
diff --git a/openssl/crypto/alphacpuid.pl b/main/openssl/crypto/alphacpuid.pl
index 4b3cbb98..4b3cbb98 100644
--- a/openssl/crypto/alphacpuid.pl
+++ b/main/openssl/crypto/alphacpuid.pl
diff --git a/openssl/crypto/asn1/a_bitstr.c b/main/openssl/crypto/asn1/a_bitstr.c
index 34179960..34179960 100644
--- a/openssl/crypto/asn1/a_bitstr.c
+++ b/main/openssl/crypto/asn1/a_bitstr.c
diff --git a/openssl/crypto/asn1/a_bool.c b/main/openssl/crypto/asn1/a_bool.c
index 331acdf0..331acdf0 100644
--- a/openssl/crypto/asn1/a_bool.c
+++ b/main/openssl/crypto/asn1/a_bool.c
diff --git a/openssl/crypto/asn1/a_bytes.c b/main/openssl/crypto/asn1/a_bytes.c
index 92d630cd..92d630cd 100644
--- a/openssl/crypto/asn1/a_bytes.c
+++ b/main/openssl/crypto/asn1/a_bytes.c
diff --git a/openssl/crypto/asn1/a_d2i_fp.c b/main/openssl/crypto/asn1/a_d2i_fp.c
index ece40bc4..ece40bc4 100644
--- a/openssl/crypto/asn1/a_d2i_fp.c
+++ b/main/openssl/crypto/asn1/a_d2i_fp.c
diff --git a/openssl/crypto/asn1/a_digest.c b/main/openssl/crypto/asn1/a_digest.c
index d00d9e22..d00d9e22 100644
--- a/openssl/crypto/asn1/a_digest.c
+++ b/main/openssl/crypto/asn1/a_digest.c
diff --git a/openssl/crypto/asn1/a_dup.c b/main/openssl/crypto/asn1/a_dup.c
index d9899254..d9899254 100644
--- a/openssl/crypto/asn1/a_dup.c
+++ b/main/openssl/crypto/asn1/a_dup.c
diff --git a/openssl/crypto/asn1/a_enum.c b/main/openssl/crypto/asn1/a_enum.c
index fe9aa13b..fe9aa13b 100644
--- a/openssl/crypto/asn1/a_enum.c
+++ b/main/openssl/crypto/asn1/a_enum.c
diff --git a/openssl/crypto/asn1/a_gentm.c b/main/openssl/crypto/asn1/a_gentm.c
index c79c6f53..c79c6f53 100644
--- a/openssl/crypto/asn1/a_gentm.c
+++ b/main/openssl/crypto/asn1/a_gentm.c
diff --git a/openssl/crypto/asn1/a_i2d_fp.c b/main/openssl/crypto/asn1/a_i2d_fp.c
index a3ad76d3..a3ad76d3 100644
--- a/openssl/crypto/asn1/a_i2d_fp.c
+++ b/main/openssl/crypto/asn1/a_i2d_fp.c
diff --git a/openssl/crypto/asn1/a_int.c b/main/openssl/crypto/asn1/a_int.c
index 3348b876..3348b876 100644
--- a/openssl/crypto/asn1/a_int.c
+++ b/main/openssl/crypto/asn1/a_int.c
diff --git a/openssl/crypto/asn1/a_mbstr.c b/main/openssl/crypto/asn1/a_mbstr.c
index 1538e0a4..1538e0a4 100644
--- a/openssl/crypto/asn1/a_mbstr.c
+++ b/main/openssl/crypto/asn1/a_mbstr.c
diff --git a/openssl/crypto/asn1/a_object.c b/main/openssl/crypto/asn1/a_object.c
index 3978c915..3978c915 100644
--- a/openssl/crypto/asn1/a_object.c
+++ b/main/openssl/crypto/asn1/a_object.c
diff --git a/openssl/crypto/asn1/a_octet.c b/main/openssl/crypto/asn1/a_octet.c
index e8725e44..e8725e44 100644
--- a/openssl/crypto/asn1/a_octet.c
+++ b/main/openssl/crypto/asn1/a_octet.c
diff --git a/openssl/crypto/asn1/a_print.c b/main/openssl/crypto/asn1/a_print.c
index d18e7723..d18e7723 100644
--- a/openssl/crypto/asn1/a_print.c
+++ b/main/openssl/crypto/asn1/a_print.c
diff --git a/openssl/crypto/asn1/a_set.c b/main/openssl/crypto/asn1/a_set.c
index d726c8d3..d726c8d3 100644
--- a/openssl/crypto/asn1/a_set.c
+++ b/main/openssl/crypto/asn1/a_set.c
diff --git a/openssl/crypto/asn1/a_sign.c b/main/openssl/crypto/asn1/a_sign.c
index ff63bfc7..ff63bfc7 100644
--- a/openssl/crypto/asn1/a_sign.c
+++ b/main/openssl/crypto/asn1/a_sign.c
diff --git a/openssl/crypto/asn1/a_strex.c b/main/openssl/crypto/asn1/a_strex.c
index 264ebf23..264ebf23 100644
--- a/openssl/crypto/asn1/a_strex.c
+++ b/main/openssl/crypto/asn1/a_strex.c
diff --git a/openssl/crypto/asn1/a_strnid.c b/main/openssl/crypto/asn1/a_strnid.c
index 2fc48c15..2fc48c15 100644
--- a/openssl/crypto/asn1/a_strnid.c
+++ b/main/openssl/crypto/asn1/a_strnid.c
diff --git a/openssl/crypto/asn1/a_time.c b/main/openssl/crypto/asn1/a_time.c
index e2eb9b24..e2eb9b24 100644
--- a/openssl/crypto/asn1/a_time.c
+++ b/main/openssl/crypto/asn1/a_time.c
diff --git a/openssl/crypto/asn1/a_type.c b/main/openssl/crypto/asn1/a_type.c
index a45d2f9d..a45d2f9d 100644
--- a/openssl/crypto/asn1/a_type.c
+++ b/main/openssl/crypto/asn1/a_type.c
diff --git a/openssl/crypto/asn1/a_utctm.c b/main/openssl/crypto/asn1/a_utctm.c
index 072e2365..072e2365 100644
--- a/openssl/crypto/asn1/a_utctm.c
+++ b/main/openssl/crypto/asn1/a_utctm.c
diff --git a/openssl/crypto/asn1/a_utf8.c b/main/openssl/crypto/asn1/a_utf8.c
index 508e11e5..508e11e5 100644
--- a/openssl/crypto/asn1/a_utf8.c
+++ b/main/openssl/crypto/asn1/a_utf8.c
diff --git a/openssl/crypto/asn1/a_verify.c b/main/openssl/crypto/asn1/a_verify.c
index cecdb13c..cecdb13c 100644
--- a/openssl/crypto/asn1/a_verify.c
+++ b/main/openssl/crypto/asn1/a_verify.c
diff --git a/openssl/crypto/asn1/ameth_lib.c b/main/openssl/crypto/asn1/ameth_lib.c
index 5a581b90..5a581b90 100644
--- a/openssl/crypto/asn1/ameth_lib.c
+++ b/main/openssl/crypto/asn1/ameth_lib.c
diff --git a/openssl/crypto/asn1/asn1.h b/main/openssl/crypto/asn1/asn1.h
index 59540e4e..59540e4e 100644
--- a/openssl/crypto/asn1/asn1.h
+++ b/main/openssl/crypto/asn1/asn1.h
diff --git a/openssl/crypto/asn1/asn1_err.c b/main/openssl/crypto/asn1/asn1_err.c
index 6e04d08f..6e04d08f 100644
--- a/openssl/crypto/asn1/asn1_err.c
+++ b/main/openssl/crypto/asn1/asn1_err.c
diff --git a/openssl/crypto/asn1/asn1_gen.c b/main/openssl/crypto/asn1/asn1_gen.c
index 4fc24190..4fc24190 100644
--- a/openssl/crypto/asn1/asn1_gen.c
+++ b/main/openssl/crypto/asn1/asn1_gen.c
diff --git a/openssl/crypto/asn1/asn1_lib.c b/main/openssl/crypto/asn1/asn1_lib.c
index 1bcb44ae..1bcb44ae 100644
--- a/openssl/crypto/asn1/asn1_lib.c
+++ b/main/openssl/crypto/asn1/asn1_lib.c
diff --git a/openssl/crypto/asn1/asn1_locl.h b/main/openssl/crypto/asn1/asn1_locl.h
index 5aa65e28..5aa65e28 100644
--- a/openssl/crypto/asn1/asn1_locl.h
+++ b/main/openssl/crypto/asn1/asn1_locl.h
diff --git a/openssl/crypto/asn1/asn1_mac.h b/main/openssl/crypto/asn1/asn1_mac.h
index 87bd0e9e..87bd0e9e 100644
--- a/openssl/crypto/asn1/asn1_mac.h
+++ b/main/openssl/crypto/asn1/asn1_mac.h
diff --git a/openssl/crypto/asn1/asn1_par.c b/main/openssl/crypto/asn1/asn1_par.c
index aaca69ae..aaca69ae 100644
--- a/openssl/crypto/asn1/asn1_par.c
+++ b/main/openssl/crypto/asn1/asn1_par.c
diff --git a/openssl/crypto/asn1/asn1t.h b/main/openssl/crypto/asn1/asn1t.h
index d230e4bf..d230e4bf 100644
--- a/openssl/crypto/asn1/asn1t.h
+++ b/main/openssl/crypto/asn1/asn1t.h
diff --git a/openssl/crypto/asn1/asn_mime.c b/main/openssl/crypto/asn1/asn_mime.c
index c1d1b122..c1d1b122 100644
--- a/openssl/crypto/asn1/asn_mime.c
+++ b/main/openssl/crypto/asn1/asn_mime.c
diff --git a/openssl/crypto/asn1/asn_moid.c b/main/openssl/crypto/asn1/asn_moid.c
index 1ea6a592..1ea6a592 100644
--- a/openssl/crypto/asn1/asn_moid.c
+++ b/main/openssl/crypto/asn1/asn_moid.c
diff --git a/openssl/crypto/asn1/asn_pack.c b/main/openssl/crypto/asn1/asn_pack.c
index ad738217..ad738217 100644
--- a/openssl/crypto/asn1/asn_pack.c
+++ b/main/openssl/crypto/asn1/asn_pack.c
diff --git a/openssl/crypto/asn1/bio_asn1.c b/main/openssl/crypto/asn1/bio_asn1.c
index dc7efd55..dc7efd55 100644
--- a/openssl/crypto/asn1/bio_asn1.c
+++ b/main/openssl/crypto/asn1/bio_asn1.c
diff --git a/openssl/crypto/asn1/bio_ndef.c b/main/openssl/crypto/asn1/bio_ndef.c
index b91f97a1..b91f97a1 100644
--- a/openssl/crypto/asn1/bio_ndef.c
+++ b/main/openssl/crypto/asn1/bio_ndef.c
diff --git a/openssl/crypto/asn1/charmap.h b/main/openssl/crypto/asn1/charmap.h
index b55e6387..b55e6387 100644
--- a/openssl/crypto/asn1/charmap.h
+++ b/main/openssl/crypto/asn1/charmap.h
diff --git a/openssl/crypto/asn1/charmap.pl b/main/openssl/crypto/asn1/charmap.pl
index 2875c598..2875c598 100644
--- a/openssl/crypto/asn1/charmap.pl
+++ b/main/openssl/crypto/asn1/charmap.pl
diff --git a/openssl/crypto/asn1/d2i_pr.c b/main/openssl/crypto/asn1/d2i_pr.c
index 28289447..28289447 100644
--- a/openssl/crypto/asn1/d2i_pr.c
+++ b/main/openssl/crypto/asn1/d2i_pr.c
diff --git a/openssl/crypto/asn1/d2i_pu.c b/main/openssl/crypto/asn1/d2i_pu.c
index c8f39ceb..c8f39ceb 100644
--- a/openssl/crypto/asn1/d2i_pu.c
+++ b/main/openssl/crypto/asn1/d2i_pu.c
diff --git a/openssl/crypto/asn1/evp_asn1.c b/main/openssl/crypto/asn1/evp_asn1.c
index f3d98048..f3d98048 100644
--- a/openssl/crypto/asn1/evp_asn1.c
+++ b/main/openssl/crypto/asn1/evp_asn1.c
diff --git a/openssl/crypto/asn1/f_enum.c b/main/openssl/crypto/asn1/f_enum.c
index 56e3cc8d..56e3cc8d 100644
--- a/openssl/crypto/asn1/f_enum.c
+++ b/main/openssl/crypto/asn1/f_enum.c
diff --git a/openssl/crypto/asn1/f_int.c b/main/openssl/crypto/asn1/f_int.c
index 9494e597..9494e597 100644
--- a/openssl/crypto/asn1/f_int.c
+++ b/main/openssl/crypto/asn1/f_int.c
diff --git a/openssl/crypto/asn1/f_string.c b/main/openssl/crypto/asn1/f_string.c
index 968698a7..968698a7 100644
--- a/openssl/crypto/asn1/f_string.c
+++ b/main/openssl/crypto/asn1/f_string.c
diff --git a/openssl/crypto/asn1/i2d_pr.c b/main/openssl/crypto/asn1/i2d_pr.c
index e398b626..e398b626 100644
--- a/openssl/crypto/asn1/i2d_pr.c
+++ b/main/openssl/crypto/asn1/i2d_pr.c
diff --git a/openssl/crypto/asn1/i2d_pu.c b/main/openssl/crypto/asn1/i2d_pu.c
index 34286dbd..34286dbd 100644
--- a/openssl/crypto/asn1/i2d_pu.c
+++ b/main/openssl/crypto/asn1/i2d_pu.c
diff --git a/openssl/crypto/asn1/n_pkey.c b/main/openssl/crypto/asn1/n_pkey.c
index e7d04390..e7d04390 100644
--- a/openssl/crypto/asn1/n_pkey.c
+++ b/main/openssl/crypto/asn1/n_pkey.c
diff --git a/openssl/crypto/asn1/nsseq.c b/main/openssl/crypto/asn1/nsseq.c
index b8c42022..b8c42022 100644
--- a/openssl/crypto/asn1/nsseq.c
+++ b/main/openssl/crypto/asn1/nsseq.c
diff --git a/openssl/crypto/asn1/p5_pbe.c b/main/openssl/crypto/asn1/p5_pbe.c
index 94bc38b9..94bc38b9 100644
--- a/openssl/crypto/asn1/p5_pbe.c
+++ b/main/openssl/crypto/asn1/p5_pbe.c
diff --git a/openssl/crypto/asn1/p5_pbev2.c b/main/openssl/crypto/asn1/p5_pbev2.c
index cb49b665..cb49b665 100644
--- a/openssl/crypto/asn1/p5_pbev2.c
+++ b/main/openssl/crypto/asn1/p5_pbev2.c
diff --git a/openssl/crypto/asn1/p8_pkey.c b/main/openssl/crypto/asn1/p8_pkey.c
index 17b68d38..17b68d38 100644
--- a/openssl/crypto/asn1/p8_pkey.c
+++ b/main/openssl/crypto/asn1/p8_pkey.c
diff --git a/openssl/crypto/asn1/t_bitst.c b/main/openssl/crypto/asn1/t_bitst.c
index 2e59a25f..2e59a25f 100644
--- a/openssl/crypto/asn1/t_bitst.c
+++ b/main/openssl/crypto/asn1/t_bitst.c
diff --git a/openssl/crypto/asn1/t_crl.c b/main/openssl/crypto/asn1/t_crl.c
index ee5a687c..ee5a687c 100644
--- a/openssl/crypto/asn1/t_crl.c
+++ b/main/openssl/crypto/asn1/t_crl.c
diff --git a/openssl/crypto/asn1/t_pkey.c b/main/openssl/crypto/asn1/t_pkey.c
index 9dd18f65..9dd18f65 100644
--- a/openssl/crypto/asn1/t_pkey.c
+++ b/main/openssl/crypto/asn1/t_pkey.c
diff --git a/openssl/crypto/asn1/t_req.c b/main/openssl/crypto/asn1/t_req.c
index ea1794e3..ea1794e3 100644
--- a/openssl/crypto/asn1/t_req.c
+++ b/main/openssl/crypto/asn1/t_req.c
diff --git a/openssl/crypto/asn1/t_spki.c b/main/openssl/crypto/asn1/t_spki.c
index 079c081a..079c081a 100644
--- a/openssl/crypto/asn1/t_spki.c
+++ b/main/openssl/crypto/asn1/t_spki.c
diff --git a/openssl/crypto/asn1/t_x509.c b/main/openssl/crypto/asn1/t_x509.c
index e061f2ff..e061f2ff 100644
--- a/openssl/crypto/asn1/t_x509.c
+++ b/main/openssl/crypto/asn1/t_x509.c
diff --git a/openssl/crypto/asn1/t_x509a.c b/main/openssl/crypto/asn1/t_x509a.c
index 8b18801a..8b18801a 100644
--- a/openssl/crypto/asn1/t_x509a.c
+++ b/main/openssl/crypto/asn1/t_x509a.c
diff --git a/openssl/crypto/asn1/tasn_dec.c b/main/openssl/crypto/asn1/tasn_dec.c
index 87d7dfdf..87d7dfdf 100644
--- a/openssl/crypto/asn1/tasn_dec.c
+++ b/main/openssl/crypto/asn1/tasn_dec.c
diff --git a/openssl/crypto/asn1/tasn_enc.c b/main/openssl/crypto/asn1/tasn_enc.c
index 936ad1f7..936ad1f7 100644
--- a/openssl/crypto/asn1/tasn_enc.c
+++ b/main/openssl/crypto/asn1/tasn_enc.c
diff --git a/openssl/crypto/asn1/tasn_fre.c b/main/openssl/crypto/asn1/tasn_fre.c
index 77d3092d..77d3092d 100644
--- a/openssl/crypto/asn1/tasn_fre.c
+++ b/main/openssl/crypto/asn1/tasn_fre.c
diff --git a/openssl/crypto/asn1/tasn_new.c b/main/openssl/crypto/asn1/tasn_new.c
index 0d9e78cc..0d9e78cc 100644
--- a/openssl/crypto/asn1/tasn_new.c
+++ b/main/openssl/crypto/asn1/tasn_new.c
diff --git a/openssl/crypto/asn1/tasn_prn.c b/main/openssl/crypto/asn1/tasn_prn.c
index 45369801..45369801 100644
--- a/openssl/crypto/asn1/tasn_prn.c
+++ b/main/openssl/crypto/asn1/tasn_prn.c
diff --git a/openssl/crypto/asn1/tasn_typ.c b/main/openssl/crypto/asn1/tasn_typ.c
index 6fb1c372..6fb1c372 100644
--- a/openssl/crypto/asn1/tasn_typ.c
+++ b/main/openssl/crypto/asn1/tasn_typ.c
diff --git a/openssl/crypto/asn1/tasn_utl.c b/main/openssl/crypto/asn1/tasn_utl.c
index ca9ec7a3..ca9ec7a3 100644
--- a/openssl/crypto/asn1/tasn_utl.c
+++ b/main/openssl/crypto/asn1/tasn_utl.c
diff --git a/openssl/crypto/asn1/x_algor.c b/main/openssl/crypto/asn1/x_algor.c
index 99e53429..99e53429 100644
--- a/openssl/crypto/asn1/x_algor.c
+++ b/main/openssl/crypto/asn1/x_algor.c
diff --git a/openssl/crypto/asn1/x_attrib.c b/main/openssl/crypto/asn1/x_attrib.c
index 1e3713f1..1e3713f1 100644
--- a/openssl/crypto/asn1/x_attrib.c
+++ b/main/openssl/crypto/asn1/x_attrib.c
diff --git a/openssl/crypto/asn1/x_bignum.c b/main/openssl/crypto/asn1/x_bignum.c
index 9cf3204a..9cf3204a 100644
--- a/openssl/crypto/asn1/x_bignum.c
+++ b/main/openssl/crypto/asn1/x_bignum.c
diff --git a/openssl/crypto/asn1/x_crl.c b/main/openssl/crypto/asn1/x_crl.c
index c51c690b..c51c690b 100644
--- a/openssl/crypto/asn1/x_crl.c
+++ b/main/openssl/crypto/asn1/x_crl.c
diff --git a/openssl/crypto/asn1/x_exten.c b/main/openssl/crypto/asn1/x_exten.c
index 3a212399..3a212399 100644
--- a/openssl/crypto/asn1/x_exten.c
+++ b/main/openssl/crypto/asn1/x_exten.c
diff --git a/openssl/crypto/asn1/x_info.c b/main/openssl/crypto/asn1/x_info.c
index d44f6cdb..d44f6cdb 100644
--- a/openssl/crypto/asn1/x_info.c
+++ b/main/openssl/crypto/asn1/x_info.c
diff --git a/openssl/crypto/asn1/x_long.c b/main/openssl/crypto/asn1/x_long.c
index 75317418..75317418 100644
--- a/openssl/crypto/asn1/x_long.c
+++ b/main/openssl/crypto/asn1/x_long.c
diff --git a/openssl/crypto/asn1/x_name.c b/main/openssl/crypto/asn1/x_name.c
index 49be08b4..49be08b4 100644
--- a/openssl/crypto/asn1/x_name.c
+++ b/main/openssl/crypto/asn1/x_name.c
diff --git a/openssl/crypto/asn1/x_nx509.c b/main/openssl/crypto/asn1/x_nx509.c
index fbd9a22d..fbd9a22d 100644
--- a/openssl/crypto/asn1/x_nx509.c
+++ b/main/openssl/crypto/asn1/x_nx509.c
diff --git a/openssl/crypto/asn1/x_pkey.c b/main/openssl/crypto/asn1/x_pkey.c
index 84536184..84536184 100644
--- a/openssl/crypto/asn1/x_pkey.c
+++ b/main/openssl/crypto/asn1/x_pkey.c
diff --git a/openssl/crypto/asn1/x_pubkey.c b/main/openssl/crypto/asn1/x_pubkey.c
index d42b6a2c..d42b6a2c 100644
--- a/openssl/crypto/asn1/x_pubkey.c
+++ b/main/openssl/crypto/asn1/x_pubkey.c
diff --git a/openssl/crypto/asn1/x_req.c b/main/openssl/crypto/asn1/x_req.c
index d5755582..d5755582 100644
--- a/openssl/crypto/asn1/x_req.c
+++ b/main/openssl/crypto/asn1/x_req.c
diff --git a/openssl/crypto/asn1/x_sig.c b/main/openssl/crypto/asn1/x_sig.c
index 42efa86c..42efa86c 100644
--- a/openssl/crypto/asn1/x_sig.c
+++ b/main/openssl/crypto/asn1/x_sig.c
diff --git a/openssl/crypto/asn1/x_spki.c b/main/openssl/crypto/asn1/x_spki.c
index 2aece077..2aece077 100644
--- a/openssl/crypto/asn1/x_spki.c
+++ b/main/openssl/crypto/asn1/x_spki.c
diff --git a/openssl/crypto/asn1/x_val.c b/main/openssl/crypto/asn1/x_val.c
index dc17c677..dc17c677 100644
--- a/openssl/crypto/asn1/x_val.c
+++ b/main/openssl/crypto/asn1/x_val.c
diff --git a/openssl/crypto/asn1/x_x509.c b/main/openssl/crypto/asn1/x_x509.c
index de3df9eb..de3df9eb 100644
--- a/openssl/crypto/asn1/x_x509.c
+++ b/main/openssl/crypto/asn1/x_x509.c
diff --git a/openssl/crypto/asn1/x_x509a.c b/main/openssl/crypto/asn1/x_x509a.c
index b603f82d..b603f82d 100644
--- a/openssl/crypto/asn1/x_x509a.c
+++ b/main/openssl/crypto/asn1/x_x509a.c
diff --git a/openssl/crypto/bf/COPYRIGHT b/main/openssl/crypto/bf/COPYRIGHT
index 68572235..68572235 100644
--- a/openssl/crypto/bf/COPYRIGHT
+++ b/main/openssl/crypto/bf/COPYRIGHT
diff --git a/openssl/crypto/bf/asm/bf-586.pl b/main/openssl/crypto/bf/asm/bf-586.pl
index b74cfbaf..b74cfbaf 100644
--- a/openssl/crypto/bf/asm/bf-586.pl
+++ b/main/openssl/crypto/bf/asm/bf-586.pl
diff --git a/openssl/crypto/bf/asm/bf-686.pl b/main/openssl/crypto/bf/asm/bf-686.pl
index 8e4c25f5..8e4c25f5 100644
--- a/openssl/crypto/bf/asm/bf-686.pl
+++ b/main/openssl/crypto/bf/asm/bf-686.pl
diff --git a/openssl/crypto/bf/bf_cfb64.c b/main/openssl/crypto/bf/bf_cfb64.c
index 6451c8d4..6451c8d4 100644
--- a/openssl/crypto/bf/bf_cfb64.c
+++ b/main/openssl/crypto/bf/bf_cfb64.c
diff --git a/openssl/crypto/bf/bf_ecb.c b/main/openssl/crypto/bf/bf_ecb.c
index 1607cefa..1607cefa 100644
--- a/openssl/crypto/bf/bf_ecb.c
+++ b/main/openssl/crypto/bf/bf_ecb.c
diff --git a/openssl/crypto/bf/bf_enc.c b/main/openssl/crypto/bf/bf_enc.c
index 2d21d09f..2d21d09f 100644
--- a/openssl/crypto/bf/bf_enc.c
+++ b/main/openssl/crypto/bf/bf_enc.c
diff --git a/openssl/crypto/bf/bf_locl.h b/main/openssl/crypto/bf/bf_locl.h
index cc7c3ec9..cc7c3ec9 100644
--- a/openssl/crypto/bf/bf_locl.h
+++ b/main/openssl/crypto/bf/bf_locl.h
diff --git a/openssl/crypto/bf/bf_ofb64.c b/main/openssl/crypto/bf/bf_ofb64.c
index f2a9ff6e..f2a9ff6e 100644
--- a/openssl/crypto/bf/bf_ofb64.c
+++ b/main/openssl/crypto/bf/bf_ofb64.c
diff --git a/openssl/crypto/bf/bf_pi.h b/main/openssl/crypto/bf/bf_pi.h
index 9949513c..9949513c 100644
--- a/openssl/crypto/bf/bf_pi.h
+++ b/main/openssl/crypto/bf/bf_pi.h
diff --git a/openssl/crypto/bf/bf_skey.c b/main/openssl/crypto/bf/bf_skey.c
index 3673cdee..3673cdee 100644
--- a/openssl/crypto/bf/bf_skey.c
+++ b/main/openssl/crypto/bf/bf_skey.c
diff --git a/openssl/crypto/bf/blowfish.h b/main/openssl/crypto/bf/blowfish.h
index b97e76f9..b97e76f9 100644
--- a/openssl/crypto/bf/blowfish.h
+++ b/main/openssl/crypto/bf/blowfish.h
diff --git a/openssl/crypto/bio/b_dump.c b/main/openssl/crypto/bio/b_dump.c
index c80ecc42..c80ecc42 100644
--- a/openssl/crypto/bio/b_dump.c
+++ b/main/openssl/crypto/bio/b_dump.c
diff --git a/openssl/crypto/bio/b_print.c b/main/openssl/crypto/bio/b_print.c
index 143a7cfe..143a7cfe 100644
--- a/openssl/crypto/bio/b_print.c
+++ b/main/openssl/crypto/bio/b_print.c
diff --git a/openssl/crypto/bio/b_sock.c b/main/openssl/crypto/bio/b_sock.c
index d47310d6..d47310d6 100644
--- a/openssl/crypto/bio/b_sock.c
+++ b/main/openssl/crypto/bio/b_sock.c
diff --git a/openssl/crypto/bio/bf_buff.c b/main/openssl/crypto/bio/bf_buff.c
index c1fd75aa..c1fd75aa 100644
--- a/openssl/crypto/bio/bf_buff.c
+++ b/main/openssl/crypto/bio/bf_buff.c
diff --git a/openssl/crypto/bio/bf_lbuf.c b/main/openssl/crypto/bio/bf_lbuf.c
index ec0f7eb0..ec0f7eb0 100644
--- a/openssl/crypto/bio/bf_lbuf.c
+++ b/main/openssl/crypto/bio/bf_lbuf.c
diff --git a/openssl/crypto/bio/bf_nbio.c b/main/openssl/crypto/bio/bf_nbio.c
index 028616c0..028616c0 100644
--- a/openssl/crypto/bio/bf_nbio.c
+++ b/main/openssl/crypto/bio/bf_nbio.c
diff --git a/openssl/crypto/bio/bf_null.c b/main/openssl/crypto/bio/bf_null.c
index c1bf39a9..c1bf39a9 100644
--- a/openssl/crypto/bio/bf_null.c
+++ b/main/openssl/crypto/bio/bf_null.c
diff --git a/openssl/crypto/bio/bio.h b/main/openssl/crypto/bio/bio.h
index 152802fb..152802fb 100644
--- a/openssl/crypto/bio/bio.h
+++ b/main/openssl/crypto/bio/bio.h
diff --git a/openssl/crypto/bio/bio_cb.c b/main/openssl/crypto/bio/bio_cb.c
index 9bcbc321..9bcbc321 100644
--- a/openssl/crypto/bio/bio_cb.c
+++ b/main/openssl/crypto/bio/bio_cb.c
diff --git a/openssl/crypto/bio/bio_err.c b/main/openssl/crypto/bio/bio_err.c
index a224edd5..a224edd5 100644
--- a/openssl/crypto/bio/bio_err.c
+++ b/main/openssl/crypto/bio/bio_err.c
diff --git a/openssl/crypto/bio/bio_lcl.h b/main/openssl/crypto/bio/bio_lcl.h
index e7f7ec8d..e7f7ec8d 100644
--- a/openssl/crypto/bio/bio_lcl.h
+++ b/main/openssl/crypto/bio/bio_lcl.h
diff --git a/openssl/crypto/bio/bio_lib.c b/main/openssl/crypto/bio/bio_lib.c
index e12bc3a2..e12bc3a2 100644
--- a/openssl/crypto/bio/bio_lib.c
+++ b/main/openssl/crypto/bio/bio_lib.c
diff --git a/openssl/crypto/bio/bss_acpt.c b/main/openssl/crypto/bio/bss_acpt.c
index 5d49e1a7..5d49e1a7 100644
--- a/openssl/crypto/bio/bss_acpt.c
+++ b/main/openssl/crypto/bio/bss_acpt.c
diff --git a/openssl/crypto/bio/bss_bio.c b/main/openssl/crypto/bio/bss_bio.c
index 76bd48e7..76bd48e7 100644
--- a/openssl/crypto/bio/bss_bio.c
+++ b/main/openssl/crypto/bio/bss_bio.c
diff --git a/openssl/crypto/bio/bss_conn.c b/main/openssl/crypto/bio/bss_conn.c
index c1472785..c1472785 100644
--- a/openssl/crypto/bio/bss_conn.c
+++ b/main/openssl/crypto/bio/bss_conn.c
diff --git a/openssl/crypto/bio/bss_dgram.c b/main/openssl/crypto/bio/bss_dgram.c
index 71ebe987..71ebe987 100644
--- a/openssl/crypto/bio/bss_dgram.c
+++ b/main/openssl/crypto/bio/bss_dgram.c
diff --git a/openssl/crypto/bio/bss_fd.c b/main/openssl/crypto/bio/bss_fd.c
index d1bf85aa..d1bf85aa 100644
--- a/openssl/crypto/bio/bss_fd.c
+++ b/main/openssl/crypto/bio/bss_fd.c
diff --git a/openssl/crypto/bio/bss_file.c b/main/openssl/crypto/bio/bss_file.c
index b954fe7e..b954fe7e 100644
--- a/openssl/crypto/bio/bss_file.c
+++ b/main/openssl/crypto/bio/bss_file.c
diff --git a/openssl/crypto/bio/bss_log.c b/main/openssl/crypto/bio/bss_log.c
index b7dce5c1..b7dce5c1 100644
--- a/openssl/crypto/bio/bss_log.c
+++ b/main/openssl/crypto/bio/bss_log.c
diff --git a/openssl/crypto/bio/bss_mem.c b/main/openssl/crypto/bio/bss_mem.c
index 37d4194e..37d4194e 100644
--- a/openssl/crypto/bio/bss_mem.c
+++ b/main/openssl/crypto/bio/bss_mem.c
diff --git a/openssl/crypto/bio/bss_null.c b/main/openssl/crypto/bio/bss_null.c
index 46b73339..46b73339 100644
--- a/openssl/crypto/bio/bss_null.c
+++ b/main/openssl/crypto/bio/bss_null.c
diff --git a/openssl/crypto/bio/bss_sock.c b/main/openssl/crypto/bio/bss_sock.c
index 3df31938..3df31938 100644
--- a/openssl/crypto/bio/bss_sock.c
+++ b/main/openssl/crypto/bio/bss_sock.c
diff --git a/openssl/crypto/bn/asm/README b/main/openssl/crypto/bn/asm/README
index b0f3a68a..b0f3a68a 100644
--- a/openssl/crypto/bn/asm/README
+++ b/main/openssl/crypto/bn/asm/README
diff --git a/openssl/crypto/bn/asm/alpha-mont.pl b/main/openssl/crypto/bn/asm/alpha-mont.pl
index 03596e20..03596e20 100644
--- a/openssl/crypto/bn/asm/alpha-mont.pl
+++ b/main/openssl/crypto/bn/asm/alpha-mont.pl
diff --git a/openssl/crypto/bn/asm/armv4-mont.pl b/main/openssl/crypto/bn/asm/armv4-mont.pl
index 14e0d2d1..14e0d2d1 100644
--- a/openssl/crypto/bn/asm/armv4-mont.pl
+++ b/main/openssl/crypto/bn/asm/armv4-mont.pl
diff --git a/openssl/crypto/bn/asm/armv4-mont.s b/main/openssl/crypto/bn/asm/armv4-mont.s
index 0488455f..0488455f 100644
--- a/openssl/crypto/bn/asm/armv4-mont.s
+++ b/main/openssl/crypto/bn/asm/armv4-mont.s
diff --git a/openssl/crypto/bn/asm/bn-586.pl b/main/openssl/crypto/bn/asm/bn-586.pl
index 332ef3e9..332ef3e9 100644
--- a/openssl/crypto/bn/asm/bn-586.pl
+++ b/main/openssl/crypto/bn/asm/bn-586.pl
diff --git a/openssl/crypto/bn/asm/co-586.pl b/main/openssl/crypto/bn/asm/co-586.pl
index 57101a6b..57101a6b 100644
--- a/openssl/crypto/bn/asm/co-586.pl
+++ b/main/openssl/crypto/bn/asm/co-586.pl
diff --git a/openssl/crypto/bn/asm/ia64.S b/main/openssl/crypto/bn/asm/ia64.S
index 951abc53..951abc53 100644
--- a/openssl/crypto/bn/asm/ia64.S
+++ b/main/openssl/crypto/bn/asm/ia64.S
diff --git a/openssl/crypto/bn/asm/mips3-mont.pl b/main/openssl/crypto/bn/asm/mips3-mont.pl
index 8f9156e0..8f9156e0 100644
--- a/openssl/crypto/bn/asm/mips3-mont.pl
+++ b/main/openssl/crypto/bn/asm/mips3-mont.pl
diff --git a/openssl/crypto/bn/asm/mips3.s b/main/openssl/crypto/bn/asm/mips3.s
index dca4105c..dca4105c 100644
--- a/openssl/crypto/bn/asm/mips3.s
+++ b/main/openssl/crypto/bn/asm/mips3.s
diff --git a/openssl/crypto/bn/asm/pa-risc2.s b/main/openssl/crypto/bn/asm/pa-risc2.s
index f3b16290..f3b16290 100644
--- a/openssl/crypto/bn/asm/pa-risc2.s
+++ b/main/openssl/crypto/bn/asm/pa-risc2.s
diff --git a/openssl/crypto/bn/asm/pa-risc2W.s b/main/openssl/crypto/bn/asm/pa-risc2W.s
index a9954575..a9954575 100644
--- a/openssl/crypto/bn/asm/pa-risc2W.s
+++ b/main/openssl/crypto/bn/asm/pa-risc2W.s
diff --git a/openssl/crypto/bn/asm/ppc-mont.pl b/main/openssl/crypto/bn/asm/ppc-mont.pl
index 7849eae9..7849eae9 100644
--- a/openssl/crypto/bn/asm/ppc-mont.pl
+++ b/main/openssl/crypto/bn/asm/ppc-mont.pl
diff --git a/openssl/crypto/bn/asm/ppc.pl b/main/openssl/crypto/bn/asm/ppc.pl
index 37c65d35..37c65d35 100644
--- a/openssl/crypto/bn/asm/ppc.pl
+++ b/main/openssl/crypto/bn/asm/ppc.pl
diff --git a/openssl/crypto/bn/asm/ppc64-mont.pl b/main/openssl/crypto/bn/asm/ppc64-mont.pl
index 3449b358..3449b358 100644
--- a/openssl/crypto/bn/asm/ppc64-mont.pl
+++ b/main/openssl/crypto/bn/asm/ppc64-mont.pl
diff --git a/openssl/crypto/bn/asm/s390x-mont.pl b/main/openssl/crypto/bn/asm/s390x-mont.pl
index f61246f5..f61246f5 100644
--- a/openssl/crypto/bn/asm/s390x-mont.pl
+++ b/main/openssl/crypto/bn/asm/s390x-mont.pl
diff --git a/openssl/crypto/bn/asm/s390x.S b/main/openssl/crypto/bn/asm/s390x.S
index 43fcb79b..43fcb79b 100755
--- a/openssl/crypto/bn/asm/s390x.S
+++ b/main/openssl/crypto/bn/asm/s390x.S
diff --git a/openssl/crypto/bn/asm/sparcv8.S b/main/openssl/crypto/bn/asm/sparcv8.S
index 88c5dc48..88c5dc48 100644
--- a/openssl/crypto/bn/asm/sparcv8.S
+++ b/main/openssl/crypto/bn/asm/sparcv8.S
diff --git a/openssl/crypto/bn/asm/sparcv8plus.S b/main/openssl/crypto/bn/asm/sparcv8plus.S
index 63de1860..63de1860 100644
--- a/openssl/crypto/bn/asm/sparcv8plus.S
+++ b/main/openssl/crypto/bn/asm/sparcv8plus.S
diff --git a/openssl/crypto/bn/asm/sparcv9-mont.pl b/main/openssl/crypto/bn/asm/sparcv9-mont.pl
index b8fb1e8a..b8fb1e8a 100644
--- a/openssl/crypto/bn/asm/sparcv9-mont.pl
+++ b/main/openssl/crypto/bn/asm/sparcv9-mont.pl
diff --git a/openssl/crypto/bn/asm/sparcv9a-mont.pl b/main/openssl/crypto/bn/asm/sparcv9a-mont.pl
index a14205f2..a14205f2 100755
--- a/openssl/crypto/bn/asm/sparcv9a-mont.pl
+++ b/main/openssl/crypto/bn/asm/sparcv9a-mont.pl
diff --git a/openssl/crypto/bn/asm/via-mont.pl b/main/openssl/crypto/bn/asm/via-mont.pl
index c046a514..c046a514 100644
--- a/openssl/crypto/bn/asm/via-mont.pl
+++ b/main/openssl/crypto/bn/asm/via-mont.pl
diff --git a/openssl/crypto/bn/asm/x86-mont.pl b/main/openssl/crypto/bn/asm/x86-mont.pl
index 5cd3cd2e..5cd3cd2e 100755
--- a/openssl/crypto/bn/asm/x86-mont.pl
+++ b/main/openssl/crypto/bn/asm/x86-mont.pl
diff --git a/openssl/crypto/bn/asm/x86.pl b/main/openssl/crypto/bn/asm/x86.pl
index 1bc4f1bb..1bc4f1bb 100644
--- a/openssl/crypto/bn/asm/x86.pl
+++ b/main/openssl/crypto/bn/asm/x86.pl
diff --git a/openssl/crypto/bn/asm/x86/add.pl b/main/openssl/crypto/bn/asm/x86/add.pl
index 0b5cf583..0b5cf583 100644
--- a/openssl/crypto/bn/asm/x86/add.pl
+++ b/main/openssl/crypto/bn/asm/x86/add.pl
diff --git a/openssl/crypto/bn/asm/x86/comba.pl b/main/openssl/crypto/bn/asm/x86/comba.pl
index 22912536..22912536 100644
--- a/openssl/crypto/bn/asm/x86/comba.pl
+++ b/main/openssl/crypto/bn/asm/x86/comba.pl
diff --git a/openssl/crypto/bn/asm/x86/div.pl b/main/openssl/crypto/bn/asm/x86/div.pl
index 0e90152c..0e90152c 100644
--- a/openssl/crypto/bn/asm/x86/div.pl
+++ b/main/openssl/crypto/bn/asm/x86/div.pl
diff --git a/openssl/crypto/bn/asm/x86/f b/main/openssl/crypto/bn/asm/x86/f
index 22e41122..22e41122 100644
--- a/openssl/crypto/bn/asm/x86/f
+++ b/main/openssl/crypto/bn/asm/x86/f
diff --git a/openssl/crypto/bn/asm/x86/mul.pl b/main/openssl/crypto/bn/asm/x86/mul.pl
index 674cb9b0..674cb9b0 100644
--- a/openssl/crypto/bn/asm/x86/mul.pl
+++ b/main/openssl/crypto/bn/asm/x86/mul.pl
diff --git a/openssl/crypto/bn/asm/x86/mul_add.pl b/main/openssl/crypto/bn/asm/x86/mul_add.pl
index 61830d3a..61830d3a 100644
--- a/openssl/crypto/bn/asm/x86/mul_add.pl
+++ b/main/openssl/crypto/bn/asm/x86/mul_add.pl
diff --git a/openssl/crypto/bn/asm/x86/sqr.pl b/main/openssl/crypto/bn/asm/x86/sqr.pl
index 1f90993c..1f90993c 100644
--- a/openssl/crypto/bn/asm/x86/sqr.pl
+++ b/main/openssl/crypto/bn/asm/x86/sqr.pl
diff --git a/openssl/crypto/bn/asm/x86/sub.pl b/main/openssl/crypto/bn/asm/x86/sub.pl
index 837b0e1b..837b0e1b 100644
--- a/openssl/crypto/bn/asm/x86/sub.pl
+++ b/main/openssl/crypto/bn/asm/x86/sub.pl
diff --git a/openssl/crypto/bn/asm/x86_64-gcc.c b/main/openssl/crypto/bn/asm/x86_64-gcc.c
index acb0b401..acb0b401 100644
--- a/openssl/crypto/bn/asm/x86_64-gcc.c
+++ b/main/openssl/crypto/bn/asm/x86_64-gcc.c
diff --git a/openssl/crypto/bn/asm/x86_64-mont.pl b/main/openssl/crypto/bn/asm/x86_64-mont.pl
index 3b7a6f24..3b7a6f24 100755
--- a/openssl/crypto/bn/asm/x86_64-mont.pl
+++ b/main/openssl/crypto/bn/asm/x86_64-mont.pl
diff --git a/openssl/crypto/bn/bn.h b/main/openssl/crypto/bn/bn.h
index a0bc4783..a0bc4783 100644
--- a/openssl/crypto/bn/bn.h
+++ b/main/openssl/crypto/bn/bn.h
diff --git a/openssl/crypto/bn/bn.mul b/main/openssl/crypto/bn/bn.mul
index 9728870d..9728870d 100644
--- a/openssl/crypto/bn/bn.mul
+++ b/main/openssl/crypto/bn/bn.mul
diff --git a/openssl/crypto/bn/bn_add.c b/main/openssl/crypto/bn/bn_add.c
index 94051637..94051637 100644
--- a/openssl/crypto/bn/bn_add.c
+++ b/main/openssl/crypto/bn/bn_add.c
diff --git a/openssl/crypto/bn/bn_asm.c b/main/openssl/crypto/bn/bn_asm.c
index c43c91cc..c43c91cc 100644
--- a/openssl/crypto/bn/bn_asm.c
+++ b/main/openssl/crypto/bn/bn_asm.c
diff --git a/openssl/crypto/bn/bn_blind.c b/main/openssl/crypto/bn/bn_blind.c
index e060592f..e060592f 100644
--- a/openssl/crypto/bn/bn_blind.c
+++ b/main/openssl/crypto/bn/bn_blind.c
diff --git a/openssl/crypto/bn/bn_const.c b/main/openssl/crypto/bn/bn_const.c
index eb60a25b..eb60a25b 100755
--- a/openssl/crypto/bn/bn_const.c
+++ b/main/openssl/crypto/bn/bn_const.c
diff --git a/openssl/crypto/bn/bn_ctx.c b/main/openssl/crypto/bn/bn_ctx.c
index 3f2256f6..3f2256f6 100644
--- a/openssl/crypto/bn/bn_ctx.c
+++ b/main/openssl/crypto/bn/bn_ctx.c
diff --git a/openssl/crypto/bn/bn_depr.c b/main/openssl/crypto/bn/bn_depr.c
index 27535e4f..27535e4f 100644
--- a/openssl/crypto/bn/bn_depr.c
+++ b/main/openssl/crypto/bn/bn_depr.c
diff --git a/openssl/crypto/bn/bn_div.c b/main/openssl/crypto/bn/bn_div.c
index 802a43d6..802a43d6 100644
--- a/openssl/crypto/bn/bn_div.c
+++ b/main/openssl/crypto/bn/bn_div.c
diff --git a/openssl/crypto/bn/bn_err.c b/main/openssl/crypto/bn/bn_err.c
index cfe2eb94..cfe2eb94 100644
--- a/openssl/crypto/bn/bn_err.c
+++ b/main/openssl/crypto/bn/bn_err.c
diff --git a/openssl/crypto/bn/bn_exp.c b/main/openssl/crypto/bn/bn_exp.c
index d9b6c737..d9b6c737 100644
--- a/openssl/crypto/bn/bn_exp.c
+++ b/main/openssl/crypto/bn/bn_exp.c
diff --git a/openssl/crypto/bn/bn_exp2.c b/main/openssl/crypto/bn/bn_exp2.c
index bd0c34b9..bd0c34b9 100644
--- a/openssl/crypto/bn/bn_exp2.c
+++ b/main/openssl/crypto/bn/bn_exp2.c
diff --git a/openssl/crypto/bn/bn_gcd.c b/main/openssl/crypto/bn/bn_gcd.c
index 4a352119..4a352119 100644
--- a/openssl/crypto/bn/bn_gcd.c
+++ b/main/openssl/crypto/bn/bn_gcd.c
diff --git a/openssl/crypto/bn/bn_gf2m.c b/main/openssl/crypto/bn/bn_gf2m.c
index 432a3aa3..432a3aa3 100644
--- a/openssl/crypto/bn/bn_gf2m.c
+++ b/main/openssl/crypto/bn/bn_gf2m.c
diff --git a/openssl/crypto/bn/bn_kron.c b/main/openssl/crypto/bn/bn_kron.c
index 740359b7..740359b7 100644
--- a/openssl/crypto/bn/bn_kron.c
+++ b/main/openssl/crypto/bn/bn_kron.c
diff --git a/openssl/crypto/bn/bn_lcl.h b/main/openssl/crypto/bn/bn_lcl.h
index 8e5e98e3..8e5e98e3 100644
--- a/openssl/crypto/bn/bn_lcl.h
+++ b/main/openssl/crypto/bn/bn_lcl.h
diff --git a/openssl/crypto/bn/bn_lib.c b/main/openssl/crypto/bn/bn_lib.c
index 5470fbe6..5470fbe6 100644
--- a/openssl/crypto/bn/bn_lib.c
+++ b/main/openssl/crypto/bn/bn_lib.c
diff --git a/openssl/crypto/bn/bn_mod.c b/main/openssl/crypto/bn/bn_mod.c
index 77d6ddb9..77d6ddb9 100644
--- a/openssl/crypto/bn/bn_mod.c
+++ b/main/openssl/crypto/bn/bn_mod.c
diff --git a/openssl/crypto/bn/bn_mont.c b/main/openssl/crypto/bn/bn_mont.c
index 1a866880..1a866880 100644
--- a/openssl/crypto/bn/bn_mont.c
+++ b/main/openssl/crypto/bn/bn_mont.c
diff --git a/openssl/crypto/bn/bn_mpi.c b/main/openssl/crypto/bn/bn_mpi.c
index a054d21a..a054d21a 100644
--- a/openssl/crypto/bn/bn_mpi.c
+++ b/main/openssl/crypto/bn/bn_mpi.c
diff --git a/openssl/crypto/bn/bn_mul.c b/main/openssl/crypto/bn/bn_mul.c
index 12e5be80..12e5be80 100644
--- a/openssl/crypto/bn/bn_mul.c
+++ b/main/openssl/crypto/bn/bn_mul.c
diff --git a/openssl/crypto/bn/bn_nist.c b/main/openssl/crypto/bn/bn_nist.c
index c6de0326..c6de0326 100644
--- a/openssl/crypto/bn/bn_nist.c
+++ b/main/openssl/crypto/bn/bn_nist.c
diff --git a/openssl/crypto/bn/bn_prime.c b/main/openssl/crypto/bn/bn_prime.c
index 7b25979d..7b25979d 100644
--- a/openssl/crypto/bn/bn_prime.c
+++ b/main/openssl/crypto/bn/bn_prime.c
diff --git a/openssl/crypto/bn/bn_prime.h b/main/openssl/crypto/bn/bn_prime.h
index 51d2194f..51d2194f 100644
--- a/openssl/crypto/bn/bn_prime.h
+++ b/main/openssl/crypto/bn/bn_prime.h
diff --git a/openssl/crypto/bn/bn_prime.pl b/main/openssl/crypto/bn/bn_prime.pl
index 3fafb6f3..3fafb6f3 100644
--- a/openssl/crypto/bn/bn_prime.pl
+++ b/main/openssl/crypto/bn/bn_prime.pl
diff --git a/openssl/crypto/bn/bn_print.c b/main/openssl/crypto/bn/bn_print.c
index bebb466d..bebb466d 100644
--- a/openssl/crypto/bn/bn_print.c
+++ b/main/openssl/crypto/bn/bn_print.c
diff --git a/openssl/crypto/bn/bn_rand.c b/main/openssl/crypto/bn/bn_rand.c
index b376c28f..b376c28f 100644
--- a/openssl/crypto/bn/bn_rand.c
+++ b/main/openssl/crypto/bn/bn_rand.c
diff --git a/openssl/crypto/bn/bn_recp.c b/main/openssl/crypto/bn/bn_recp.c
index 2e8efb8d..2e8efb8d 100644
--- a/openssl/crypto/bn/bn_recp.c
+++ b/main/openssl/crypto/bn/bn_recp.c
diff --git a/openssl/crypto/bn/bn_shift.c b/main/openssl/crypto/bn/bn_shift.c
index c4d301af..c4d301af 100644
--- a/openssl/crypto/bn/bn_shift.c
+++ b/main/openssl/crypto/bn/bn_shift.c
diff --git a/openssl/crypto/bn/bn_sqr.c b/main/openssl/crypto/bn/bn_sqr.c
index 270d0cd3..270d0cd3 100644
--- a/openssl/crypto/bn/bn_sqr.c
+++ b/main/openssl/crypto/bn/bn_sqr.c
diff --git a/openssl/crypto/bn/bn_sqrt.c b/main/openssl/crypto/bn/bn_sqrt.c
index 6beaf9e5..6beaf9e5 100644
--- a/openssl/crypto/bn/bn_sqrt.c
+++ b/main/openssl/crypto/bn/bn_sqrt.c
diff --git a/openssl/crypto/bn/bn_word.c b/main/openssl/crypto/bn/bn_word.c
index ee7b87c4..ee7b87c4 100644
--- a/openssl/crypto/bn/bn_word.c
+++ b/main/openssl/crypto/bn/bn_word.c
diff --git a/openssl/crypto/bn/bnspeed.c b/main/openssl/crypto/bn/bnspeed.c
index b554ac8c..b554ac8c 100644
--- a/openssl/crypto/bn/bnspeed.c
+++ b/main/openssl/crypto/bn/bnspeed.c
diff --git a/openssl/crypto/bn/bntest.c b/main/openssl/crypto/bn/bntest.c
index 0cd99c5b..0cd99c5b 100644
--- a/openssl/crypto/bn/bntest.c
+++ b/main/openssl/crypto/bn/bntest.c
diff --git a/openssl/crypto/bn/divtest.c b/main/openssl/crypto/bn/divtest.c
index d3fc688f..d3fc688f 100644
--- a/openssl/crypto/bn/divtest.c
+++ b/main/openssl/crypto/bn/divtest.c
diff --git a/openssl/crypto/bn/exp.c b/main/openssl/crypto/bn/exp.c
index 4865b0ef..4865b0ef 100644
--- a/openssl/crypto/bn/exp.c
+++ b/main/openssl/crypto/bn/exp.c
diff --git a/openssl/crypto/bn/expspeed.c b/main/openssl/crypto/bn/expspeed.c
index 4d5f221f..4d5f221f 100644
--- a/openssl/crypto/bn/expspeed.c
+++ b/main/openssl/crypto/bn/expspeed.c
diff --git a/openssl/crypto/bn/exptest.c b/main/openssl/crypto/bn/exptest.c
index 074a8e88..074a8e88 100644
--- a/openssl/crypto/bn/exptest.c
+++ b/main/openssl/crypto/bn/exptest.c
diff --git a/openssl/crypto/bn/todo b/main/openssl/crypto/bn/todo
index e47e381a..e47e381a 100644
--- a/openssl/crypto/bn/todo
+++ b/main/openssl/crypto/bn/todo
diff --git a/openssl/crypto/buffer/buf_err.c b/main/openssl/crypto/buffer/buf_err.c
index 8f1de619..8f1de619 100644
--- a/openssl/crypto/buffer/buf_err.c
+++ b/main/openssl/crypto/buffer/buf_err.c
diff --git a/openssl/crypto/buffer/buffer.c b/main/openssl/crypto/buffer/buffer.c
index 620ea8d5..620ea8d5 100644
--- a/openssl/crypto/buffer/buffer.c
+++ b/main/openssl/crypto/buffer/buffer.c
diff --git a/openssl/crypto/buffer/buffer.h b/main/openssl/crypto/buffer/buffer.h
index 178e4182..178e4182 100644
--- a/openssl/crypto/buffer/buffer.h
+++ b/main/openssl/crypto/buffer/buffer.h
diff --git a/openssl/crypto/comp/c_rle.c b/main/openssl/crypto/comp/c_rle.c
index 18bceae5..18bceae5 100644
--- a/openssl/crypto/comp/c_rle.c
+++ b/main/openssl/crypto/comp/c_rle.c
diff --git a/openssl/crypto/comp/c_zlib.c b/main/openssl/crypto/comp/c_zlib.c
index 8adf35f3..8adf35f3 100644
--- a/openssl/crypto/comp/c_zlib.c
+++ b/main/openssl/crypto/comp/c_zlib.c
diff --git a/openssl/crypto/comp/comp.h b/main/openssl/crypto/comp/comp.h
index 4b405c7d..4b405c7d 100644
--- a/openssl/crypto/comp/comp.h
+++ b/main/openssl/crypto/comp/comp.h
diff --git a/openssl/crypto/comp/comp_err.c b/main/openssl/crypto/comp/comp_err.c
index 661c94c3..661c94c3 100644
--- a/openssl/crypto/comp/comp_err.c
+++ b/main/openssl/crypto/comp/comp_err.c
diff --git a/openssl/crypto/comp/comp_lib.c b/main/openssl/crypto/comp/comp_lib.c
index b60ae371..b60ae371 100644
--- a/openssl/crypto/comp/comp_lib.c
+++ b/main/openssl/crypto/comp/comp_lib.c
diff --git a/openssl/crypto/conf/README b/main/openssl/crypto/conf/README
index 96e53b34..96e53b34 100644
--- a/openssl/crypto/conf/README
+++ b/main/openssl/crypto/conf/README
diff --git a/openssl/crypto/conf/cnf_save.c b/main/openssl/crypto/conf/cnf_save.c
index 14394875..14394875 100644
--- a/openssl/crypto/conf/cnf_save.c
+++ b/main/openssl/crypto/conf/cnf_save.c
diff --git a/openssl/crypto/conf/conf.h b/main/openssl/crypto/conf/conf.h
index c2199978..c2199978 100644
--- a/openssl/crypto/conf/conf.h
+++ b/main/openssl/crypto/conf/conf.h
diff --git a/openssl/crypto/conf/conf_api.c b/main/openssl/crypto/conf/conf_api.c
index f5fcbb9f..f5fcbb9f 100644
--- a/openssl/crypto/conf/conf_api.c
+++ b/main/openssl/crypto/conf/conf_api.c
diff --git a/openssl/crypto/conf/conf_api.h b/main/openssl/crypto/conf/conf_api.h
index 87a954af..87a954af 100644
--- a/openssl/crypto/conf/conf_api.h
+++ b/main/openssl/crypto/conf/conf_api.h
diff --git a/openssl/crypto/conf/conf_def.c b/main/openssl/crypto/conf/conf_def.c
index cf951320..cf951320 100644
--- a/openssl/crypto/conf/conf_def.c
+++ b/main/openssl/crypto/conf/conf_def.c
diff --git a/openssl/crypto/conf/conf_def.h b/main/openssl/crypto/conf/conf_def.h
index 92a7d8ad..92a7d8ad 100644
--- a/openssl/crypto/conf/conf_def.h
+++ b/main/openssl/crypto/conf/conf_def.h
diff --git a/openssl/crypto/conf/conf_err.c b/main/openssl/crypto/conf/conf_err.c
index 25bb5dc9..25bb5dc9 100644
--- a/openssl/crypto/conf/conf_err.c
+++ b/main/openssl/crypto/conf/conf_err.c
diff --git a/openssl/crypto/conf/conf_lib.c b/main/openssl/crypto/conf/conf_lib.c
index 54046def..54046def 100644
--- a/openssl/crypto/conf/conf_lib.c
+++ b/main/openssl/crypto/conf/conf_lib.c
diff --git a/openssl/crypto/conf/conf_mall.c b/main/openssl/crypto/conf/conf_mall.c
index c6f4cb2d..c6f4cb2d 100644
--- a/openssl/crypto/conf/conf_mall.c
+++ b/main/openssl/crypto/conf/conf_mall.c
diff --git a/openssl/crypto/conf/conf_mod.c b/main/openssl/crypto/conf/conf_mod.c
index df1642a0..df1642a0 100644
--- a/openssl/crypto/conf/conf_mod.c
+++ b/main/openssl/crypto/conf/conf_mod.c
diff --git a/openssl/crypto/conf/conf_sap.c b/main/openssl/crypto/conf/conf_sap.c
index 760dc263..760dc263 100644
--- a/openssl/crypto/conf/conf_sap.c
+++ b/main/openssl/crypto/conf/conf_sap.c
diff --git a/openssl/crypto/conf/keysets.pl b/main/openssl/crypto/conf/keysets.pl
index 50ed67fa..50ed67fa 100644
--- a/openssl/crypto/conf/keysets.pl
+++ b/main/openssl/crypto/conf/keysets.pl
diff --git a/openssl/crypto/conf/ssleay.cnf b/main/openssl/crypto/conf/ssleay.cnf
index ed33af60..ed33af60 100644
--- a/openssl/crypto/conf/ssleay.cnf
+++ b/main/openssl/crypto/conf/ssleay.cnf
diff --git a/openssl/crypto/conf/test.c b/main/openssl/crypto/conf/test.c
index 7fab8505..7fab8505 100644
--- a/openssl/crypto/conf/test.c
+++ b/main/openssl/crypto/conf/test.c
diff --git a/openssl/crypto/cpt_err.c b/main/openssl/crypto/cpt_err.c
index 139b9284..139b9284 100644
--- a/openssl/crypto/cpt_err.c
+++ b/main/openssl/crypto/cpt_err.c
diff --git a/openssl/crypto/cryptlib.c b/main/openssl/crypto/cryptlib.c
index 24fe123e..24fe123e 100644
--- a/openssl/crypto/cryptlib.c
+++ b/main/openssl/crypto/cryptlib.c
diff --git a/openssl/crypto/cryptlib.h b/main/openssl/crypto/cryptlib.h
index fc249c57..fc249c57 100644
--- a/openssl/crypto/cryptlib.h
+++ b/main/openssl/crypto/cryptlib.h
diff --git a/openssl/crypto/crypto.h b/main/openssl/crypto/crypto.h
index b0360cec..b0360cec 100644
--- a/openssl/crypto/crypto.h
+++ b/main/openssl/crypto/crypto.h
diff --git a/openssl/crypto/cversion.c b/main/openssl/crypto/cversion.c
index ea9f25fd..ea9f25fd 100644
--- a/openssl/crypto/cversion.c
+++ b/main/openssl/crypto/cversion.c
diff --git a/openssl/crypto/des/COPYRIGHT b/main/openssl/crypto/des/COPYRIGHT
index 5469e1e4..5469e1e4 100644
--- a/openssl/crypto/des/COPYRIGHT
+++ b/main/openssl/crypto/des/COPYRIGHT
diff --git a/openssl/crypto/des/DES.pm b/main/openssl/crypto/des/DES.pm
index 6a175b6c..6a175b6c 100644
--- a/openssl/crypto/des/DES.pm
+++ b/main/openssl/crypto/des/DES.pm
diff --git a/openssl/crypto/des/DES.xs b/main/openssl/crypto/des/DES.xs
index b8050b9e..b8050b9e 100644
--- a/openssl/crypto/des/DES.xs
+++ b/main/openssl/crypto/des/DES.xs
diff --git a/openssl/crypto/des/FILES0 b/main/openssl/crypto/des/FILES0
index 4c7ea2de..4c7ea2de 100644
--- a/openssl/crypto/des/FILES0
+++ b/main/openssl/crypto/des/FILES0
diff --git a/openssl/crypto/des/INSTALL b/main/openssl/crypto/des/INSTALL
index 8aebdfe1..8aebdfe1 100644
--- a/openssl/crypto/des/INSTALL
+++ b/main/openssl/crypto/des/INSTALL
diff --git a/openssl/crypto/des/Imakefile b/main/openssl/crypto/des/Imakefile
index 1b9b5629..1b9b5629 100644
--- a/openssl/crypto/des/Imakefile
+++ b/main/openssl/crypto/des/Imakefile
diff --git a/openssl/crypto/des/KERBEROS b/main/openssl/crypto/des/KERBEROS
index f401b100..f401b100 100644
--- a/openssl/crypto/des/KERBEROS
+++ b/main/openssl/crypto/des/KERBEROS
diff --git a/openssl/crypto/des/README b/main/openssl/crypto/des/README
index 621a5ab4..621a5ab4 100644
--- a/openssl/crypto/des/README
+++ b/main/openssl/crypto/des/README
diff --git a/openssl/crypto/des/VERSION b/main/openssl/crypto/des/VERSION
index c7d01542..c7d01542 100644
--- a/openssl/crypto/des/VERSION
+++ b/main/openssl/crypto/des/VERSION
diff --git a/openssl/crypto/des/asm/crypt586.pl b/main/openssl/crypto/des/asm/crypt586.pl
index e36f7d44..e36f7d44 100644
--- a/openssl/crypto/des/asm/crypt586.pl
+++ b/main/openssl/crypto/des/asm/crypt586.pl
diff --git a/openssl/crypto/des/asm/des-586.pl b/main/openssl/crypto/des/asm/des-586.pl
index 5b5f39ce..5b5f39ce 100644
--- a/openssl/crypto/des/asm/des-586.pl
+++ b/main/openssl/crypto/des/asm/des-586.pl
diff --git a/openssl/crypto/des/asm/des_enc.m4 b/main/openssl/crypto/des/asm/des_enc.m4
index 32805954..32805954 100644
--- a/openssl/crypto/des/asm/des_enc.m4
+++ b/main/openssl/crypto/des/asm/des_enc.m4
diff --git a/openssl/crypto/des/asm/desboth.pl b/main/openssl/crypto/des/asm/desboth.pl
index eec00886..eec00886 100644
--- a/openssl/crypto/des/asm/desboth.pl
+++ b/main/openssl/crypto/des/asm/desboth.pl
diff --git a/openssl/crypto/des/asm/readme b/main/openssl/crypto/des/asm/readme
index 1beafe25..1beafe25 100644
--- a/openssl/crypto/des/asm/readme
+++ b/main/openssl/crypto/des/asm/readme
diff --git a/openssl/crypto/des/cbc3_enc.c b/main/openssl/crypto/des/cbc3_enc.c
index b5db4e14..b5db4e14 100644
--- a/openssl/crypto/des/cbc3_enc.c
+++ b/main/openssl/crypto/des/cbc3_enc.c
diff --git a/openssl/crypto/des/cbc_cksm.c b/main/openssl/crypto/des/cbc_cksm.c
index 09a7ba56..09a7ba56 100644
--- a/openssl/crypto/des/cbc_cksm.c
+++ b/main/openssl/crypto/des/cbc_cksm.c
diff --git a/openssl/crypto/des/cbc_enc.c b/main/openssl/crypto/des/cbc_enc.c
index 677903ae..677903ae 100644
--- a/openssl/crypto/des/cbc_enc.c
+++ b/main/openssl/crypto/des/cbc_enc.c
diff --git a/openssl/crypto/des/cfb64ede.c b/main/openssl/crypto/des/cfb64ede.c
index de34ecce..de34ecce 100644
--- a/openssl/crypto/des/cfb64ede.c
+++ b/main/openssl/crypto/des/cfb64ede.c
diff --git a/openssl/crypto/des/cfb64enc.c b/main/openssl/crypto/des/cfb64enc.c
index 5ec8683e..5ec8683e 100644
--- a/openssl/crypto/des/cfb64enc.c
+++ b/main/openssl/crypto/des/cfb64enc.c
diff --git a/openssl/crypto/des/cfb_enc.c b/main/openssl/crypto/des/cfb_enc.c
index 720f29a2..720f29a2 100644
--- a/openssl/crypto/des/cfb_enc.c
+++ b/main/openssl/crypto/des/cfb_enc.c
diff --git a/openssl/crypto/des/des.c b/main/openssl/crypto/des/des.c
index 343135ff..343135ff 100644
--- a/openssl/crypto/des/des.c
+++ b/main/openssl/crypto/des/des.c
diff --git a/openssl/crypto/des/des.h b/main/openssl/crypto/des/des.h
index 92b66635..92b66635 100644
--- a/openssl/crypto/des/des.h
+++ b/main/openssl/crypto/des/des.h
diff --git a/openssl/crypto/des/des.pod b/main/openssl/crypto/des/des.pod
index bf479e83..bf479e83 100644
--- a/openssl/crypto/des/des.pod
+++ b/main/openssl/crypto/des/des.pod
diff --git a/openssl/crypto/des/des3s.cpp b/main/openssl/crypto/des/des3s.cpp
index 02d527c0..02d527c0 100644
--- a/openssl/crypto/des/des3s.cpp
+++ b/main/openssl/crypto/des/des3s.cpp
diff --git a/openssl/crypto/des/des_enc.c b/main/openssl/crypto/des/des_enc.c
index 828feba2..828feba2 100644
--- a/openssl/crypto/des/des_enc.c
+++ b/main/openssl/crypto/des/des_enc.c
diff --git a/openssl/crypto/des/des_locl.h b/main/openssl/crypto/des/des_locl.h
index a3b512e9..a3b512e9 100644
--- a/openssl/crypto/des/des_locl.h
+++ b/main/openssl/crypto/des/des_locl.h
diff --git a/openssl/crypto/des/des_old.c b/main/openssl/crypto/des/des_old.c
index 7c33ed7a..7c33ed7a 100644
--- a/openssl/crypto/des/des_old.c
+++ b/main/openssl/crypto/des/des_old.c
diff --git a/openssl/crypto/des/des_old.h b/main/openssl/crypto/des/des_old.h
index 2b2c3723..2b2c3723 100644
--- a/openssl/crypto/des/des_old.h
+++ b/main/openssl/crypto/des/des_old.h
diff --git a/openssl/crypto/des/des_old2.c b/main/openssl/crypto/des/des_old2.c
index c8fa3ee1..c8fa3ee1 100644
--- a/openssl/crypto/des/des_old2.c
+++ b/main/openssl/crypto/des/des_old2.c
diff --git a/openssl/crypto/des/des_opts.c b/main/openssl/crypto/des/des_opts.c
index 2df82962..2df82962 100644
--- a/openssl/crypto/des/des_opts.c
+++ b/main/openssl/crypto/des/des_opts.c
diff --git a/openssl/crypto/des/des_ver.h b/main/openssl/crypto/des/des_ver.h
index d1ada258..d1ada258 100644
--- a/openssl/crypto/des/des_ver.h
+++ b/main/openssl/crypto/des/des_ver.h
diff --git a/openssl/crypto/des/dess.cpp b/main/openssl/crypto/des/dess.cpp
index 5549bab9..5549bab9 100644
--- a/openssl/crypto/des/dess.cpp
+++ b/main/openssl/crypto/des/dess.cpp
diff --git a/openssl/crypto/des/destest.c b/main/openssl/crypto/des/destest.c
index 64b92a34..64b92a34 100644
--- a/openssl/crypto/des/destest.c
+++ b/main/openssl/crypto/des/destest.c
diff --git a/openssl/crypto/des/ecb3_enc.c b/main/openssl/crypto/des/ecb3_enc.c
index c3437bc6..c3437bc6 100644
--- a/openssl/crypto/des/ecb3_enc.c
+++ b/main/openssl/crypto/des/ecb3_enc.c
diff --git a/openssl/crypto/des/ecb_enc.c b/main/openssl/crypto/des/ecb_enc.c
index 0684e769..0684e769 100644
--- a/openssl/crypto/des/ecb_enc.c
+++ b/main/openssl/crypto/des/ecb_enc.c
diff --git a/openssl/crypto/des/ede_cbcm_enc.c b/main/openssl/crypto/des/ede_cbcm_enc.c
index adfcb75c..adfcb75c 100644
--- a/openssl/crypto/des/ede_cbcm_enc.c
+++ b/main/openssl/crypto/des/ede_cbcm_enc.c
diff --git a/openssl/crypto/des/enc_read.c b/main/openssl/crypto/des/enc_read.c
index edb6620d..edb6620d 100644
--- a/openssl/crypto/des/enc_read.c
+++ b/main/openssl/crypto/des/enc_read.c
diff --git a/openssl/crypto/des/enc_writ.c b/main/openssl/crypto/des/enc_writ.c
index 2353ac1e..2353ac1e 100644
--- a/openssl/crypto/des/enc_writ.c
+++ b/main/openssl/crypto/des/enc_writ.c
diff --git a/openssl/crypto/des/fcrypt.c b/main/openssl/crypto/des/fcrypt.c
index ccbdff25..ccbdff25 100644
--- a/openssl/crypto/des/fcrypt.c
+++ b/main/openssl/crypto/des/fcrypt.c
diff --git a/openssl/crypto/des/fcrypt_b.c b/main/openssl/crypto/des/fcrypt_b.c
index 88228169..88228169 100644
--- a/openssl/crypto/des/fcrypt_b.c
+++ b/main/openssl/crypto/des/fcrypt_b.c
diff --git a/openssl/crypto/des/makefile.bc b/main/openssl/crypto/des/makefile.bc
index 1fe6d491..1fe6d491 100644
--- a/openssl/crypto/des/makefile.bc
+++ b/main/openssl/crypto/des/makefile.bc
diff --git a/openssl/crypto/des/ncbc_enc.c b/main/openssl/crypto/des/ncbc_enc.c
index fda23d52..fda23d52 100644
--- a/openssl/crypto/des/ncbc_enc.c
+++ b/main/openssl/crypto/des/ncbc_enc.c
diff --git a/openssl/crypto/des/ofb64ede.c b/main/openssl/crypto/des/ofb64ede.c
index 26bbf9a6..26bbf9a6 100644
--- a/openssl/crypto/des/ofb64ede.c
+++ b/main/openssl/crypto/des/ofb64ede.c
diff --git a/openssl/crypto/des/ofb64enc.c b/main/openssl/crypto/des/ofb64enc.c
index 8ca3d49d..8ca3d49d 100644
--- a/openssl/crypto/des/ofb64enc.c
+++ b/main/openssl/crypto/des/ofb64enc.c
diff --git a/openssl/crypto/des/ofb_enc.c b/main/openssl/crypto/des/ofb_enc.c
index e887a3c6..e887a3c6 100644
--- a/openssl/crypto/des/ofb_enc.c
+++ b/main/openssl/crypto/des/ofb_enc.c
diff --git a/openssl/crypto/des/options.txt b/main/openssl/crypto/des/options.txt
index 6e2b50f7..6e2b50f7 100644
--- a/openssl/crypto/des/options.txt
+++ b/main/openssl/crypto/des/options.txt
diff --git a/openssl/crypto/des/pcbc_enc.c b/main/openssl/crypto/des/pcbc_enc.c
index 17a40f95..17a40f95 100644
--- a/openssl/crypto/des/pcbc_enc.c
+++ b/main/openssl/crypto/des/pcbc_enc.c
diff --git a/openssl/crypto/des/qud_cksm.c b/main/openssl/crypto/des/qud_cksm.c
index dac20122..dac20122 100644
--- a/openssl/crypto/des/qud_cksm.c
+++ b/main/openssl/crypto/des/qud_cksm.c
diff --git a/openssl/crypto/des/rand_key.c b/main/openssl/crypto/des/rand_key.c
index 23981655..23981655 100644
--- a/openssl/crypto/des/rand_key.c
+++ b/main/openssl/crypto/des/rand_key.c
diff --git a/openssl/crypto/des/read2pwd.c b/main/openssl/crypto/des/read2pwd.c
index ee6969f7..ee6969f7 100644
--- a/openssl/crypto/des/read2pwd.c
+++ b/main/openssl/crypto/des/read2pwd.c
diff --git a/openssl/crypto/des/read_pwd.c b/main/openssl/crypto/des/read_pwd.c
index ce5fa00a..ce5fa00a 100644
--- a/openssl/crypto/des/read_pwd.c
+++ b/main/openssl/crypto/des/read_pwd.c
diff --git a/openssl/crypto/des/rpc_des.h b/main/openssl/crypto/des/rpc_des.h
index 41328d79..41328d79 100644
--- a/openssl/crypto/des/rpc_des.h
+++ b/main/openssl/crypto/des/rpc_des.h
diff --git a/openssl/crypto/des/rpc_enc.c b/main/openssl/crypto/des/rpc_enc.c
index d937d08d..d937d08d 100644
--- a/openssl/crypto/des/rpc_enc.c
+++ b/main/openssl/crypto/des/rpc_enc.c
diff --git a/openssl/crypto/des/rpw.c b/main/openssl/crypto/des/rpw.c
index 8a9473c4..8a9473c4 100644
--- a/openssl/crypto/des/rpw.c
+++ b/main/openssl/crypto/des/rpw.c
diff --git a/openssl/crypto/des/set_key.c b/main/openssl/crypto/des/set_key.c
index 3004cc3a..3004cc3a 100644
--- a/openssl/crypto/des/set_key.c
+++ b/main/openssl/crypto/des/set_key.c
diff --git a/openssl/crypto/des/speed.c b/main/openssl/crypto/des/speed.c
index 1616f4b7..1616f4b7 100644
--- a/openssl/crypto/des/speed.c
+++ b/main/openssl/crypto/des/speed.c
diff --git a/openssl/crypto/des/spr.h b/main/openssl/crypto/des/spr.h
index b91936a5..b91936a5 100644
--- a/openssl/crypto/des/spr.h
+++ b/main/openssl/crypto/des/spr.h
diff --git a/openssl/crypto/des/str2key.c b/main/openssl/crypto/des/str2key.c
index 9c2054bd..9c2054bd 100644
--- a/openssl/crypto/des/str2key.c
+++ b/main/openssl/crypto/des/str2key.c
diff --git a/openssl/crypto/des/t/test b/main/openssl/crypto/des/t/test
index 97acd055..97acd055 100644
--- a/openssl/crypto/des/t/test
+++ b/main/openssl/crypto/des/t/test
diff --git a/openssl/crypto/des/times/486-50.sol b/main/openssl/crypto/des/times/486-50.sol
index 0de62d6d..0de62d6d 100644
--- a/openssl/crypto/des/times/486-50.sol
+++ b/main/openssl/crypto/des/times/486-50.sol
diff --git a/openssl/crypto/des/times/586-100.lnx b/main/openssl/crypto/des/times/586-100.lnx
index 4323914a..4323914a 100644
--- a/openssl/crypto/des/times/586-100.lnx
+++ b/main/openssl/crypto/des/times/586-100.lnx
diff --git a/openssl/crypto/des/times/686-200.fre b/main/openssl/crypto/des/times/686-200.fre
index 7d83f6ad..7d83f6ad 100644
--- a/openssl/crypto/des/times/686-200.fre
+++ b/main/openssl/crypto/des/times/686-200.fre
diff --git a/openssl/crypto/des/times/aix.cc b/main/openssl/crypto/des/times/aix.cc
index d96b74e2..d96b74e2 100644
--- a/openssl/crypto/des/times/aix.cc
+++ b/main/openssl/crypto/des/times/aix.cc
diff --git a/openssl/crypto/des/times/alpha.cc b/main/openssl/crypto/des/times/alpha.cc
index 95c17efa..95c17efa 100644
--- a/openssl/crypto/des/times/alpha.cc
+++ b/main/openssl/crypto/des/times/alpha.cc
diff --git a/openssl/crypto/des/times/hpux.cc b/main/openssl/crypto/des/times/hpux.cc
index 3de856dd..3de856dd 100644
--- a/openssl/crypto/des/times/hpux.cc
+++ b/main/openssl/crypto/des/times/hpux.cc
diff --git a/openssl/crypto/des/times/sparc.gcc b/main/openssl/crypto/des/times/sparc.gcc
index 8eaa0421..8eaa0421 100644
--- a/openssl/crypto/des/times/sparc.gcc
+++ b/main/openssl/crypto/des/times/sparc.gcc
diff --git a/openssl/crypto/des/times/usparc.cc b/main/openssl/crypto/des/times/usparc.cc
index 0864285e..0864285e 100644
--- a/openssl/crypto/des/times/usparc.cc
+++ b/main/openssl/crypto/des/times/usparc.cc
diff --git a/openssl/crypto/des/typemap b/main/openssl/crypto/des/typemap
index a524f536..a524f536 100644
--- a/openssl/crypto/des/typemap
+++ b/main/openssl/crypto/des/typemap
diff --git a/openssl/crypto/des/xcbc_enc.c b/main/openssl/crypto/des/xcbc_enc.c
index 058cab6b..058cab6b 100644
--- a/openssl/crypto/des/xcbc_enc.c
+++ b/main/openssl/crypto/des/xcbc_enc.c
diff --git a/openssl/crypto/dh/dh.h b/main/openssl/crypto/dh/dh.h
index 849309a4..849309a4 100644
--- a/openssl/crypto/dh/dh.h
+++ b/main/openssl/crypto/dh/dh.h
diff --git a/openssl/crypto/dh/dh1024.pem b/main/openssl/crypto/dh/dh1024.pem
index 81d43f6a..81d43f6a 100644
--- a/openssl/crypto/dh/dh1024.pem
+++ b/main/openssl/crypto/dh/dh1024.pem
diff --git a/openssl/crypto/dh/dh192.pem b/main/openssl/crypto/dh/dh192.pem
index 521c0727..521c0727 100644
--- a/openssl/crypto/dh/dh192.pem
+++ b/main/openssl/crypto/dh/dh192.pem
diff --git a/openssl/crypto/dh/dh2048.pem b/main/openssl/crypto/dh/dh2048.pem
index 295460f5..295460f5 100644
--- a/openssl/crypto/dh/dh2048.pem
+++ b/main/openssl/crypto/dh/dh2048.pem
diff --git a/openssl/crypto/dh/dh4096.pem b/main/openssl/crypto/dh/dh4096.pem
index 390943a2..390943a2 100644
--- a/openssl/crypto/dh/dh4096.pem
+++ b/main/openssl/crypto/dh/dh4096.pem
diff --git a/openssl/crypto/dh/dh512.pem b/main/openssl/crypto/dh/dh512.pem
index 0a4d863e..0a4d863e 100644
--- a/openssl/crypto/dh/dh512.pem
+++ b/main/openssl/crypto/dh/dh512.pem
diff --git a/openssl/crypto/dh/dh_ameth.c b/main/openssl/crypto/dh/dh_ameth.c
index 377caf96..377caf96 100644
--- a/openssl/crypto/dh/dh_ameth.c
+++ b/main/openssl/crypto/dh/dh_ameth.c
diff --git a/openssl/crypto/dh/dh_asn1.c b/main/openssl/crypto/dh/dh_asn1.c
index 0b4357d6..0b4357d6 100644
--- a/openssl/crypto/dh/dh_asn1.c
+++ b/main/openssl/crypto/dh/dh_asn1.c
diff --git a/openssl/crypto/dh/dh_check.c b/main/openssl/crypto/dh/dh_check.c
index 06689817..06689817 100644
--- a/openssl/crypto/dh/dh_check.c
+++ b/main/openssl/crypto/dh/dh_check.c
diff --git a/openssl/crypto/dh/dh_depr.c b/main/openssl/crypto/dh/dh_depr.c
index acc05f25..acc05f25 100644
--- a/openssl/crypto/dh/dh_depr.c
+++ b/main/openssl/crypto/dh/dh_depr.c
diff --git a/openssl/crypto/dh/dh_err.c b/main/openssl/crypto/dh/dh_err.c
index d5cf0c22..d5cf0c22 100644
--- a/openssl/crypto/dh/dh_err.c
+++ b/main/openssl/crypto/dh/dh_err.c
diff --git a/openssl/crypto/dh/dh_gen.c b/main/openssl/crypto/dh/dh_gen.c
index cfd5b118..cfd5b118 100644
--- a/openssl/crypto/dh/dh_gen.c
+++ b/main/openssl/crypto/dh/dh_gen.c
diff --git a/openssl/crypto/dh/dh_key.c b/main/openssl/crypto/dh/dh_key.c
index e7db4403..e7db4403 100644
--- a/openssl/crypto/dh/dh_key.c
+++ b/main/openssl/crypto/dh/dh_key.c
diff --git a/openssl/crypto/dh/dh_lib.c b/main/openssl/crypto/dh/dh_lib.c
index 7aef080e..7aef080e 100644
--- a/openssl/crypto/dh/dh_lib.c
+++ b/main/openssl/crypto/dh/dh_lib.c
diff --git a/openssl/crypto/dh/dh_pmeth.c b/main/openssl/crypto/dh/dh_pmeth.c
index 5ae72b7d..5ae72b7d 100644
--- a/openssl/crypto/dh/dh_pmeth.c
+++ b/main/openssl/crypto/dh/dh_pmeth.c
diff --git a/openssl/crypto/dh/dhtest.c b/main/openssl/crypto/dh/dhtest.c
index 882f5c31..882f5c31 100644
--- a/openssl/crypto/dh/dhtest.c
+++ b/main/openssl/crypto/dh/dhtest.c
diff --git a/openssl/crypto/dh/example b/main/openssl/crypto/dh/example
index 16a33d29..16a33d29 100644
--- a/openssl/crypto/dh/example
+++ b/main/openssl/crypto/dh/example
diff --git a/openssl/crypto/dh/generate b/main/openssl/crypto/dh/generate
index 5d407231..5d407231 100644
--- a/openssl/crypto/dh/generate
+++ b/main/openssl/crypto/dh/generate
diff --git a/openssl/crypto/dh/p1024.c b/main/openssl/crypto/dh/p1024.c
index 368ceca4..368ceca4 100644
--- a/openssl/crypto/dh/p1024.c
+++ b/main/openssl/crypto/dh/p1024.c
diff --git a/openssl/crypto/dh/p192.c b/main/openssl/crypto/dh/p192.c
index 7bdf4041..7bdf4041 100644
--- a/openssl/crypto/dh/p192.c
+++ b/main/openssl/crypto/dh/p192.c
diff --git a/openssl/crypto/dh/p512.c b/main/openssl/crypto/dh/p512.c
index a9b6aa83..a9b6aa83 100644
--- a/openssl/crypto/dh/p512.c
+++ b/main/openssl/crypto/dh/p512.c
diff --git a/openssl/crypto/dsa/README b/main/openssl/crypto/dsa/README
index 6a7e9c17..6a7e9c17 100644
--- a/openssl/crypto/dsa/README
+++ b/main/openssl/crypto/dsa/README
diff --git a/openssl/crypto/dsa/dsa.h b/main/openssl/crypto/dsa/dsa.h
index ac50a5c8..ac50a5c8 100644
--- a/openssl/crypto/dsa/dsa.h
+++ b/main/openssl/crypto/dsa/dsa.h
diff --git a/openssl/crypto/dsa/dsa_ameth.c b/main/openssl/crypto/dsa/dsa_ameth.c
index 6413aae4..6413aae4 100644
--- a/openssl/crypto/dsa/dsa_ameth.c
+++ b/main/openssl/crypto/dsa/dsa_ameth.c
diff --git a/openssl/crypto/dsa/dsa_asn1.c b/main/openssl/crypto/dsa/dsa_asn1.c
index c37460b2..c37460b2 100644
--- a/openssl/crypto/dsa/dsa_asn1.c
+++ b/main/openssl/crypto/dsa/dsa_asn1.c
diff --git a/openssl/crypto/dsa/dsa_depr.c b/main/openssl/crypto/dsa/dsa_depr.c
index f2da680e..f2da680e 100644
--- a/openssl/crypto/dsa/dsa_depr.c
+++ b/main/openssl/crypto/dsa/dsa_depr.c
diff --git a/openssl/crypto/dsa/dsa_err.c b/main/openssl/crypto/dsa/dsa_err.c
index bba984e9..bba984e9 100644
--- a/openssl/crypto/dsa/dsa_err.c
+++ b/main/openssl/crypto/dsa/dsa_err.c
diff --git a/openssl/crypto/dsa/dsa_gen.c b/main/openssl/crypto/dsa/dsa_gen.c
index cb0b4538..cb0b4538 100644
--- a/openssl/crypto/dsa/dsa_gen.c
+++ b/main/openssl/crypto/dsa/dsa_gen.c
diff --git a/openssl/crypto/dsa/dsa_key.c b/main/openssl/crypto/dsa/dsa_key.c
index c4aa86bc..c4aa86bc 100644
--- a/openssl/crypto/dsa/dsa_key.c
+++ b/main/openssl/crypto/dsa/dsa_key.c
diff --git a/openssl/crypto/dsa/dsa_lib.c b/main/openssl/crypto/dsa/dsa_lib.c
index e9b75902..e9b75902 100644
--- a/openssl/crypto/dsa/dsa_lib.c
+++ b/main/openssl/crypto/dsa/dsa_lib.c
diff --git a/openssl/crypto/dsa/dsa_locl.h b/main/openssl/crypto/dsa/dsa_locl.h
index 2b8cfee3..2b8cfee3 100644
--- a/openssl/crypto/dsa/dsa_locl.h
+++ b/main/openssl/crypto/dsa/dsa_locl.h
diff --git a/openssl/crypto/dsa/dsa_ossl.c b/main/openssl/crypto/dsa/dsa_ossl.c
index a3ddd7d2..a3ddd7d2 100644
--- a/openssl/crypto/dsa/dsa_ossl.c
+++ b/main/openssl/crypto/dsa/dsa_ossl.c
diff --git a/openssl/crypto/dsa/dsa_pmeth.c b/main/openssl/crypto/dsa/dsa_pmeth.c
index e2df54fe..e2df54fe 100644
--- a/openssl/crypto/dsa/dsa_pmeth.c
+++ b/main/openssl/crypto/dsa/dsa_pmeth.c
diff --git a/openssl/crypto/dsa/dsa_prn.c b/main/openssl/crypto/dsa/dsa_prn.c
index 6f29f5e2..6f29f5e2 100644
--- a/openssl/crypto/dsa/dsa_prn.c
+++ b/main/openssl/crypto/dsa/dsa_prn.c
diff --git a/openssl/crypto/dsa/dsa_sign.c b/main/openssl/crypto/dsa/dsa_sign.c
index 17555e58..17555e58 100644
--- a/openssl/crypto/dsa/dsa_sign.c
+++ b/main/openssl/crypto/dsa/dsa_sign.c
diff --git a/openssl/crypto/dsa/dsa_vrf.c b/main/openssl/crypto/dsa/dsa_vrf.c
index 226a75ff..226a75ff 100644
--- a/openssl/crypto/dsa/dsa_vrf.c
+++ b/main/openssl/crypto/dsa/dsa_vrf.c
diff --git a/openssl/crypto/dsa/dsagen.c b/main/openssl/crypto/dsa/dsagen.c
index 1b6a1cca..1b6a1cca 100644
--- a/openssl/crypto/dsa/dsagen.c
+++ b/main/openssl/crypto/dsa/dsagen.c
diff --git a/openssl/crypto/dsa/dsatest.c b/main/openssl/crypto/dsa/dsatest.c
index edffd24e..edffd24e 100644
--- a/openssl/crypto/dsa/dsatest.c
+++ b/main/openssl/crypto/dsa/dsatest.c
diff --git a/openssl/crypto/dsa/fips186a.txt b/main/openssl/crypto/dsa/fips186a.txt
index 3a2e0a0d..3a2e0a0d 100644
--- a/openssl/crypto/dsa/fips186a.txt
+++ b/main/openssl/crypto/dsa/fips186a.txt
diff --git a/openssl/crypto/dso/README b/main/openssl/crypto/dso/README
index d0bc9a89..d0bc9a89 100644
--- a/openssl/crypto/dso/README
+++ b/main/openssl/crypto/dso/README
diff --git a/openssl/crypto/dso/dso.h b/main/openssl/crypto/dso/dso.h
index 839f2e06..839f2e06 100644
--- a/openssl/crypto/dso/dso.h
+++ b/main/openssl/crypto/dso/dso.h
diff --git a/openssl/crypto/dso/dso_dl.c b/main/openssl/crypto/dso/dso_dl.c
index fc4236bd..fc4236bd 100644
--- a/openssl/crypto/dso/dso_dl.c
+++ b/main/openssl/crypto/dso/dso_dl.c
diff --git a/openssl/crypto/dso/dso_dlfcn.c b/main/openssl/crypto/dso/dso_dlfcn.c
index c2bc6176..c2bc6176 100644
--- a/openssl/crypto/dso/dso_dlfcn.c
+++ b/main/openssl/crypto/dso/dso_dlfcn.c
diff --git a/openssl/crypto/dso/dso_err.c b/main/openssl/crypto/dso/dso_err.c
index 2bb07c25..2bb07c25 100644
--- a/openssl/crypto/dso/dso_err.c
+++ b/main/openssl/crypto/dso/dso_err.c
diff --git a/openssl/crypto/dso/dso_lib.c b/main/openssl/crypto/dso/dso_lib.c
index 8a15b794..8a15b794 100644
--- a/openssl/crypto/dso/dso_lib.c
+++ b/main/openssl/crypto/dso/dso_lib.c
diff --git a/openssl/crypto/dso/dso_null.c b/main/openssl/crypto/dso/dso_null.c
index 49d842d1..49d842d1 100644
--- a/openssl/crypto/dso/dso_null.c
+++ b/main/openssl/crypto/dso/dso_null.c
diff --git a/openssl/crypto/dso/dso_openssl.c b/main/openssl/crypto/dso/dso_openssl.c
index b17e8e8e..b17e8e8e 100644
--- a/openssl/crypto/dso/dso_openssl.c
+++ b/main/openssl/crypto/dso/dso_openssl.c
diff --git a/openssl/crypto/ebcdic.c b/main/openssl/crypto/ebcdic.c
index 43e53bca..43e53bca 100644
--- a/openssl/crypto/ebcdic.c
+++ b/main/openssl/crypto/ebcdic.c
diff --git a/openssl/crypto/ebcdic.h b/main/openssl/crypto/ebcdic.h
index 6d65afcf..6d65afcf 100644
--- a/openssl/crypto/ebcdic.h
+++ b/main/openssl/crypto/ebcdic.h
diff --git a/openssl/crypto/ec/ec.h b/main/openssl/crypto/ec/ec.h
index ee707813..ee707813 100644
--- a/openssl/crypto/ec/ec.h
+++ b/main/openssl/crypto/ec/ec.h
diff --git a/openssl/crypto/ec/ec2_mult.c b/main/openssl/crypto/ec/ec2_mult.c
index e12b9b28..e12b9b28 100644
--- a/openssl/crypto/ec/ec2_mult.c
+++ b/main/openssl/crypto/ec/ec2_mult.c
diff --git a/openssl/crypto/ec/ec2_smpl.c b/main/openssl/crypto/ec/ec2_smpl.c
index af94458c..af94458c 100644
--- a/openssl/crypto/ec/ec2_smpl.c
+++ b/main/openssl/crypto/ec/ec2_smpl.c
diff --git a/openssl/crypto/ec/ec_ameth.c b/main/openssl/crypto/ec/ec_ameth.c
index c00f7d74..c00f7d74 100644
--- a/openssl/crypto/ec/ec_ameth.c
+++ b/main/openssl/crypto/ec/ec_ameth.c
diff --git a/openssl/crypto/ec/ec_asn1.c b/main/openssl/crypto/ec/ec_asn1.c
index ae555398..ae555398 100644
--- a/openssl/crypto/ec/ec_asn1.c
+++ b/main/openssl/crypto/ec/ec_asn1.c
diff --git a/openssl/crypto/ec/ec_check.c b/main/openssl/crypto/ec/ec_check.c
index 0e316b4b..0e316b4b 100644
--- a/openssl/crypto/ec/ec_check.c
+++ b/main/openssl/crypto/ec/ec_check.c
diff --git a/openssl/crypto/ec/ec_curve.c b/main/openssl/crypto/ec/ec_curve.c
index 23274e40..23274e40 100644
--- a/openssl/crypto/ec/ec_curve.c
+++ b/main/openssl/crypto/ec/ec_curve.c
diff --git a/openssl/crypto/ec/ec_cvt.c b/main/openssl/crypto/ec/ec_cvt.c
index d45640ba..d45640ba 100644
--- a/openssl/crypto/ec/ec_cvt.c
+++ b/main/openssl/crypto/ec/ec_cvt.c
diff --git a/openssl/crypto/ec/ec_err.c b/main/openssl/crypto/ec/ec_err.c
index 84b48333..84b48333 100644
--- a/openssl/crypto/ec/ec_err.c
+++ b/main/openssl/crypto/ec/ec_err.c
diff --git a/openssl/crypto/ec/ec_key.c b/main/openssl/crypto/ec/ec_key.c
index 522802c0..522802c0 100644
--- a/openssl/crypto/ec/ec_key.c
+++ b/main/openssl/crypto/ec/ec_key.c
diff --git a/openssl/crypto/ec/ec_lcl.h b/main/openssl/crypto/ec/ec_lcl.h
index 3e2c34b0..3e2c34b0 100644
--- a/openssl/crypto/ec/ec_lcl.h
+++ b/main/openssl/crypto/ec/ec_lcl.h
diff --git a/openssl/crypto/ec/ec_lib.c b/main/openssl/crypto/ec/ec_lib.c
index dd7da0fc..dd7da0fc 100644
--- a/openssl/crypto/ec/ec_lib.c
+++ b/main/openssl/crypto/ec/ec_lib.c
diff --git a/openssl/crypto/ec/ec_mult.c b/main/openssl/crypto/ec/ec_mult.c
index 19f21675..19f21675 100644
--- a/openssl/crypto/ec/ec_mult.c
+++ b/main/openssl/crypto/ec/ec_mult.c
diff --git a/openssl/crypto/ec/ec_pmeth.c b/main/openssl/crypto/ec/ec_pmeth.c
index f433076c..f433076c 100644
--- a/openssl/crypto/ec/ec_pmeth.c
+++ b/main/openssl/crypto/ec/ec_pmeth.c
diff --git a/openssl/crypto/ec/ec_print.c b/main/openssl/crypto/ec/ec_print.c
index f7c8a303..f7c8a303 100644
--- a/openssl/crypto/ec/ec_print.c
+++ b/main/openssl/crypto/ec/ec_print.c
diff --git a/openssl/crypto/ec/eck_prn.c b/main/openssl/crypto/ec/eck_prn.c
index 7d3e175a..7d3e175a 100644
--- a/openssl/crypto/ec/eck_prn.c
+++ b/main/openssl/crypto/ec/eck_prn.c
diff --git a/openssl/crypto/ec/ecp_mont.c b/main/openssl/crypto/ec/ecp_mont.c
index 9fc4a466..9fc4a466 100644
--- a/openssl/crypto/ec/ecp_mont.c
+++ b/main/openssl/crypto/ec/ecp_mont.c
diff --git a/openssl/crypto/ec/ecp_nist.c b/main/openssl/crypto/ec/ecp_nist.c
index 2a5682ea..2a5682ea 100644
--- a/openssl/crypto/ec/ecp_nist.c
+++ b/main/openssl/crypto/ec/ecp_nist.c
diff --git a/openssl/crypto/ec/ecp_smpl.c b/main/openssl/crypto/ec/ecp_smpl.c
index 66a92e2a..66a92e2a 100644
--- a/openssl/crypto/ec/ecp_smpl.c
+++ b/main/openssl/crypto/ec/ecp_smpl.c
diff --git a/openssl/crypto/ec/ectest.c b/main/openssl/crypto/ec/ectest.c
index 7509cb9c..7509cb9c 100644
--- a/openssl/crypto/ec/ectest.c
+++ b/main/openssl/crypto/ec/ectest.c
diff --git a/openssl/crypto/ecdh/ecdh.h b/main/openssl/crypto/ecdh/ecdh.h
index b4b58ee6..b4b58ee6 100644
--- a/openssl/crypto/ecdh/ecdh.h
+++ b/main/openssl/crypto/ecdh/ecdh.h
diff --git a/openssl/crypto/ecdh/ecdhtest.c b/main/openssl/crypto/ecdh/ecdhtest.c
index 212a87ef..212a87ef 100644
--- a/openssl/crypto/ecdh/ecdhtest.c
+++ b/main/openssl/crypto/ecdh/ecdhtest.c
diff --git a/openssl/crypto/ecdh/ech_err.c b/main/openssl/crypto/ecdh/ech_err.c
index 6f4b0c99..6f4b0c99 100644
--- a/openssl/crypto/ecdh/ech_err.c
+++ b/main/openssl/crypto/ecdh/ech_err.c
diff --git a/openssl/crypto/ecdh/ech_key.c b/main/openssl/crypto/ecdh/ech_key.c
index f44da929..f44da929 100644
--- a/openssl/crypto/ecdh/ech_key.c
+++ b/main/openssl/crypto/ecdh/ech_key.c
diff --git a/openssl/crypto/ecdh/ech_lib.c b/main/openssl/crypto/ecdh/ech_lib.c
index 4d8ea03d..4d8ea03d 100644
--- a/openssl/crypto/ecdh/ech_lib.c
+++ b/main/openssl/crypto/ecdh/ech_lib.c
diff --git a/openssl/crypto/ecdh/ech_locl.h b/main/openssl/crypto/ecdh/ech_locl.h
index f658526a..f658526a 100644
--- a/openssl/crypto/ecdh/ech_locl.h
+++ b/main/openssl/crypto/ecdh/ech_locl.h
diff --git a/openssl/crypto/ecdh/ech_ossl.c b/main/openssl/crypto/ecdh/ech_ossl.c
index 2a40ff12..2a40ff12 100644
--- a/openssl/crypto/ecdh/ech_ossl.c
+++ b/main/openssl/crypto/ecdh/ech_ossl.c
diff --git a/openssl/crypto/ecdsa/ecdsa.h b/main/openssl/crypto/ecdsa/ecdsa.h
index e61c5398..e61c5398 100644
--- a/openssl/crypto/ecdsa/ecdsa.h
+++ b/main/openssl/crypto/ecdsa/ecdsa.h
diff --git a/openssl/crypto/ecdsa/ecdsatest.c b/main/openssl/crypto/ecdsa/ecdsatest.c
index 26a4a9ee..26a4a9ee 100644
--- a/openssl/crypto/ecdsa/ecdsatest.c
+++ b/main/openssl/crypto/ecdsa/ecdsatest.c
diff --git a/openssl/crypto/ecdsa/ecs_asn1.c b/main/openssl/crypto/ecdsa/ecs_asn1.c
index b2954894..b2954894 100644
--- a/openssl/crypto/ecdsa/ecs_asn1.c
+++ b/main/openssl/crypto/ecdsa/ecs_asn1.c
diff --git a/openssl/crypto/ecdsa/ecs_err.c b/main/openssl/crypto/ecdsa/ecs_err.c
index 98e38d53..98e38d53 100644
--- a/openssl/crypto/ecdsa/ecs_err.c
+++ b/main/openssl/crypto/ecdsa/ecs_err.c
diff --git a/openssl/crypto/ecdsa/ecs_lib.c b/main/openssl/crypto/ecdsa/ecs_lib.c
index 2ebae3aa..2ebae3aa 100644
--- a/openssl/crypto/ecdsa/ecs_lib.c
+++ b/main/openssl/crypto/ecdsa/ecs_lib.c
diff --git a/openssl/crypto/ecdsa/ecs_locl.h b/main/openssl/crypto/ecdsa/ecs_locl.h
index 3a69a840..3a69a840 100644
--- a/openssl/crypto/ecdsa/ecs_locl.h
+++ b/main/openssl/crypto/ecdsa/ecs_locl.h
diff --git a/openssl/crypto/ecdsa/ecs_ossl.c b/main/openssl/crypto/ecdsa/ecs_ossl.c
index 1bbf328d..1bbf328d 100644
--- a/openssl/crypto/ecdsa/ecs_ossl.c
+++ b/main/openssl/crypto/ecdsa/ecs_ossl.c
diff --git a/openssl/crypto/ecdsa/ecs_sign.c b/main/openssl/crypto/ecdsa/ecs_sign.c
index 353d5af5..353d5af5 100644
--- a/openssl/crypto/ecdsa/ecs_sign.c
+++ b/main/openssl/crypto/ecdsa/ecs_sign.c
diff --git a/openssl/crypto/ecdsa/ecs_vrf.c b/main/openssl/crypto/ecdsa/ecs_vrf.c
index ef9acf7b..ef9acf7b 100644
--- a/openssl/crypto/ecdsa/ecs_vrf.c
+++ b/main/openssl/crypto/ecdsa/ecs_vrf.c
diff --git a/openssl/crypto/engine/README b/main/openssl/crypto/engine/README
index 6b69b70f..6b69b70f 100644
--- a/openssl/crypto/engine/README
+++ b/main/openssl/crypto/engine/README
diff --git a/openssl/crypto/engine/eng_all.c b/main/openssl/crypto/engine/eng_all.c
index 22c12045..22c12045 100644
--- a/openssl/crypto/engine/eng_all.c
+++ b/main/openssl/crypto/engine/eng_all.c
diff --git a/openssl/crypto/engine/eng_cnf.c b/main/openssl/crypto/engine/eng_cnf.c
index 95c40700..95c40700 100644
--- a/openssl/crypto/engine/eng_cnf.c
+++ b/main/openssl/crypto/engine/eng_cnf.c
diff --git a/openssl/crypto/engine/eng_cryptodev.c b/main/openssl/crypto/engine/eng_cryptodev.c
index 52f4ca39..52f4ca39 100644
--- a/openssl/crypto/engine/eng_cryptodev.c
+++ b/main/openssl/crypto/engine/eng_cryptodev.c
diff --git a/openssl/crypto/engine/eng_ctrl.c b/main/openssl/crypto/engine/eng_ctrl.c
index 5ce25d92..5ce25d92 100644
--- a/openssl/crypto/engine/eng_ctrl.c
+++ b/main/openssl/crypto/engine/eng_ctrl.c
diff --git a/openssl/crypto/engine/eng_dyn.c b/main/openssl/crypto/engine/eng_dyn.c
index 807da7a5..807da7a5 100644
--- a/openssl/crypto/engine/eng_dyn.c
+++ b/main/openssl/crypto/engine/eng_dyn.c
diff --git a/openssl/crypto/engine/eng_err.c b/main/openssl/crypto/engine/eng_err.c
index 81c70acf..81c70acf 100644
--- a/openssl/crypto/engine/eng_err.c
+++ b/main/openssl/crypto/engine/eng_err.c
diff --git a/openssl/crypto/engine/eng_fat.c b/main/openssl/crypto/engine/eng_fat.c
index db66e623..db66e623 100644
--- a/openssl/crypto/engine/eng_fat.c
+++ b/main/openssl/crypto/engine/eng_fat.c
diff --git a/openssl/crypto/engine/eng_init.c b/main/openssl/crypto/engine/eng_init.c
index 7633cf5f..7633cf5f 100644
--- a/openssl/crypto/engine/eng_init.c
+++ b/main/openssl/crypto/engine/eng_init.c
diff --git a/openssl/crypto/engine/eng_int.h b/main/openssl/crypto/engine/eng_int.h
index 451ef8fe..451ef8fe 100644
--- a/openssl/crypto/engine/eng_int.h
+++ b/main/openssl/crypto/engine/eng_int.h
diff --git a/openssl/crypto/engine/eng_lib.c b/main/openssl/crypto/engine/eng_lib.c
index 18a66646..18a66646 100644
--- a/openssl/crypto/engine/eng_lib.c
+++ b/main/openssl/crypto/engine/eng_lib.c
diff --git a/openssl/crypto/engine/eng_list.c b/main/openssl/crypto/engine/eng_list.c
index 27846edb..27846edb 100644
--- a/openssl/crypto/engine/eng_list.c
+++ b/main/openssl/crypto/engine/eng_list.c
diff --git a/openssl/crypto/engine/eng_openssl.c b/main/openssl/crypto/engine/eng_openssl.c
index 9abb95cc..9abb95cc 100644
--- a/openssl/crypto/engine/eng_openssl.c
+++ b/main/openssl/crypto/engine/eng_openssl.c
diff --git a/openssl/crypto/engine/eng_pkey.c b/main/openssl/crypto/engine/eng_pkey.c
index 1dfa2e36..1dfa2e36 100644
--- a/openssl/crypto/engine/eng_pkey.c
+++ b/main/openssl/crypto/engine/eng_pkey.c
diff --git a/openssl/crypto/engine/eng_table.c b/main/openssl/crypto/engine/eng_table.c
index 4fde9481..4fde9481 100644
--- a/openssl/crypto/engine/eng_table.c
+++ b/main/openssl/crypto/engine/eng_table.c
diff --git a/openssl/crypto/engine/engine.h b/main/openssl/crypto/engine/engine.h
index 943aeae2..943aeae2 100644
--- a/openssl/crypto/engine/engine.h
+++ b/main/openssl/crypto/engine/engine.h
diff --git a/openssl/crypto/engine/enginetest.c b/main/openssl/crypto/engine/enginetest.c
index f4d70e7e..f4d70e7e 100644
--- a/openssl/crypto/engine/enginetest.c
+++ b/main/openssl/crypto/engine/enginetest.c
diff --git a/openssl/crypto/engine/tb_cipher.c b/main/openssl/crypto/engine/tb_cipher.c
index 177fc1fb..177fc1fb 100644
--- a/openssl/crypto/engine/tb_cipher.c
+++ b/main/openssl/crypto/engine/tb_cipher.c
diff --git a/openssl/crypto/engine/tb_dh.c b/main/openssl/crypto/engine/tb_dh.c
index 6e9d4287..6e9d4287 100644
--- a/openssl/crypto/engine/tb_dh.c
+++ b/main/openssl/crypto/engine/tb_dh.c
diff --git a/openssl/crypto/engine/tb_digest.c b/main/openssl/crypto/engine/tb_digest.c
index d3f4bb27..d3f4bb27 100644
--- a/openssl/crypto/engine/tb_digest.c
+++ b/main/openssl/crypto/engine/tb_digest.c
diff --git a/openssl/crypto/engine/tb_dsa.c b/main/openssl/crypto/engine/tb_dsa.c
index e4674f5f..e4674f5f 100644
--- a/openssl/crypto/engine/tb_dsa.c
+++ b/main/openssl/crypto/engine/tb_dsa.c
diff --git a/openssl/crypto/engine/tb_ecdh.c b/main/openssl/crypto/engine/tb_ecdh.c
index c8ec7812..c8ec7812 100644
--- a/openssl/crypto/engine/tb_ecdh.c
+++ b/main/openssl/crypto/engine/tb_ecdh.c
diff --git a/openssl/crypto/engine/tb_ecdsa.c b/main/openssl/crypto/engine/tb_ecdsa.c
index 005ecb62..005ecb62 100644
--- a/openssl/crypto/engine/tb_ecdsa.c
+++ b/main/openssl/crypto/engine/tb_ecdsa.c
diff --git a/openssl/crypto/engine/tb_rand.c b/main/openssl/crypto/engine/tb_rand.c
index f36f67c0..f36f67c0 100644
--- a/openssl/crypto/engine/tb_rand.c
+++ b/main/openssl/crypto/engine/tb_rand.c
diff --git a/openssl/crypto/engine/tb_rsa.c b/main/openssl/crypto/engine/tb_rsa.c
index fbc707fd..fbc707fd 100644
--- a/openssl/crypto/engine/tb_rsa.c
+++ b/main/openssl/crypto/engine/tb_rsa.c
diff --git a/openssl/crypto/engine/tb_store.c b/main/openssl/crypto/engine/tb_store.c
index 8cc435c9..8cc435c9 100644
--- a/openssl/crypto/engine/tb_store.c
+++ b/main/openssl/crypto/engine/tb_store.c
diff --git a/openssl/crypto/err/err.c b/main/openssl/crypto/err/err.c
index 69713a6e..69713a6e 100644
--- a/openssl/crypto/err/err.c
+++ b/main/openssl/crypto/err/err.c
diff --git a/openssl/crypto/err/err.h b/main/openssl/crypto/err/err.h
index b9f8c16d..b9f8c16d 100644
--- a/openssl/crypto/err/err.h
+++ b/main/openssl/crypto/err/err.h
diff --git a/openssl/crypto/err/err_all.c b/main/openssl/crypto/err/err_all.c
index fc049e8e..fc049e8e 100644
--- a/openssl/crypto/err/err_all.c
+++ b/main/openssl/crypto/err/err_all.c
diff --git a/openssl/crypto/err/err_prn.c b/main/openssl/crypto/err/err_prn.c
index a0168ac8..a0168ac8 100644
--- a/openssl/crypto/err/err_prn.c
+++ b/main/openssl/crypto/err/err_prn.c
diff --git a/openssl/crypto/err/openssl.ec b/main/openssl/crypto/err/openssl.ec
index e0554b43..e0554b43 100644
--- a/openssl/crypto/err/openssl.ec
+++ b/main/openssl/crypto/err/openssl.ec
diff --git a/openssl/crypto/evp/bio_b64.c b/main/openssl/crypto/evp/bio_b64.c
index 72a2a672..72a2a672 100644
--- a/openssl/crypto/evp/bio_b64.c
+++ b/main/openssl/crypto/evp/bio_b64.c
diff --git a/openssl/crypto/evp/bio_enc.c b/main/openssl/crypto/evp/bio_enc.c
index b6efb5fb..b6efb5fb 100644
--- a/openssl/crypto/evp/bio_enc.c
+++ b/main/openssl/crypto/evp/bio_enc.c
diff --git a/openssl/crypto/evp/bio_md.c b/main/openssl/crypto/evp/bio_md.c
index 9841e32e..9841e32e 100644
--- a/openssl/crypto/evp/bio_md.c
+++ b/main/openssl/crypto/evp/bio_md.c
diff --git a/openssl/crypto/evp/bio_ok.c b/main/openssl/crypto/evp/bio_ok.c
index 98bc1ab4..98bc1ab4 100644
--- a/openssl/crypto/evp/bio_ok.c
+++ b/main/openssl/crypto/evp/bio_ok.c
diff --git a/openssl/crypto/evp/c_all.c b/main/openssl/crypto/evp/c_all.c
index 766c4cec..766c4cec 100644
--- a/openssl/crypto/evp/c_all.c
+++ b/main/openssl/crypto/evp/c_all.c
diff --git a/openssl/crypto/evp/c_allc.c b/main/openssl/crypto/evp/c_allc.c
index c5f92683..c5f92683 100644
--- a/openssl/crypto/evp/c_allc.c
+++ b/main/openssl/crypto/evp/c_allc.c
diff --git a/openssl/crypto/evp/c_alld.c b/main/openssl/crypto/evp/c_alld.c
index 311e1fe2..311e1fe2 100644
--- a/openssl/crypto/evp/c_alld.c
+++ b/main/openssl/crypto/evp/c_alld.c
diff --git a/openssl/crypto/evp/digest.c b/main/openssl/crypto/evp/digest.c
index 982ba2b1..982ba2b1 100644
--- a/openssl/crypto/evp/digest.c
+++ b/main/openssl/crypto/evp/digest.c
diff --git a/openssl/crypto/evp/e_aes.c b/main/openssl/crypto/evp/e_aes.c
index bd6c0a3a..bd6c0a3a 100644
--- a/openssl/crypto/evp/e_aes.c
+++ b/main/openssl/crypto/evp/e_aes.c
diff --git a/openssl/crypto/evp/e_bf.c b/main/openssl/crypto/evp/e_bf.c
index cc224e53..cc224e53 100644
--- a/openssl/crypto/evp/e_bf.c
+++ b/main/openssl/crypto/evp/e_bf.c
diff --git a/openssl/crypto/evp/e_camellia.c b/main/openssl/crypto/evp/e_camellia.c
index a7b40d1c..a7b40d1c 100644
--- a/openssl/crypto/evp/e_camellia.c
+++ b/main/openssl/crypto/evp/e_camellia.c
diff --git a/openssl/crypto/evp/e_cast.c b/main/openssl/crypto/evp/e_cast.c
index d77bcd92..d77bcd92 100644
--- a/openssl/crypto/evp/e_cast.c
+++ b/main/openssl/crypto/evp/e_cast.c
diff --git a/openssl/crypto/evp/e_des.c b/main/openssl/crypto/evp/e_des.c
index ca009f2c..ca009f2c 100644
--- a/openssl/crypto/evp/e_des.c
+++ b/main/openssl/crypto/evp/e_des.c
diff --git a/openssl/crypto/evp/e_des3.c b/main/openssl/crypto/evp/e_des3.c
index 3232cfe0..3232cfe0 100644
--- a/openssl/crypto/evp/e_des3.c
+++ b/main/openssl/crypto/evp/e_des3.c
diff --git a/openssl/crypto/evp/e_dsa.c b/main/openssl/crypto/evp/e_dsa.c
index b96f2738..b96f2738 100644
--- a/openssl/crypto/evp/e_dsa.c
+++ b/main/openssl/crypto/evp/e_dsa.c
diff --git a/openssl/crypto/evp/e_idea.c b/main/openssl/crypto/evp/e_idea.c
index 806b0803..806b0803 100644
--- a/openssl/crypto/evp/e_idea.c
+++ b/main/openssl/crypto/evp/e_idea.c
diff --git a/openssl/crypto/evp/e_null.c b/main/openssl/crypto/evp/e_null.c
index 7cf50e14..7cf50e14 100644
--- a/openssl/crypto/evp/e_null.c
+++ b/main/openssl/crypto/evp/e_null.c
diff --git a/openssl/crypto/evp/e_old.c b/main/openssl/crypto/evp/e_old.c
index 1642af48..1642af48 100644
--- a/openssl/crypto/evp/e_old.c
+++ b/main/openssl/crypto/evp/e_old.c
diff --git a/openssl/crypto/evp/e_rc2.c b/main/openssl/crypto/evp/e_rc2.c
index f78d7811..f78d7811 100644
--- a/openssl/crypto/evp/e_rc2.c
+++ b/main/openssl/crypto/evp/e_rc2.c
diff --git a/openssl/crypto/evp/e_rc4.c b/main/openssl/crypto/evp/e_rc4.c
index 8b5175e0..8b5175e0 100644
--- a/openssl/crypto/evp/e_rc4.c
+++ b/main/openssl/crypto/evp/e_rc4.c
diff --git a/openssl/crypto/evp/e_rc5.c b/main/openssl/crypto/evp/e_rc5.c
index 19a10c64..19a10c64 100644
--- a/openssl/crypto/evp/e_rc5.c
+++ b/main/openssl/crypto/evp/e_rc5.c
diff --git a/openssl/crypto/evp/e_seed.c b/main/openssl/crypto/evp/e_seed.c
index 2d1759d2..2d1759d2 100644
--- a/openssl/crypto/evp/e_seed.c
+++ b/main/openssl/crypto/evp/e_seed.c
diff --git a/openssl/crypto/evp/e_xcbc_d.c b/main/openssl/crypto/evp/e_xcbc_d.c
index 250e88c8..250e88c8 100644
--- a/openssl/crypto/evp/e_xcbc_d.c
+++ b/main/openssl/crypto/evp/e_xcbc_d.c
diff --git a/openssl/crypto/evp/encode.c b/main/openssl/crypto/evp/encode.c
index 28546a84..28546a84 100644
--- a/openssl/crypto/evp/encode.c
+++ b/main/openssl/crypto/evp/encode.c
diff --git a/openssl/crypto/evp/evp.h b/main/openssl/crypto/evp/evp.h
index 9f9795e2..9f9795e2 100644
--- a/openssl/crypto/evp/evp.h
+++ b/main/openssl/crypto/evp/evp.h
diff --git a/openssl/crypto/evp/evp_acnf.c b/main/openssl/crypto/evp/evp_acnf.c
index 643a1864..643a1864 100644
--- a/openssl/crypto/evp/evp_acnf.c
+++ b/main/openssl/crypto/evp/evp_acnf.c
diff --git a/openssl/crypto/evp/evp_enc.c b/main/openssl/crypto/evp/evp_enc.c
index c268d25c..c268d25c 100644
--- a/openssl/crypto/evp/evp_enc.c
+++ b/main/openssl/crypto/evp/evp_enc.c
diff --git a/openssl/crypto/evp/evp_err.c b/main/openssl/crypto/evp/evp_err.c
index d8bfec09..d8bfec09 100644
--- a/openssl/crypto/evp/evp_err.c
+++ b/main/openssl/crypto/evp/evp_err.c
diff --git a/openssl/crypto/evp/evp_key.c b/main/openssl/crypto/evp/evp_key.c
index 839d6a3a..839d6a3a 100644
--- a/openssl/crypto/evp/evp_key.c
+++ b/main/openssl/crypto/evp/evp_key.c
diff --git a/openssl/crypto/evp/evp_lib.c b/main/openssl/crypto/evp/evp_lib.c
index 40951a04..40951a04 100644
--- a/openssl/crypto/evp/evp_lib.c
+++ b/main/openssl/crypto/evp/evp_lib.c
diff --git a/openssl/crypto/evp/evp_locl.h b/main/openssl/crypto/evp/evp_locl.h
index 292d74c1..292d74c1 100644
--- a/openssl/crypto/evp/evp_locl.h
+++ b/main/openssl/crypto/evp/evp_locl.h
diff --git a/openssl/crypto/evp/evp_pbe.c b/main/openssl/crypto/evp/evp_pbe.c
index c9d932d2..c9d932d2 100644
--- a/openssl/crypto/evp/evp_pbe.c
+++ b/main/openssl/crypto/evp/evp_pbe.c
diff --git a/openssl/crypto/evp/evp_pkey.c b/main/openssl/crypto/evp/evp_pkey.c
index ceebf692..ceebf692 100644
--- a/openssl/crypto/evp/evp_pkey.c
+++ b/main/openssl/crypto/evp/evp_pkey.c
diff --git a/openssl/crypto/evp/evp_test.c b/main/openssl/crypto/evp/evp_test.c
index 55c7cdfd..55c7cdfd 100644
--- a/openssl/crypto/evp/evp_test.c
+++ b/main/openssl/crypto/evp/evp_test.c
diff --git a/openssl/crypto/evp/evptests.txt b/main/openssl/crypto/evp/evptests.txt
index beb12144..beb12144 100644
--- a/openssl/crypto/evp/evptests.txt
+++ b/main/openssl/crypto/evp/evptests.txt
diff --git a/openssl/crypto/evp/m_dss.c b/main/openssl/crypto/evp/m_dss.c
index 48c26895..48c26895 100644
--- a/openssl/crypto/evp/m_dss.c
+++ b/main/openssl/crypto/evp/m_dss.c
diff --git a/openssl/crypto/evp/m_dss1.c b/main/openssl/crypto/evp/m_dss1.c
index 4f03fb70..4f03fb70 100644
--- a/openssl/crypto/evp/m_dss1.c
+++ b/main/openssl/crypto/evp/m_dss1.c
diff --git a/openssl/crypto/evp/m_ecdsa.c b/main/openssl/crypto/evp/m_ecdsa.c
index 8d87a49e..8d87a49e 100644
--- a/openssl/crypto/evp/m_ecdsa.c
+++ b/main/openssl/crypto/evp/m_ecdsa.c
diff --git a/openssl/crypto/evp/m_md4.c b/main/openssl/crypto/evp/m_md4.c
index 1e0b7c5b..1e0b7c5b 100644
--- a/openssl/crypto/evp/m_md4.c
+++ b/main/openssl/crypto/evp/m_md4.c
diff --git a/openssl/crypto/evp/m_md5.c b/main/openssl/crypto/evp/m_md5.c
index 63c14211..63c14211 100644
--- a/openssl/crypto/evp/m_md5.c
+++ b/main/openssl/crypto/evp/m_md5.c
diff --git a/openssl/crypto/evp/m_mdc2.c b/main/openssl/crypto/evp/m_mdc2.c
index b08d5598..b08d5598 100644
--- a/openssl/crypto/evp/m_mdc2.c
+++ b/main/openssl/crypto/evp/m_mdc2.c
diff --git a/openssl/crypto/evp/m_null.c b/main/openssl/crypto/evp/m_null.c
index cb072169..cb072169 100644
--- a/openssl/crypto/evp/m_null.c
+++ b/main/openssl/crypto/evp/m_null.c
diff --git a/openssl/crypto/evp/m_ripemd.c b/main/openssl/crypto/evp/m_ripemd.c
index a1d60ee7..a1d60ee7 100644
--- a/openssl/crypto/evp/m_ripemd.c
+++ b/main/openssl/crypto/evp/m_ripemd.c
diff --git a/openssl/crypto/evp/m_sha1.c b/main/openssl/crypto/evp/m_sha1.c
index 9a2790fd..9a2790fd 100644
--- a/openssl/crypto/evp/m_sha1.c
+++ b/main/openssl/crypto/evp/m_sha1.c
diff --git a/openssl/crypto/evp/m_sigver.c b/main/openssl/crypto/evp/m_sigver.c
index 7e2731f4..7e2731f4 100644
--- a/openssl/crypto/evp/m_sigver.c
+++ b/main/openssl/crypto/evp/m_sigver.c
diff --git a/openssl/crypto/evp/m_wp.c b/main/openssl/crypto/evp/m_wp.c
index 1ce47c04..1ce47c04 100644
--- a/openssl/crypto/evp/m_wp.c
+++ b/main/openssl/crypto/evp/m_wp.c
diff --git a/openssl/crypto/evp/names.c b/main/openssl/crypto/evp/names.c
index f2869f5c..f2869f5c 100644
--- a/openssl/crypto/evp/names.c
+++ b/main/openssl/crypto/evp/names.c
diff --git a/openssl/crypto/evp/openbsd_hw.c b/main/openssl/crypto/evp/openbsd_hw.c
index 3831a573..3831a573 100644
--- a/openssl/crypto/evp/openbsd_hw.c
+++ b/main/openssl/crypto/evp/openbsd_hw.c
diff --git a/openssl/crypto/evp/p5_crpt.c b/main/openssl/crypto/evp/p5_crpt.c
index 7ecfa8da..7ecfa8da 100644
--- a/openssl/crypto/evp/p5_crpt.c
+++ b/main/openssl/crypto/evp/p5_crpt.c
diff --git a/openssl/crypto/evp/p5_crpt2.c b/main/openssl/crypto/evp/p5_crpt2.c
index 334379f3..334379f3 100644
--- a/openssl/crypto/evp/p5_crpt2.c
+++ b/main/openssl/crypto/evp/p5_crpt2.c
diff --git a/openssl/crypto/evp/p_dec.c b/main/openssl/crypto/evp/p_dec.c
index 4201dcba..4201dcba 100644
--- a/openssl/crypto/evp/p_dec.c
+++ b/main/openssl/crypto/evp/p_dec.c
diff --git a/openssl/crypto/evp/p_enc.c b/main/openssl/crypto/evp/p_enc.c
index b5a3a84c..b5a3a84c 100644
--- a/openssl/crypto/evp/p_enc.c
+++ b/main/openssl/crypto/evp/p_enc.c
diff --git a/openssl/crypto/evp/p_lib.c b/main/openssl/crypto/evp/p_lib.c
index e26ccd0d..e26ccd0d 100644
--- a/openssl/crypto/evp/p_lib.c
+++ b/main/openssl/crypto/evp/p_lib.c
diff --git a/openssl/crypto/evp/p_open.c b/main/openssl/crypto/evp/p_open.c
index 53a59a29..53a59a29 100644
--- a/openssl/crypto/evp/p_open.c
+++ b/main/openssl/crypto/evp/p_open.c
diff --git a/openssl/crypto/evp/p_seal.c b/main/openssl/crypto/evp/p_seal.c
index d8324526..d8324526 100644
--- a/openssl/crypto/evp/p_seal.c
+++ b/main/openssl/crypto/evp/p_seal.c
diff --git a/openssl/crypto/evp/p_sign.c b/main/openssl/crypto/evp/p_sign.c
index bb893f5b..bb893f5b 100644
--- a/openssl/crypto/evp/p_sign.c
+++ b/main/openssl/crypto/evp/p_sign.c
diff --git a/openssl/crypto/evp/p_verify.c b/main/openssl/crypto/evp/p_verify.c
index 41d4b671..41d4b671 100644
--- a/openssl/crypto/evp/p_verify.c
+++ b/main/openssl/crypto/evp/p_verify.c
diff --git a/openssl/crypto/evp/pmeth_fn.c b/main/openssl/crypto/evp/pmeth_fn.c
index c4676f2f..c4676f2f 100644
--- a/openssl/crypto/evp/pmeth_fn.c
+++ b/main/openssl/crypto/evp/pmeth_fn.c
diff --git a/openssl/crypto/evp/pmeth_gn.c b/main/openssl/crypto/evp/pmeth_gn.c
index 5d74161a..5d74161a 100644
--- a/openssl/crypto/evp/pmeth_gn.c
+++ b/main/openssl/crypto/evp/pmeth_gn.c
diff --git a/openssl/crypto/evp/pmeth_lib.c b/main/openssl/crypto/evp/pmeth_lib.c
index 5481d4b8..5481d4b8 100644
--- a/openssl/crypto/evp/pmeth_lib.c
+++ b/main/openssl/crypto/evp/pmeth_lib.c
diff --git a/openssl/crypto/ex_data.c b/main/openssl/crypto/ex_data.c
index e2bc8298..e2bc8298 100644
--- a/openssl/crypto/ex_data.c
+++ b/main/openssl/crypto/ex_data.c
diff --git a/openssl/crypto/hmac/hm_ameth.c b/main/openssl/crypto/hmac/hm_ameth.c
index 6d8a8914..6d8a8914 100644
--- a/openssl/crypto/hmac/hm_ameth.c
+++ b/main/openssl/crypto/hmac/hm_ameth.c
diff --git a/openssl/crypto/hmac/hm_pmeth.c b/main/openssl/crypto/hmac/hm_pmeth.c
index 71e8567a..71e8567a 100644
--- a/openssl/crypto/hmac/hm_pmeth.c
+++ b/main/openssl/crypto/hmac/hm_pmeth.c
diff --git a/openssl/crypto/hmac/hmac.c b/main/openssl/crypto/hmac/hmac.c
index 6c98fc43..6c98fc43 100644
--- a/openssl/crypto/hmac/hmac.c
+++ b/main/openssl/crypto/hmac/hmac.c
diff --git a/openssl/crypto/hmac/hmac.h b/main/openssl/crypto/hmac/hmac.h
index 1be00221..1be00221 100644
--- a/openssl/crypto/hmac/hmac.h
+++ b/main/openssl/crypto/hmac/hmac.h
diff --git a/openssl/crypto/hmac/hmactest.c b/main/openssl/crypto/hmac/hmactest.c
index 1b906b81..1b906b81 100644
--- a/openssl/crypto/hmac/hmactest.c
+++ b/main/openssl/crypto/hmac/hmactest.c
diff --git a/openssl/crypto/ia64cpuid.S b/main/openssl/crypto/ia64cpuid.S
index d705fff7..d705fff7 100644
--- a/openssl/crypto/ia64cpuid.S
+++ b/main/openssl/crypto/ia64cpuid.S
diff --git a/openssl/crypto/jpake/jpake.c b/main/openssl/crypto/jpake/jpake.c
index 8e4b633c..8e4b633c 100644
--- a/openssl/crypto/jpake/jpake.c
+++ b/main/openssl/crypto/jpake/jpake.c
diff --git a/openssl/crypto/jpake/jpake.h b/main/openssl/crypto/jpake/jpake.h
index fd143b4d..fd143b4d 100644
--- a/openssl/crypto/jpake/jpake.h
+++ b/main/openssl/crypto/jpake/jpake.h
diff --git a/openssl/crypto/jpake/jpake_err.c b/main/openssl/crypto/jpake/jpake_err.c
index a9a9dee7..a9a9dee7 100644
--- a/openssl/crypto/jpake/jpake_err.c
+++ b/main/openssl/crypto/jpake/jpake_err.c
diff --git a/openssl/crypto/jpake/jpaketest.c b/main/openssl/crypto/jpake/jpaketest.c
index eaba75ed..eaba75ed 100644
--- a/openssl/crypto/jpake/jpaketest.c
+++ b/main/openssl/crypto/jpake/jpaketest.c
diff --git a/openssl/crypto/krb5/krb5_asn.c b/main/openssl/crypto/krb5/krb5_asn.c
index 1fb741d2..1fb741d2 100644
--- a/openssl/crypto/krb5/krb5_asn.c
+++ b/main/openssl/crypto/krb5/krb5_asn.c
diff --git a/openssl/crypto/krb5/krb5_asn.h b/main/openssl/crypto/krb5/krb5_asn.h
index 41725d0d..41725d0d 100644
--- a/openssl/crypto/krb5/krb5_asn.h
+++ b/main/openssl/crypto/krb5/krb5_asn.h
diff --git a/openssl/crypto/lhash/lh_stats.c b/main/openssl/crypto/lhash/lh_stats.c
index 815615e3..815615e3 100644
--- a/openssl/crypto/lhash/lh_stats.c
+++ b/main/openssl/crypto/lhash/lh_stats.c
diff --git a/openssl/crypto/lhash/lh_test.c b/main/openssl/crypto/lhash/lh_test.c
index 85700c85..85700c85 100644
--- a/openssl/crypto/lhash/lh_test.c
+++ b/main/openssl/crypto/lhash/lh_test.c
diff --git a/openssl/crypto/lhash/lhash.c b/main/openssl/crypto/lhash/lhash.c
index 47f74808..47f74808 100644
--- a/openssl/crypto/lhash/lhash.c
+++ b/main/openssl/crypto/lhash/lhash.c
diff --git a/openssl/crypto/lhash/lhash.h b/main/openssl/crypto/lhash/lhash.h
index e7d87635..e7d87635 100644
--- a/openssl/crypto/lhash/lhash.h
+++ b/main/openssl/crypto/lhash/lhash.h
diff --git a/openssl/crypto/lhash/num.pl b/main/openssl/crypto/lhash/num.pl
index 30fedf9c..30fedf9c 100644
--- a/openssl/crypto/lhash/num.pl
+++ b/main/openssl/crypto/lhash/num.pl
diff --git a/openssl/crypto/md32_common.h b/main/openssl/crypto/md32_common.h
index bb738195..bb738195 100644
--- a/openssl/crypto/md32_common.h
+++ b/main/openssl/crypto/md32_common.h
diff --git a/openssl/crypto/md4/md4.c b/main/openssl/crypto/md4/md4.c
index 141415ad..141415ad 100644
--- a/openssl/crypto/md4/md4.c
+++ b/main/openssl/crypto/md4/md4.c
diff --git a/openssl/crypto/md4/md4.h b/main/openssl/crypto/md4/md4.h
index c3ed9b3f..c3ed9b3f 100644
--- a/openssl/crypto/md4/md4.h
+++ b/main/openssl/crypto/md4/md4.h
diff --git a/openssl/crypto/md4/md4_dgst.c b/main/openssl/crypto/md4/md4_dgst.c
index e0c42e85..e0c42e85 100644
--- a/openssl/crypto/md4/md4_dgst.c
+++ b/main/openssl/crypto/md4/md4_dgst.c
diff --git a/openssl/crypto/md4/md4_locl.h b/main/openssl/crypto/md4/md4_locl.h
index c8085b0e..c8085b0e 100644
--- a/openssl/crypto/md4/md4_locl.h
+++ b/main/openssl/crypto/md4/md4_locl.h
diff --git a/openssl/crypto/md4/md4_one.c b/main/openssl/crypto/md4/md4_one.c
index bb643626..bb643626 100644
--- a/openssl/crypto/md4/md4_one.c
+++ b/main/openssl/crypto/md4/md4_one.c
diff --git a/openssl/crypto/md4/md4s.cpp b/main/openssl/crypto/md4/md4s.cpp
index c0ec97fc..c0ec97fc 100644
--- a/openssl/crypto/md4/md4s.cpp
+++ b/main/openssl/crypto/md4/md4s.cpp
diff --git a/openssl/crypto/md4/md4test.c b/main/openssl/crypto/md4/md4test.c
index 56591728..56591728 100644
--- a/openssl/crypto/md4/md4test.c
+++ b/main/openssl/crypto/md4/md4test.c
diff --git a/openssl/crypto/md5/asm/md5-586.pl b/main/openssl/crypto/md5/asm/md5-586.pl
index 6cb66bb4..6cb66bb4 100644
--- a/openssl/crypto/md5/asm/md5-586.pl
+++ b/main/openssl/crypto/md5/asm/md5-586.pl
diff --git a/openssl/crypto/md5/asm/md5-ia64.S b/main/openssl/crypto/md5/asm/md5-ia64.S
index e7de08d4..e7de08d4 100644
--- a/openssl/crypto/md5/asm/md5-ia64.S
+++ b/main/openssl/crypto/md5/asm/md5-ia64.S
diff --git a/openssl/crypto/md5/asm/md5-x86_64.pl b/main/openssl/crypto/md5/asm/md5-x86_64.pl
index 86788543..86788543 100755
--- a/openssl/crypto/md5/asm/md5-x86_64.pl
+++ b/main/openssl/crypto/md5/asm/md5-x86_64.pl
diff --git a/openssl/crypto/md5/md5.c b/main/openssl/crypto/md5/md5.c
index 563733ab..563733ab 100644
--- a/openssl/crypto/md5/md5.c
+++ b/main/openssl/crypto/md5/md5.c
diff --git a/openssl/crypto/md5/md5.h b/main/openssl/crypto/md5/md5.h
index 4cbf8438..4cbf8438 100644
--- a/openssl/crypto/md5/md5.h
+++ b/main/openssl/crypto/md5/md5.h
diff --git a/openssl/crypto/md5/md5_dgst.c b/main/openssl/crypto/md5/md5_dgst.c
index beace632..beace632 100644
--- a/openssl/crypto/md5/md5_dgst.c
+++ b/main/openssl/crypto/md5/md5_dgst.c
diff --git a/openssl/crypto/md5/md5_locl.h b/main/openssl/crypto/md5/md5_locl.h
index 968d5779..968d5779 100644
--- a/openssl/crypto/md5/md5_locl.h
+++ b/main/openssl/crypto/md5/md5_locl.h
diff --git a/openssl/crypto/md5/md5_one.c b/main/openssl/crypto/md5/md5_one.c
index 43fee893..43fee893 100644
--- a/openssl/crypto/md5/md5_one.c
+++ b/main/openssl/crypto/md5/md5_one.c
diff --git a/openssl/crypto/md5/md5s.cpp b/main/openssl/crypto/md5/md5s.cpp
index dd343fd4..dd343fd4 100644
--- a/openssl/crypto/md5/md5s.cpp
+++ b/main/openssl/crypto/md5/md5s.cpp
diff --git a/openssl/crypto/md5/md5test.c b/main/openssl/crypto/md5/md5test.c
index 2b37190e..2b37190e 100644
--- a/openssl/crypto/md5/md5test.c
+++ b/main/openssl/crypto/md5/md5test.c
diff --git a/openssl/crypto/mdc2/mdc2.h b/main/openssl/crypto/mdc2/mdc2.h
index 72778a52..72778a52 100644
--- a/openssl/crypto/mdc2/mdc2.h
+++ b/main/openssl/crypto/mdc2/mdc2.h
diff --git a/openssl/crypto/mdc2/mdc2_one.c b/main/openssl/crypto/mdc2/mdc2_one.c
index 72647f67..72647f67 100644
--- a/openssl/crypto/mdc2/mdc2_one.c
+++ b/main/openssl/crypto/mdc2/mdc2_one.c
diff --git a/openssl/crypto/mdc2/mdc2dgst.c b/main/openssl/crypto/mdc2/mdc2dgst.c
index 4aa406ed..4aa406ed 100644
--- a/openssl/crypto/mdc2/mdc2dgst.c
+++ b/main/openssl/crypto/mdc2/mdc2dgst.c
diff --git a/openssl/crypto/mdc2/mdc2test.c b/main/openssl/crypto/mdc2/mdc2test.c
index 017b31ad..017b31ad 100644
--- a/openssl/crypto/mdc2/mdc2test.c
+++ b/main/openssl/crypto/mdc2/mdc2test.c
diff --git a/openssl/crypto/mem.c b/main/openssl/crypto/mem.c
index 6f80dd33..6f80dd33 100644
--- a/openssl/crypto/mem.c
+++ b/main/openssl/crypto/mem.c
diff --git a/openssl/crypto/mem_clr.c b/main/openssl/crypto/mem_clr.c
index add1f780..add1f780 100644
--- a/openssl/crypto/mem_clr.c
+++ b/main/openssl/crypto/mem_clr.c
diff --git a/openssl/crypto/mem_dbg.c b/main/openssl/crypto/mem_dbg.c
index ac793397..ac793397 100644
--- a/openssl/crypto/mem_dbg.c
+++ b/main/openssl/crypto/mem_dbg.c
diff --git a/openssl/crypto/modes/cbc128.c b/main/openssl/crypto/modes/cbc128.c
index 8f8bd563..8f8bd563 100644
--- a/openssl/crypto/modes/cbc128.c
+++ b/main/openssl/crypto/modes/cbc128.c
diff --git a/openssl/crypto/modes/cfb128.c b/main/openssl/crypto/modes/cfb128.c
index e5938c61..e5938c61 100644
--- a/openssl/crypto/modes/cfb128.c
+++ b/main/openssl/crypto/modes/cfb128.c
diff --git a/openssl/crypto/modes/ctr128.c b/main/openssl/crypto/modes/ctr128.c
index 932037f5..932037f5 100644
--- a/openssl/crypto/modes/ctr128.c
+++ b/main/openssl/crypto/modes/ctr128.c
diff --git a/openssl/crypto/modes/ofb128.c b/main/openssl/crypto/modes/ofb128.c
index c732e2ec..c732e2ec 100644
--- a/openssl/crypto/modes/ofb128.c
+++ b/main/openssl/crypto/modes/ofb128.c
diff --git a/openssl/crypto/o_dir.c b/main/openssl/crypto/o_dir.c
index 42891ea4..42891ea4 100644
--- a/openssl/crypto/o_dir.c
+++ b/main/openssl/crypto/o_dir.c
diff --git a/openssl/crypto/o_dir.h b/main/openssl/crypto/o_dir.h
index 4b725c03..4b725c03 100644
--- a/openssl/crypto/o_dir.h
+++ b/main/openssl/crypto/o_dir.h
diff --git a/openssl/crypto/o_dir_test.c b/main/openssl/crypto/o_dir_test.c
index 3d75ecb0..3d75ecb0 100644
--- a/openssl/crypto/o_dir_test.c
+++ b/main/openssl/crypto/o_dir_test.c
diff --git a/openssl/crypto/o_str.c b/main/openssl/crypto/o_str.c
index 56104a6c..56104a6c 100644
--- a/openssl/crypto/o_str.c
+++ b/main/openssl/crypto/o_str.c
diff --git a/openssl/crypto/o_str.h b/main/openssl/crypto/o_str.h
index dfc98494..dfc98494 100644
--- a/openssl/crypto/o_str.h
+++ b/main/openssl/crypto/o_str.h
diff --git a/openssl/crypto/o_time.c b/main/openssl/crypto/o_time.c
index 9030fdef..9030fdef 100644
--- a/openssl/crypto/o_time.c
+++ b/main/openssl/crypto/o_time.c
diff --git a/openssl/crypto/o_time.h b/main/openssl/crypto/o_time.h
index e391da75..e391da75 100644
--- a/openssl/crypto/o_time.h
+++ b/main/openssl/crypto/o_time.h
diff --git a/openssl/crypto/objects/o_names.c b/main/openssl/crypto/objects/o_names.c
index 84380a96..84380a96 100644
--- a/openssl/crypto/objects/o_names.c
+++ b/main/openssl/crypto/objects/o_names.c
diff --git a/openssl/crypto/objects/obj_dat.c b/main/openssl/crypto/objects/obj_dat.c
index 8a342ba3..8a342ba3 100644
--- a/openssl/crypto/objects/obj_dat.c
+++ b/main/openssl/crypto/objects/obj_dat.c
diff --git a/openssl/crypto/objects/obj_dat.h b/main/openssl/crypto/objects/obj_dat.h
index 6449be60..6449be60 100644
--- a/openssl/crypto/objects/obj_dat.h
+++ b/main/openssl/crypto/objects/obj_dat.h
diff --git a/openssl/crypto/objects/obj_dat.pl b/main/openssl/crypto/objects/obj_dat.pl
index c67f71c3..c67f71c3 100644
--- a/openssl/crypto/objects/obj_dat.pl
+++ b/main/openssl/crypto/objects/obj_dat.pl
diff --git a/openssl/crypto/objects/obj_err.c b/main/openssl/crypto/objects/obj_err.c
index 2e7a034c..2e7a034c 100644
--- a/openssl/crypto/objects/obj_err.c
+++ b/main/openssl/crypto/objects/obj_err.c
diff --git a/openssl/crypto/objects/obj_lib.c b/main/openssl/crypto/objects/obj_lib.c
index 23e9d48c..23e9d48c 100644
--- a/openssl/crypto/objects/obj_lib.c
+++ b/main/openssl/crypto/objects/obj_lib.c
diff --git a/openssl/crypto/objects/obj_mac.h b/main/openssl/crypto/objects/obj_mac.h
index 282f11a8..282f11a8 100644
--- a/openssl/crypto/objects/obj_mac.h
+++ b/main/openssl/crypto/objects/obj_mac.h
diff --git a/openssl/crypto/objects/obj_mac.num b/main/openssl/crypto/objects/obj_mac.num
index 8c50aac2..8c50aac2 100644
--- a/openssl/crypto/objects/obj_mac.num
+++ b/main/openssl/crypto/objects/obj_mac.num
diff --git a/openssl/crypto/objects/obj_xref.c b/main/openssl/crypto/objects/obj_xref.c
index 152eca5c..152eca5c 100644
--- a/openssl/crypto/objects/obj_xref.c
+++ b/main/openssl/crypto/objects/obj_xref.c
diff --git a/openssl/crypto/objects/obj_xref.h b/main/openssl/crypto/objects/obj_xref.h
index d5b9b8e1..d5b9b8e1 100644
--- a/openssl/crypto/objects/obj_xref.h
+++ b/main/openssl/crypto/objects/obj_xref.h
diff --git a/openssl/crypto/objects/obj_xref.txt b/main/openssl/crypto/objects/obj_xref.txt
index e45b3d34..e45b3d34 100644
--- a/openssl/crypto/objects/obj_xref.txt
+++ b/main/openssl/crypto/objects/obj_xref.txt
diff --git a/openssl/crypto/objects/objects.README b/main/openssl/crypto/objects/objects.README
index 4d745508..4d745508 100644
--- a/openssl/crypto/objects/objects.README
+++ b/main/openssl/crypto/objects/objects.README
diff --git a/openssl/crypto/objects/objects.h b/main/openssl/crypto/objects/objects.h
index bd0ee52f..bd0ee52f 100644
--- a/openssl/crypto/objects/objects.h
+++ b/main/openssl/crypto/objects/objects.h
diff --git a/openssl/crypto/objects/objects.pl b/main/openssl/crypto/objects/objects.pl
index 15c00bbd..15c00bbd 100644
--- a/openssl/crypto/objects/objects.pl
+++ b/main/openssl/crypto/objects/objects.pl
diff --git a/openssl/crypto/objects/objects.txt b/main/openssl/crypto/objects/objects.txt
index e61fe60c..e61fe60c 100644
--- a/openssl/crypto/objects/objects.txt
+++ b/main/openssl/crypto/objects/objects.txt
diff --git a/openssl/crypto/objects/objxref.pl b/main/openssl/crypto/objects/objxref.pl
index 731d3ae2..731d3ae2 100644
--- a/openssl/crypto/objects/objxref.pl
+++ b/main/openssl/crypto/objects/objxref.pl
diff --git a/openssl/crypto/ocsp/ocsp.h b/main/openssl/crypto/ocsp/ocsp.h
index 31e45744..31e45744 100644
--- a/openssl/crypto/ocsp/ocsp.h
+++ b/main/openssl/crypto/ocsp/ocsp.h
diff --git a/openssl/crypto/ocsp/ocsp_asn.c b/main/openssl/crypto/ocsp/ocsp_asn.c
index bfe892ac..bfe892ac 100644
--- a/openssl/crypto/ocsp/ocsp_asn.c
+++ b/main/openssl/crypto/ocsp/ocsp_asn.c
diff --git a/openssl/crypto/ocsp/ocsp_cl.c b/main/openssl/crypto/ocsp/ocsp_cl.c
index 9c14d9da..9c14d9da 100644
--- a/openssl/crypto/ocsp/ocsp_cl.c
+++ b/main/openssl/crypto/ocsp/ocsp_cl.c
diff --git a/openssl/crypto/ocsp/ocsp_err.c b/main/openssl/crypto/ocsp/ocsp_err.c
index 0cedcea6..0cedcea6 100644
--- a/openssl/crypto/ocsp/ocsp_err.c
+++ b/main/openssl/crypto/ocsp/ocsp_err.c
diff --git a/openssl/crypto/ocsp/ocsp_ext.c b/main/openssl/crypto/ocsp/ocsp_ext.c
index ec884cb0..ec884cb0 100644
--- a/openssl/crypto/ocsp/ocsp_ext.c
+++ b/main/openssl/crypto/ocsp/ocsp_ext.c
diff --git a/openssl/crypto/ocsp/ocsp_ht.c b/main/openssl/crypto/ocsp/ocsp_ht.c
index af5fc166..af5fc166 100644
--- a/openssl/crypto/ocsp/ocsp_ht.c
+++ b/main/openssl/crypto/ocsp/ocsp_ht.c
diff --git a/openssl/crypto/ocsp/ocsp_lib.c b/main/openssl/crypto/ocsp/ocsp_lib.c
index e92b86c0..e92b86c0 100644
--- a/openssl/crypto/ocsp/ocsp_lib.c
+++ b/main/openssl/crypto/ocsp/ocsp_lib.c
diff --git a/openssl/crypto/ocsp/ocsp_prn.c b/main/openssl/crypto/ocsp/ocsp_prn.c
index 87608ff3..87608ff3 100644
--- a/openssl/crypto/ocsp/ocsp_prn.c
+++ b/main/openssl/crypto/ocsp/ocsp_prn.c
diff --git a/openssl/crypto/ocsp/ocsp_srv.c b/main/openssl/crypto/ocsp/ocsp_srv.c
index 1c606dd0..1c606dd0 100644
--- a/openssl/crypto/ocsp/ocsp_srv.c
+++ b/main/openssl/crypto/ocsp/ocsp_srv.c
diff --git a/openssl/crypto/ocsp/ocsp_vfy.c b/main/openssl/crypto/ocsp/ocsp_vfy.c
index 415d67e6..415d67e6 100644
--- a/openssl/crypto/ocsp/ocsp_vfy.c
+++ b/main/openssl/crypto/ocsp/ocsp_vfy.c
diff --git a/openssl/crypto/opensslconf.h b/main/openssl/crypto/opensslconf.h
index 26ac6ba3..26ac6ba3 100644
--- a/openssl/crypto/opensslconf.h
+++ b/main/openssl/crypto/opensslconf.h
diff --git a/openssl/crypto/opensslconf.h.in b/main/openssl/crypto/opensslconf.h.in
index 97e37455..97e37455 100644
--- a/openssl/crypto/opensslconf.h.in
+++ b/main/openssl/crypto/opensslconf.h.in
diff --git a/openssl/crypto/opensslv.h b/main/openssl/crypto/opensslv.h
index 310a3387..310a3387 100644
--- a/openssl/crypto/opensslv.h
+++ b/main/openssl/crypto/opensslv.h
diff --git a/openssl/crypto/ossl_typ.h b/main/openssl/crypto/ossl_typ.h
index 12bd7014..12bd7014 100644
--- a/openssl/crypto/ossl_typ.h
+++ b/main/openssl/crypto/ossl_typ.h
diff --git a/openssl/crypto/pem/message b/main/openssl/crypto/pem/message
index e8bf9d75..e8bf9d75 100644
--- a/openssl/crypto/pem/message
+++ b/main/openssl/crypto/pem/message
diff --git a/openssl/crypto/pem/pem.h b/main/openssl/crypto/pem/pem.h
index 8a6ababe..8a6ababe 100644
--- a/openssl/crypto/pem/pem.h
+++ b/main/openssl/crypto/pem/pem.h
diff --git a/openssl/crypto/pem/pem2.h b/main/openssl/crypto/pem/pem2.h
index f31790d6..f31790d6 100644
--- a/openssl/crypto/pem/pem2.h
+++ b/main/openssl/crypto/pem/pem2.h
diff --git a/openssl/crypto/pem/pem_all.c b/main/openssl/crypto/pem/pem_all.c
index 3e7a6093..3e7a6093 100644
--- a/openssl/crypto/pem/pem_all.c
+++ b/main/openssl/crypto/pem/pem_all.c
diff --git a/openssl/crypto/pem/pem_err.c b/main/openssl/crypto/pem/pem_err.c
index d644aeed..d644aeed 100644
--- a/openssl/crypto/pem/pem_err.c
+++ b/main/openssl/crypto/pem/pem_err.c
diff --git a/openssl/crypto/pem/pem_info.c b/main/openssl/crypto/pem/pem_info.c
index 1b2be527..1b2be527 100644
--- a/openssl/crypto/pem/pem_info.c
+++ b/main/openssl/crypto/pem/pem_info.c
diff --git a/openssl/crypto/pem/pem_lib.c b/main/openssl/crypto/pem/pem_lib.c
index cfc89a99..cfc89a99 100644
--- a/openssl/crypto/pem/pem_lib.c
+++ b/main/openssl/crypto/pem/pem_lib.c
diff --git a/openssl/crypto/pem/pem_oth.c b/main/openssl/crypto/pem/pem_oth.c
index b33868d2..b33868d2 100644
--- a/openssl/crypto/pem/pem_oth.c
+++ b/main/openssl/crypto/pem/pem_oth.c
diff --git a/openssl/crypto/pem/pem_pk8.c b/main/openssl/crypto/pem/pem_pk8.c
index 6deab8c3..6deab8c3 100644
--- a/openssl/crypto/pem/pem_pk8.c
+++ b/main/openssl/crypto/pem/pem_pk8.c
diff --git a/openssl/crypto/pem/pem_pkey.c b/main/openssl/crypto/pem/pem_pkey.c
index 8ecf2490..8ecf2490 100644
--- a/openssl/crypto/pem/pem_pkey.c
+++ b/main/openssl/crypto/pem/pem_pkey.c
diff --git a/openssl/crypto/pem/pem_seal.c b/main/openssl/crypto/pem/pem_seal.c
index 59690b56..59690b56 100644
--- a/openssl/crypto/pem/pem_seal.c
+++ b/main/openssl/crypto/pem/pem_seal.c
diff --git a/openssl/crypto/pem/pem_sign.c b/main/openssl/crypto/pem/pem_sign.c
index c3b9808c..c3b9808c 100644
--- a/openssl/crypto/pem/pem_sign.c
+++ b/main/openssl/crypto/pem/pem_sign.c
diff --git a/openssl/crypto/pem/pem_x509.c b/main/openssl/crypto/pem/pem_x509.c
index b531057d..b531057d 100644
--- a/openssl/crypto/pem/pem_x509.c
+++ b/main/openssl/crypto/pem/pem_x509.c
diff --git a/openssl/crypto/pem/pem_xaux.c b/main/openssl/crypto/pem/pem_xaux.c
index 328f7962..328f7962 100644
--- a/openssl/crypto/pem/pem_xaux.c
+++ b/main/openssl/crypto/pem/pem_xaux.c
diff --git a/openssl/crypto/pem/pkcs7.lis b/main/openssl/crypto/pem/pkcs7.lis
index be90c5d8..be90c5d8 100644
--- a/openssl/crypto/pem/pkcs7.lis
+++ b/main/openssl/crypto/pem/pkcs7.lis
diff --git a/openssl/crypto/pem/pvkfmt.c b/main/openssl/crypto/pem/pvkfmt.c
index 5f130c45..5f130c45 100644
--- a/openssl/crypto/pem/pvkfmt.c
+++ b/main/openssl/crypto/pem/pvkfmt.c
diff --git a/openssl/crypto/perlasm/cbc.pl b/main/openssl/crypto/perlasm/cbc.pl
index 6fc25109..6fc25109 100644
--- a/openssl/crypto/perlasm/cbc.pl
+++ b/main/openssl/crypto/perlasm/cbc.pl
diff --git a/openssl/crypto/perlasm/ppc-xlate.pl b/main/openssl/crypto/perlasm/ppc-xlate.pl
index 4579671c..4579671c 100755
--- a/openssl/crypto/perlasm/ppc-xlate.pl
+++ b/main/openssl/crypto/perlasm/ppc-xlate.pl
diff --git a/openssl/crypto/perlasm/readme b/main/openssl/crypto/perlasm/readme
index f02bbee7..f02bbee7 100644
--- a/openssl/crypto/perlasm/readme
+++ b/main/openssl/crypto/perlasm/readme
diff --git a/openssl/crypto/perlasm/x86_64-xlate.pl b/main/openssl/crypto/perlasm/x86_64-xlate.pl
index e47116b7..e47116b7 100755
--- a/openssl/crypto/perlasm/x86_64-xlate.pl
+++ b/main/openssl/crypto/perlasm/x86_64-xlate.pl
diff --git a/openssl/crypto/perlasm/x86asm.pl b/main/openssl/crypto/perlasm/x86asm.pl
index 28080caa..28080caa 100644
--- a/openssl/crypto/perlasm/x86asm.pl
+++ b/main/openssl/crypto/perlasm/x86asm.pl
diff --git a/openssl/crypto/perlasm/x86gas.pl b/main/openssl/crypto/perlasm/x86gas.pl
index 6eab727f..6eab727f 100644
--- a/openssl/crypto/perlasm/x86gas.pl
+++ b/main/openssl/crypto/perlasm/x86gas.pl
diff --git a/openssl/crypto/perlasm/x86masm.pl b/main/openssl/crypto/perlasm/x86masm.pl
index 3d50e4a7..3d50e4a7 100644
--- a/openssl/crypto/perlasm/x86masm.pl
+++ b/main/openssl/crypto/perlasm/x86masm.pl
diff --git a/openssl/crypto/perlasm/x86nasm.pl b/main/openssl/crypto/perlasm/x86nasm.pl
index ce2bed9b..ce2bed9b 100644
--- a/openssl/crypto/perlasm/x86nasm.pl
+++ b/main/openssl/crypto/perlasm/x86nasm.pl
diff --git a/openssl/crypto/pkcs12/p12_add.c b/main/openssl/crypto/pkcs12/p12_add.c
index 27ac5fac..27ac5fac 100644
--- a/openssl/crypto/pkcs12/p12_add.c
+++ b/main/openssl/crypto/pkcs12/p12_add.c
diff --git a/openssl/crypto/pkcs12/p12_asn.c b/main/openssl/crypto/pkcs12/p12_asn.c
index 6e276338..6e276338 100644
--- a/openssl/crypto/pkcs12/p12_asn.c
+++ b/main/openssl/crypto/pkcs12/p12_asn.c
diff --git a/openssl/crypto/pkcs12/p12_attr.c b/main/openssl/crypto/pkcs12/p12_attr.c
index e4d9c256..e4d9c256 100644
--- a/openssl/crypto/pkcs12/p12_attr.c
+++ b/main/openssl/crypto/pkcs12/p12_attr.c
diff --git a/openssl/crypto/pkcs12/p12_crpt.c b/main/openssl/crypto/pkcs12/p12_crpt.c
index b71d07b4..b71d07b4 100644
--- a/openssl/crypto/pkcs12/p12_crpt.c
+++ b/main/openssl/crypto/pkcs12/p12_crpt.c
diff --git a/openssl/crypto/pkcs12/p12_crt.c b/main/openssl/crypto/pkcs12/p12_crt.c
index 96b131de..96b131de 100644
--- a/openssl/crypto/pkcs12/p12_crt.c
+++ b/main/openssl/crypto/pkcs12/p12_crt.c
diff --git a/openssl/crypto/pkcs12/p12_decr.c b/main/openssl/crypto/pkcs12/p12_decr.c
index ba77dbbe..ba77dbbe 100644
--- a/openssl/crypto/pkcs12/p12_decr.c
+++ b/main/openssl/crypto/pkcs12/p12_decr.c
diff --git a/openssl/crypto/pkcs12/p12_init.c b/main/openssl/crypto/pkcs12/p12_init.c
index d4d84b05..d4d84b05 100644
--- a/openssl/crypto/pkcs12/p12_init.c
+++ b/main/openssl/crypto/pkcs12/p12_init.c
diff --git a/openssl/crypto/pkcs12/p12_key.c b/main/openssl/crypto/pkcs12/p12_key.c
index 424203f6..424203f6 100644
--- a/openssl/crypto/pkcs12/p12_key.c
+++ b/main/openssl/crypto/pkcs12/p12_key.c
diff --git a/openssl/crypto/pkcs12/p12_kiss.c b/main/openssl/crypto/pkcs12/p12_kiss.c
index 292cc3ed..292cc3ed 100644
--- a/openssl/crypto/pkcs12/p12_kiss.c
+++ b/main/openssl/crypto/pkcs12/p12_kiss.c
diff --git a/openssl/crypto/pkcs12/p12_mutl.c b/main/openssl/crypto/pkcs12/p12_mutl.c
index 9ab740d5..9ab740d5 100644
--- a/openssl/crypto/pkcs12/p12_mutl.c
+++ b/main/openssl/crypto/pkcs12/p12_mutl.c
diff --git a/openssl/crypto/pkcs12/p12_npas.c b/main/openssl/crypto/pkcs12/p12_npas.c
index 2f713551..2f713551 100644
--- a/openssl/crypto/pkcs12/p12_npas.c
+++ b/main/openssl/crypto/pkcs12/p12_npas.c
diff --git a/openssl/crypto/pkcs12/p12_p8d.c b/main/openssl/crypto/pkcs12/p12_p8d.c
index deba81e4..deba81e4 100644
--- a/openssl/crypto/pkcs12/p12_p8d.c
+++ b/main/openssl/crypto/pkcs12/p12_p8d.c
diff --git a/openssl/crypto/pkcs12/p12_p8e.c b/main/openssl/crypto/pkcs12/p12_p8e.c
index bf20a77b..bf20a77b 100644
--- a/openssl/crypto/pkcs12/p12_p8e.c
+++ b/main/openssl/crypto/pkcs12/p12_p8e.c
diff --git a/openssl/crypto/pkcs12/p12_utl.c b/main/openssl/crypto/pkcs12/p12_utl.c
index 59c6f453..59c6f453 100644
--- a/openssl/crypto/pkcs12/p12_utl.c
+++ b/main/openssl/crypto/pkcs12/p12_utl.c
diff --git a/openssl/crypto/pkcs12/pk12err.c b/main/openssl/crypto/pkcs12/pk12err.c
index f6ddf2df..f6ddf2df 100644
--- a/openssl/crypto/pkcs12/pk12err.c
+++ b/main/openssl/crypto/pkcs12/pk12err.c
diff --git a/openssl/crypto/pkcs12/pkcs12.h b/main/openssl/crypto/pkcs12/pkcs12.h
index b17eb9f4..b17eb9f4 100644
--- a/openssl/crypto/pkcs12/pkcs12.h
+++ b/main/openssl/crypto/pkcs12/pkcs12.h
diff --git a/openssl/crypto/pkcs7/bio_ber.c b/main/openssl/crypto/pkcs7/bio_ber.c
index 31973fcd..31973fcd 100644
--- a/openssl/crypto/pkcs7/bio_ber.c
+++ b/main/openssl/crypto/pkcs7/bio_ber.c
diff --git a/openssl/crypto/pkcs7/dec.c b/main/openssl/crypto/pkcs7/dec.c
index 6752ec56..6752ec56 100644
--- a/openssl/crypto/pkcs7/dec.c
+++ b/main/openssl/crypto/pkcs7/dec.c
diff --git a/openssl/crypto/pkcs7/des.pem b/main/openssl/crypto/pkcs7/des.pem
index 62d1657e..62d1657e 100644
--- a/openssl/crypto/pkcs7/des.pem
+++ b/main/openssl/crypto/pkcs7/des.pem
diff --git a/openssl/crypto/pkcs7/doc b/main/openssl/crypto/pkcs7/doc
index d2e8b7b2..d2e8b7b2 100644
--- a/openssl/crypto/pkcs7/doc
+++ b/main/openssl/crypto/pkcs7/doc
diff --git a/openssl/crypto/pkcs7/enc.c b/main/openssl/crypto/pkcs7/enc.c
index 7417f8a4..7417f8a4 100644
--- a/openssl/crypto/pkcs7/enc.c
+++ b/main/openssl/crypto/pkcs7/enc.c
diff --git a/openssl/crypto/pkcs7/es1.pem b/main/openssl/crypto/pkcs7/es1.pem
index 47112a23..47112a23 100644
--- a/openssl/crypto/pkcs7/es1.pem
+++ b/main/openssl/crypto/pkcs7/es1.pem
diff --git a/openssl/crypto/pkcs7/example.c b/main/openssl/crypto/pkcs7/example.c
index 2953d04b..2953d04b 100644
--- a/openssl/crypto/pkcs7/example.c
+++ b/main/openssl/crypto/pkcs7/example.c
diff --git a/openssl/crypto/pkcs7/example.h b/main/openssl/crypto/pkcs7/example.h
index 96167de1..96167de1 100644
--- a/openssl/crypto/pkcs7/example.h
+++ b/main/openssl/crypto/pkcs7/example.h
diff --git a/openssl/crypto/pkcs7/info.pem b/main/openssl/crypto/pkcs7/info.pem
index 989baf87..989baf87 100644
--- a/openssl/crypto/pkcs7/info.pem
+++ b/main/openssl/crypto/pkcs7/info.pem
diff --git a/openssl/crypto/pkcs7/infokey.pem b/main/openssl/crypto/pkcs7/infokey.pem
index 1e2acc95..1e2acc95 100644
--- a/openssl/crypto/pkcs7/infokey.pem
+++ b/main/openssl/crypto/pkcs7/infokey.pem
diff --git a/openssl/crypto/pkcs7/p7/a1 b/main/openssl/crypto/pkcs7/p7/a1
index 56ca9437..56ca9437 100644
--- a/openssl/crypto/pkcs7/p7/a1
+++ b/main/openssl/crypto/pkcs7/p7/a1
diff --git a/openssl/crypto/pkcs7/p7/a2 b/main/openssl/crypto/pkcs7/p7/a2
index 23d8fb5e..23d8fb5e 100644
--- a/openssl/crypto/pkcs7/p7/a2
+++ b/main/openssl/crypto/pkcs7/p7/a2
diff --git a/openssl/crypto/pkcs7/p7/cert.p7c b/main/openssl/crypto/pkcs7/p7/cert.p7c
index 2b75ec05..2b75ec05 100644
--- a/openssl/crypto/pkcs7/p7/cert.p7c
+++ b/main/openssl/crypto/pkcs7/p7/cert.p7c
diff --git a/openssl/crypto/pkcs7/p7/smime.p7m b/main/openssl/crypto/pkcs7/p7/smime.p7m
index 2b6e6f82..2b6e6f82 100644
--- a/openssl/crypto/pkcs7/p7/smime.p7m
+++ b/main/openssl/crypto/pkcs7/p7/smime.p7m
diff --git a/openssl/crypto/pkcs7/p7/smime.p7s b/main/openssl/crypto/pkcs7/p7/smime.p7s
index 2b5d4fb0..2b5d4fb0 100644
--- a/openssl/crypto/pkcs7/p7/smime.p7s
+++ b/main/openssl/crypto/pkcs7/p7/smime.p7s
diff --git a/openssl/crypto/pkcs7/pk7_asn1.c b/main/openssl/crypto/pkcs7/pk7_asn1.c
index b7ec2883..b7ec2883 100644
--- a/openssl/crypto/pkcs7/pk7_asn1.c
+++ b/main/openssl/crypto/pkcs7/pk7_asn1.c
diff --git a/openssl/crypto/pkcs7/pk7_attr.c b/main/openssl/crypto/pkcs7/pk7_attr.c
index a97db512..a97db512 100644
--- a/openssl/crypto/pkcs7/pk7_attr.c
+++ b/main/openssl/crypto/pkcs7/pk7_attr.c
diff --git a/openssl/crypto/pkcs7/pk7_dgst.c b/main/openssl/crypto/pkcs7/pk7_dgst.c
index 90edfa50..90edfa50 100644
--- a/openssl/crypto/pkcs7/pk7_dgst.c
+++ b/main/openssl/crypto/pkcs7/pk7_dgst.c
diff --git a/openssl/crypto/pkcs7/pk7_doit.c b/main/openssl/crypto/pkcs7/pk7_doit.c
index 3bf1a367..3bf1a367 100644
--- a/openssl/crypto/pkcs7/pk7_doit.c
+++ b/main/openssl/crypto/pkcs7/pk7_doit.c
diff --git a/openssl/crypto/pkcs7/pk7_enc.c b/main/openssl/crypto/pkcs7/pk7_enc.c
index acbb189c..acbb189c 100644
--- a/openssl/crypto/pkcs7/pk7_enc.c
+++ b/main/openssl/crypto/pkcs7/pk7_enc.c
diff --git a/openssl/crypto/pkcs7/pk7_lib.c b/main/openssl/crypto/pkcs7/pk7_lib.c
index d411269b..d411269b 100644
--- a/openssl/crypto/pkcs7/pk7_lib.c
+++ b/main/openssl/crypto/pkcs7/pk7_lib.c
diff --git a/openssl/crypto/pkcs7/pk7_mime.c b/main/openssl/crypto/pkcs7/pk7_mime.c
index 938f79a6..938f79a6 100644
--- a/openssl/crypto/pkcs7/pk7_mime.c
+++ b/main/openssl/crypto/pkcs7/pk7_mime.c
diff --git a/openssl/crypto/pkcs7/pk7_smime.c b/main/openssl/crypto/pkcs7/pk7_smime.c
index 86742d0d..86742d0d 100644
--- a/openssl/crypto/pkcs7/pk7_smime.c
+++ b/main/openssl/crypto/pkcs7/pk7_smime.c
diff --git a/openssl/crypto/pkcs7/pkcs7.h b/main/openssl/crypto/pkcs7/pkcs7.h
index e4d44319..e4d44319 100644
--- a/openssl/crypto/pkcs7/pkcs7.h
+++ b/main/openssl/crypto/pkcs7/pkcs7.h
diff --git a/openssl/crypto/pkcs7/pkcs7err.c b/main/openssl/crypto/pkcs7/pkcs7err.c
index d0af32a2..d0af32a2 100644
--- a/openssl/crypto/pkcs7/pkcs7err.c
+++ b/main/openssl/crypto/pkcs7/pkcs7err.c
diff --git a/openssl/crypto/pkcs7/server.pem b/main/openssl/crypto/pkcs7/server.pem
index 750aac20..750aac20 100644
--- a/openssl/crypto/pkcs7/server.pem
+++ b/main/openssl/crypto/pkcs7/server.pem
diff --git a/openssl/crypto/pkcs7/sign.c b/main/openssl/crypto/pkcs7/sign.c
index 8b59885f..8b59885f 100644
--- a/openssl/crypto/pkcs7/sign.c
+++ b/main/openssl/crypto/pkcs7/sign.c
diff --git a/openssl/crypto/pkcs7/t/3des.pem b/main/openssl/crypto/pkcs7/t/3des.pem
index b2b5081a..b2b5081a 100644
--- a/openssl/crypto/pkcs7/t/3des.pem
+++ b/main/openssl/crypto/pkcs7/t/3des.pem
diff --git a/openssl/crypto/pkcs7/t/3dess.pem b/main/openssl/crypto/pkcs7/t/3dess.pem
index 23f01351..23f01351 100644
--- a/openssl/crypto/pkcs7/t/3dess.pem
+++ b/main/openssl/crypto/pkcs7/t/3dess.pem
diff --git a/openssl/crypto/pkcs7/t/c.pem b/main/openssl/crypto/pkcs7/t/c.pem
index a4b55e32..a4b55e32 100644
--- a/openssl/crypto/pkcs7/t/c.pem
+++ b/main/openssl/crypto/pkcs7/t/c.pem
diff --git a/openssl/crypto/pkcs7/t/ff b/main/openssl/crypto/pkcs7/t/ff
index 23f01351..23f01351 100644
--- a/openssl/crypto/pkcs7/t/ff
+++ b/main/openssl/crypto/pkcs7/t/ff
diff --git a/openssl/crypto/pkcs7/t/msie-e b/main/openssl/crypto/pkcs7/t/msie-e
index aafae69f..aafae69f 100644
--- a/openssl/crypto/pkcs7/t/msie-e
+++ b/main/openssl/crypto/pkcs7/t/msie-e
diff --git a/openssl/crypto/pkcs7/t/msie-e.pem b/main/openssl/crypto/pkcs7/t/msie-e.pem
index a2a5e24e..a2a5e24e 100644
--- a/openssl/crypto/pkcs7/t/msie-e.pem
+++ b/main/openssl/crypto/pkcs7/t/msie-e.pem
diff --git a/openssl/crypto/pkcs7/t/msie-enc-01 b/main/openssl/crypto/pkcs7/t/msie-enc-01
index 2c93ab64..2c93ab64 100644
--- a/openssl/crypto/pkcs7/t/msie-enc-01
+++ b/main/openssl/crypto/pkcs7/t/msie-enc-01
diff --git a/openssl/crypto/pkcs7/t/msie-enc-01.pem b/main/openssl/crypto/pkcs7/t/msie-enc-01.pem
index 9abf00b2..9abf00b2 100644
--- a/openssl/crypto/pkcs7/t/msie-enc-01.pem
+++ b/main/openssl/crypto/pkcs7/t/msie-enc-01.pem
diff --git a/openssl/crypto/pkcs7/t/msie-enc-02 b/main/openssl/crypto/pkcs7/t/msie-enc-02
index 70170559..70170559 100644
--- a/openssl/crypto/pkcs7/t/msie-enc-02
+++ b/main/openssl/crypto/pkcs7/t/msie-enc-02
diff --git a/openssl/crypto/pkcs7/t/msie-enc-02.pem b/main/openssl/crypto/pkcs7/t/msie-enc-02.pem
index 279c5d83..279c5d83 100644
--- a/openssl/crypto/pkcs7/t/msie-enc-02.pem
+++ b/main/openssl/crypto/pkcs7/t/msie-enc-02.pem
diff --git a/openssl/crypto/pkcs7/t/msie-s-a-e b/main/openssl/crypto/pkcs7/t/msie-s-a-e
index 0067794d..0067794d 100644
--- a/openssl/crypto/pkcs7/t/msie-s-a-e
+++ b/main/openssl/crypto/pkcs7/t/msie-s-a-e
diff --git a/openssl/crypto/pkcs7/t/msie-s-a-e.pem b/main/openssl/crypto/pkcs7/t/msie-s-a-e.pem
index 55dbd8f8..55dbd8f8 100644
--- a/openssl/crypto/pkcs7/t/msie-s-a-e.pem
+++ b/main/openssl/crypto/pkcs7/t/msie-s-a-e.pem
diff --git a/openssl/crypto/pkcs7/t/nav-smime b/main/openssl/crypto/pkcs7/t/nav-smime
index 6ee4b597..6ee4b597 100644
--- a/openssl/crypto/pkcs7/t/nav-smime
+++ b/main/openssl/crypto/pkcs7/t/nav-smime
diff --git a/openssl/crypto/pkcs7/t/s.pem b/main/openssl/crypto/pkcs7/t/s.pem
index 4fa925b1..4fa925b1 100644
--- a/openssl/crypto/pkcs7/t/s.pem
+++ b/main/openssl/crypto/pkcs7/t/s.pem
diff --git a/openssl/crypto/pkcs7/t/server.pem b/main/openssl/crypto/pkcs7/t/server.pem
index 989baf87..989baf87 100644
--- a/openssl/crypto/pkcs7/t/server.pem
+++ b/main/openssl/crypto/pkcs7/t/server.pem
diff --git a/openssl/crypto/pkcs7/verify.c b/main/openssl/crypto/pkcs7/verify.c
index b40f2603..b40f2603 100644
--- a/openssl/crypto/pkcs7/verify.c
+++ b/main/openssl/crypto/pkcs7/verify.c
diff --git a/openssl/crypto/ppccpuid.pl b/main/openssl/crypto/ppccpuid.pl
index 369e1d0d..369e1d0d 100755
--- a/openssl/crypto/ppccpuid.pl
+++ b/main/openssl/crypto/ppccpuid.pl
diff --git a/openssl/crypto/pqueue/pq_test.c b/main/openssl/crypto/pqueue/pq_test.c
index 8d496dfc..8d496dfc 100644
--- a/openssl/crypto/pqueue/pq_test.c
+++ b/main/openssl/crypto/pqueue/pq_test.c
diff --git a/openssl/crypto/pqueue/pqueue.c b/main/openssl/crypto/pqueue/pqueue.c
index eab13a12..eab13a12 100644
--- a/openssl/crypto/pqueue/pqueue.c
+++ b/main/openssl/crypto/pqueue/pqueue.c
diff --git a/openssl/crypto/pqueue/pqueue.h b/main/openssl/crypto/pqueue/pqueue.h
index 87fc9037..87fc9037 100644
--- a/openssl/crypto/pqueue/pqueue.h
+++ b/main/openssl/crypto/pqueue/pqueue.h
diff --git a/openssl/crypto/rand/md_rand.c b/main/openssl/crypto/rand/md_rand.c
index b2f04ff1..b2f04ff1 100644
--- a/openssl/crypto/rand/md_rand.c
+++ b/main/openssl/crypto/rand/md_rand.c
diff --git a/openssl/crypto/rand/rand.h b/main/openssl/crypto/rand/rand.h
index ac6c0217..ac6c0217 100644
--- a/openssl/crypto/rand/rand.h
+++ b/main/openssl/crypto/rand/rand.h
diff --git a/openssl/crypto/rand/rand_egd.c b/main/openssl/crypto/rand/rand_egd.c
index d53b916e..d53b916e 100644
--- a/openssl/crypto/rand/rand_egd.c
+++ b/main/openssl/crypto/rand/rand_egd.c
diff --git a/openssl/crypto/rand/rand_err.c b/main/openssl/crypto/rand/rand_err.c
index 03cda4dd..03cda4dd 100644
--- a/openssl/crypto/rand/rand_err.c
+++ b/main/openssl/crypto/rand/rand_err.c
diff --git a/openssl/crypto/rand/rand_lcl.h b/main/openssl/crypto/rand/rand_lcl.h
index 618a8ec8..618a8ec8 100644
--- a/openssl/crypto/rand/rand_lcl.h
+++ b/main/openssl/crypto/rand/rand_lcl.h
diff --git a/openssl/crypto/rand/rand_lib.c b/main/openssl/crypto/rand/rand_lib.c
index 513e3389..513e3389 100644
--- a/openssl/crypto/rand/rand_lib.c
+++ b/main/openssl/crypto/rand/rand_lib.c
diff --git a/openssl/crypto/rand/rand_nw.c b/main/openssl/crypto/rand/rand_nw.c
index 8d5b8d2e..8d5b8d2e 100644
--- a/openssl/crypto/rand/rand_nw.c
+++ b/main/openssl/crypto/rand/rand_nw.c
diff --git a/openssl/crypto/rand/rand_os2.c b/main/openssl/crypto/rand/rand_os2.c
index fc1e78b1..fc1e78b1 100644
--- a/openssl/crypto/rand/rand_os2.c
+++ b/main/openssl/crypto/rand/rand_os2.c
diff --git a/openssl/crypto/rand/rand_unix.c b/main/openssl/crypto/rand/rand_unix.c
index e9ead3a5..e9ead3a5 100644
--- a/openssl/crypto/rand/rand_unix.c
+++ b/main/openssl/crypto/rand/rand_unix.c
diff --git a/openssl/crypto/rand/rand_win.c b/main/openssl/crypto/rand/rand_win.c
index 5d134e18..5d134e18 100644
--- a/openssl/crypto/rand/rand_win.c
+++ b/main/openssl/crypto/rand/rand_win.c
diff --git a/openssl/crypto/rand/randfile.c b/main/openssl/crypto/rand/randfile.c
index bc7d9c58..bc7d9c58 100644
--- a/openssl/crypto/rand/randfile.c
+++ b/main/openssl/crypto/rand/randfile.c
diff --git a/openssl/crypto/rand/randtest.c b/main/openssl/crypto/rand/randtest.c
index 9e92a70b..9e92a70b 100644
--- a/openssl/crypto/rand/randtest.c
+++ b/main/openssl/crypto/rand/randtest.c
diff --git a/openssl/crypto/rc2/rc2.h b/main/openssl/crypto/rc2/rc2.h
index 34c83623..34c83623 100644
--- a/openssl/crypto/rc2/rc2.h
+++ b/main/openssl/crypto/rc2/rc2.h
diff --git a/openssl/crypto/rc2/rc2_cbc.c b/main/openssl/crypto/rc2/rc2_cbc.c
index 74f48d3d..74f48d3d 100644
--- a/openssl/crypto/rc2/rc2_cbc.c
+++ b/main/openssl/crypto/rc2/rc2_cbc.c
diff --git a/openssl/crypto/rc2/rc2_ecb.c b/main/openssl/crypto/rc2/rc2_ecb.c
index fff86c7a..fff86c7a 100644
--- a/openssl/crypto/rc2/rc2_ecb.c
+++ b/main/openssl/crypto/rc2/rc2_ecb.c
diff --git a/openssl/crypto/rc2/rc2_locl.h b/main/openssl/crypto/rc2/rc2_locl.h
index 565cd176..565cd176 100644
--- a/openssl/crypto/rc2/rc2_locl.h
+++ b/main/openssl/crypto/rc2/rc2_locl.h
diff --git a/openssl/crypto/rc2/rc2_skey.c b/main/openssl/crypto/rc2/rc2_skey.c
index 0150b0e0..0150b0e0 100644
--- a/openssl/crypto/rc2/rc2_skey.c
+++ b/main/openssl/crypto/rc2/rc2_skey.c
diff --git a/openssl/crypto/rc2/rc2cfb64.c b/main/openssl/crypto/rc2/rc2cfb64.c
index b3a0158a..b3a0158a 100644
--- a/openssl/crypto/rc2/rc2cfb64.c
+++ b/main/openssl/crypto/rc2/rc2cfb64.c
diff --git a/openssl/crypto/rc2/rc2ofb64.c b/main/openssl/crypto/rc2/rc2ofb64.c
index 9e297867..9e297867 100644
--- a/openssl/crypto/rc2/rc2ofb64.c
+++ b/main/openssl/crypto/rc2/rc2ofb64.c
diff --git a/openssl/crypto/rc2/rc2speed.c b/main/openssl/crypto/rc2/rc2speed.c
index 85cf6f65..85cf6f65 100644
--- a/openssl/crypto/rc2/rc2speed.c
+++ b/main/openssl/crypto/rc2/rc2speed.c
diff --git a/openssl/crypto/rc2/rc2test.c b/main/openssl/crypto/rc2/rc2test.c
index 0e117436..0e117436 100644
--- a/openssl/crypto/rc2/rc2test.c
+++ b/main/openssl/crypto/rc2/rc2test.c
diff --git a/openssl/crypto/rc2/rrc2.doc b/main/openssl/crypto/rc2/rrc2.doc
index f93ee003..f93ee003 100644
--- a/openssl/crypto/rc2/rrc2.doc
+++ b/main/openssl/crypto/rc2/rrc2.doc
diff --git a/openssl/crypto/rc2/tab.c b/main/openssl/crypto/rc2/tab.c
index 25dc14ee..25dc14ee 100644
--- a/openssl/crypto/rc2/tab.c
+++ b/main/openssl/crypto/rc2/tab.c
diff --git a/openssl/crypto/rc2/version b/main/openssl/crypto/rc2/version
index 6f89d595..6f89d595 100644
--- a/openssl/crypto/rc2/version
+++ b/main/openssl/crypto/rc2/version
diff --git a/openssl/crypto/rc4/asm/rc4-586.pl b/main/openssl/crypto/rc4/asm/rc4-586.pl
index 38a44a70..38a44a70 100644
--- a/openssl/crypto/rc4/asm/rc4-586.pl
+++ b/main/openssl/crypto/rc4/asm/rc4-586.pl
diff --git a/openssl/crypto/rc4/asm/rc4-ia64.pl b/main/openssl/crypto/rc4/asm/rc4-ia64.pl
index 49cd5b5e..49cd5b5e 100644
--- a/openssl/crypto/rc4/asm/rc4-ia64.pl
+++ b/main/openssl/crypto/rc4/asm/rc4-ia64.pl
diff --git a/openssl/crypto/rc4/asm/rc4-s390x.pl b/main/openssl/crypto/rc4/asm/rc4-s390x.pl
index 96681fa0..96681fa0 100644
--- a/openssl/crypto/rc4/asm/rc4-s390x.pl
+++ b/main/openssl/crypto/rc4/asm/rc4-s390x.pl
diff --git a/openssl/crypto/rc4/asm/rc4-x86_64.pl b/main/openssl/crypto/rc4/asm/rc4-x86_64.pl
index 677be5fe..677be5fe 100755
--- a/openssl/crypto/rc4/asm/rc4-x86_64.pl
+++ b/main/openssl/crypto/rc4/asm/rc4-x86_64.pl
diff --git a/openssl/crypto/rc4/rc4.c b/main/openssl/crypto/rc4/rc4.c
index c900b260..c900b260 100644
--- a/openssl/crypto/rc4/rc4.c
+++ b/main/openssl/crypto/rc4/rc4.c
diff --git a/openssl/crypto/rc4/rc4.h b/main/openssl/crypto/rc4/rc4.h
index 29d1accc..29d1accc 100644
--- a/openssl/crypto/rc4/rc4.h
+++ b/main/openssl/crypto/rc4/rc4.h
diff --git a/openssl/crypto/rc4/rc4_enc.c b/main/openssl/crypto/rc4/rc4_enc.c
index 8c4fc6c7..8c4fc6c7 100644
--- a/openssl/crypto/rc4/rc4_enc.c
+++ b/main/openssl/crypto/rc4/rc4_enc.c
diff --git a/openssl/crypto/rc4/rc4_locl.h b/main/openssl/crypto/rc4/rc4_locl.h
index c712e163..c712e163 100644
--- a/openssl/crypto/rc4/rc4_locl.h
+++ b/main/openssl/crypto/rc4/rc4_locl.h
diff --git a/openssl/crypto/rc4/rc4_skey.c b/main/openssl/crypto/rc4/rc4_skey.c
index b22c40b0..b22c40b0 100644
--- a/openssl/crypto/rc4/rc4_skey.c
+++ b/main/openssl/crypto/rc4/rc4_skey.c
diff --git a/openssl/crypto/rc4/rc4s.cpp b/main/openssl/crypto/rc4/rc4s.cpp
index 3814fde9..3814fde9 100644
--- a/openssl/crypto/rc4/rc4s.cpp
+++ b/main/openssl/crypto/rc4/rc4s.cpp
diff --git a/openssl/crypto/rc4/rc4speed.c b/main/openssl/crypto/rc4/rc4speed.c
index 0ebd3812..0ebd3812 100644
--- a/openssl/crypto/rc4/rc4speed.c
+++ b/main/openssl/crypto/rc4/rc4speed.c
diff --git a/openssl/crypto/rc4/rc4test.c b/main/openssl/crypto/rc4/rc4test.c
index 633a79e7..633a79e7 100644
--- a/openssl/crypto/rc4/rc4test.c
+++ b/main/openssl/crypto/rc4/rc4test.c
diff --git a/openssl/crypto/rc4/rrc4.doc b/main/openssl/crypto/rc4/rrc4.doc
index 2f9a953c..2f9a953c 100644
--- a/openssl/crypto/rc4/rrc4.doc
+++ b/main/openssl/crypto/rc4/rrc4.doc
diff --git a/openssl/crypto/ripemd/README b/main/openssl/crypto/ripemd/README
index f1ffc8b1..f1ffc8b1 100644
--- a/openssl/crypto/ripemd/README
+++ b/main/openssl/crypto/ripemd/README
diff --git a/openssl/crypto/ripemd/asm/rips.cpp b/main/openssl/crypto/ripemd/asm/rips.cpp
index f7a13677..f7a13677 100644
--- a/openssl/crypto/ripemd/asm/rips.cpp
+++ b/main/openssl/crypto/ripemd/asm/rips.cpp
diff --git a/openssl/crypto/ripemd/asm/rmd-586.pl b/main/openssl/crypto/ripemd/asm/rmd-586.pl
index e8b2bc2d..e8b2bc2d 100644
--- a/openssl/crypto/ripemd/asm/rmd-586.pl
+++ b/main/openssl/crypto/ripemd/asm/rmd-586.pl
diff --git a/openssl/crypto/ripemd/ripemd.h b/main/openssl/crypto/ripemd/ripemd.h
index 5942eb61..5942eb61 100644
--- a/openssl/crypto/ripemd/ripemd.h
+++ b/main/openssl/crypto/ripemd/ripemd.h
diff --git a/openssl/crypto/ripemd/rmd160.c b/main/openssl/crypto/ripemd/rmd160.c
index b0ec5744..b0ec5744 100644
--- a/openssl/crypto/ripemd/rmd160.c
+++ b/main/openssl/crypto/ripemd/rmd160.c
diff --git a/openssl/crypto/ripemd/rmd_dgst.c b/main/openssl/crypto/ripemd/rmd_dgst.c
index 59b017f8..59b017f8 100644
--- a/openssl/crypto/ripemd/rmd_dgst.c
+++ b/main/openssl/crypto/ripemd/rmd_dgst.c
diff --git a/openssl/crypto/ripemd/rmd_locl.h b/main/openssl/crypto/ripemd/rmd_locl.h
index f14b346e..f14b346e 100644
--- a/openssl/crypto/ripemd/rmd_locl.h
+++ b/main/openssl/crypto/ripemd/rmd_locl.h
diff --git a/openssl/crypto/ripemd/rmd_one.c b/main/openssl/crypto/ripemd/rmd_one.c
index 3efb1375..3efb1375 100644
--- a/openssl/crypto/ripemd/rmd_one.c
+++ b/main/openssl/crypto/ripemd/rmd_one.c
diff --git a/openssl/crypto/ripemd/rmdconst.h b/main/openssl/crypto/ripemd/rmdconst.h
index 59c48dea..59c48dea 100644
--- a/openssl/crypto/ripemd/rmdconst.h
+++ b/main/openssl/crypto/ripemd/rmdconst.h
diff --git a/openssl/crypto/ripemd/rmdtest.c b/main/openssl/crypto/ripemd/rmdtest.c
index fb34e0e8..fb34e0e8 100644
--- a/openssl/crypto/ripemd/rmdtest.c
+++ b/main/openssl/crypto/ripemd/rmdtest.c
diff --git a/openssl/crypto/rsa/rsa.h b/main/openssl/crypto/rsa/rsa.h
index cf743436..cf743436 100644
--- a/openssl/crypto/rsa/rsa.h
+++ b/main/openssl/crypto/rsa/rsa.h
diff --git a/openssl/crypto/rsa/rsa_ameth.c b/main/openssl/crypto/rsa/rsa_ameth.c
index 8c320988..8c320988 100644
--- a/openssl/crypto/rsa/rsa_ameth.c
+++ b/main/openssl/crypto/rsa/rsa_ameth.c
diff --git a/openssl/crypto/rsa/rsa_asn1.c b/main/openssl/crypto/rsa/rsa_asn1.c
index 4efca8cd..4efca8cd 100644
--- a/openssl/crypto/rsa/rsa_asn1.c
+++ b/main/openssl/crypto/rsa/rsa_asn1.c
diff --git a/openssl/crypto/rsa/rsa_chk.c b/main/openssl/crypto/rsa/rsa_chk.c
index 9d848db8..9d848db8 100644
--- a/openssl/crypto/rsa/rsa_chk.c
+++ b/main/openssl/crypto/rsa/rsa_chk.c
diff --git a/openssl/crypto/rsa/rsa_depr.c b/main/openssl/crypto/rsa/rsa_depr.c
index a859ded9..a859ded9 100644
--- a/openssl/crypto/rsa/rsa_depr.c
+++ b/main/openssl/crypto/rsa/rsa_depr.c
diff --git a/openssl/crypto/rsa/rsa_eay.c b/main/openssl/crypto/rsa/rsa_eay.c
index 7c941885..7c941885 100644
--- a/openssl/crypto/rsa/rsa_eay.c
+++ b/main/openssl/crypto/rsa/rsa_eay.c
diff --git a/openssl/crypto/rsa/rsa_err.c b/main/openssl/crypto/rsa/rsa_err.c
index cf9f1106..cf9f1106 100644
--- a/openssl/crypto/rsa/rsa_err.c
+++ b/main/openssl/crypto/rsa/rsa_err.c
diff --git a/openssl/crypto/rsa/rsa_gen.c b/main/openssl/crypto/rsa/rsa_gen.c
index 767f7ab6..767f7ab6 100644
--- a/openssl/crypto/rsa/rsa_gen.c
+++ b/main/openssl/crypto/rsa/rsa_gen.c
diff --git a/openssl/crypto/rsa/rsa_lib.c b/main/openssl/crypto/rsa/rsa_lib.c
index de45088d..de45088d 100644
--- a/openssl/crypto/rsa/rsa_lib.c
+++ b/main/openssl/crypto/rsa/rsa_lib.c
diff --git a/openssl/crypto/rsa/rsa_locl.h b/main/openssl/crypto/rsa/rsa_locl.h
index f5d2d566..f5d2d566 100644
--- a/openssl/crypto/rsa/rsa_locl.h
+++ b/main/openssl/crypto/rsa/rsa_locl.h
diff --git a/openssl/crypto/rsa/rsa_none.c b/main/openssl/crypto/rsa/rsa_none.c
index e6f3e627..e6f3e627 100644
--- a/openssl/crypto/rsa/rsa_none.c
+++ b/main/openssl/crypto/rsa/rsa_none.c
diff --git a/openssl/crypto/rsa/rsa_null.c b/main/openssl/crypto/rsa/rsa_null.c
index 2f2202f1..2f2202f1 100644
--- a/openssl/crypto/rsa/rsa_null.c
+++ b/main/openssl/crypto/rsa/rsa_null.c
diff --git a/openssl/crypto/rsa/rsa_oaep.c b/main/openssl/crypto/rsa/rsa_oaep.c
index 18d307ea..18d307ea 100644
--- a/openssl/crypto/rsa/rsa_oaep.c
+++ b/main/openssl/crypto/rsa/rsa_oaep.c
diff --git a/openssl/crypto/rsa/rsa_pk1.c b/main/openssl/crypto/rsa/rsa_pk1.c
index 8560755f..8560755f 100644
--- a/openssl/crypto/rsa/rsa_pk1.c
+++ b/main/openssl/crypto/rsa/rsa_pk1.c
diff --git a/openssl/crypto/rsa/rsa_pmeth.c b/main/openssl/crypto/rsa/rsa_pmeth.c
index c6892ecd..c6892ecd 100644
--- a/openssl/crypto/rsa/rsa_pmeth.c
+++ b/main/openssl/crypto/rsa/rsa_pmeth.c
diff --git a/openssl/crypto/rsa/rsa_prn.c b/main/openssl/crypto/rsa/rsa_prn.c
index 224db0fa..224db0fa 100644
--- a/openssl/crypto/rsa/rsa_prn.c
+++ b/main/openssl/crypto/rsa/rsa_prn.c
diff --git a/openssl/crypto/rsa/rsa_pss.c b/main/openssl/crypto/rsa/rsa_pss.c
index ac211e2f..ac211e2f 100644
--- a/openssl/crypto/rsa/rsa_pss.c
+++ b/main/openssl/crypto/rsa/rsa_pss.c
diff --git a/openssl/crypto/rsa/rsa_saos.c b/main/openssl/crypto/rsa/rsa_saos.c
index f98e0a80..f98e0a80 100644
--- a/openssl/crypto/rsa/rsa_saos.c
+++ b/main/openssl/crypto/rsa/rsa_saos.c
diff --git a/openssl/crypto/rsa/rsa_sign.c b/main/openssl/crypto/rsa/rsa_sign.c
index 0be4ec7f..0be4ec7f 100644
--- a/openssl/crypto/rsa/rsa_sign.c
+++ b/main/openssl/crypto/rsa/rsa_sign.c
diff --git a/openssl/crypto/rsa/rsa_ssl.c b/main/openssl/crypto/rsa/rsa_ssl.c
index cfeff15b..cfeff15b 100644
--- a/openssl/crypto/rsa/rsa_ssl.c
+++ b/main/openssl/crypto/rsa/rsa_ssl.c
diff --git a/openssl/crypto/rsa/rsa_test.c b/main/openssl/crypto/rsa/rsa_test.c
index c8705a0f..c8705a0f 100644
--- a/openssl/crypto/rsa/rsa_test.c
+++ b/main/openssl/crypto/rsa/rsa_test.c
diff --git a/openssl/crypto/rsa/rsa_x931.c b/main/openssl/crypto/rsa/rsa_x931.c
index 21548e37..21548e37 100644
--- a/openssl/crypto/rsa/rsa_x931.c
+++ b/main/openssl/crypto/rsa/rsa_x931.c
diff --git a/openssl/crypto/s390xcap.c b/main/openssl/crypto/s390xcap.c
index ffbe0235..ffbe0235 100644
--- a/openssl/crypto/s390xcap.c
+++ b/main/openssl/crypto/s390xcap.c
diff --git a/openssl/crypto/s390xcpuid.S b/main/openssl/crypto/s390xcpuid.S
index b053c6a2..b053c6a2 100644
--- a/openssl/crypto/s390xcpuid.S
+++ b/main/openssl/crypto/s390xcpuid.S
diff --git a/openssl/crypto/sha/asm/README b/main/openssl/crypto/sha/asm/README
index b7e75576..b7e75576 100644
--- a/openssl/crypto/sha/asm/README
+++ b/main/openssl/crypto/sha/asm/README
diff --git a/openssl/crypto/sha/asm/sha1-586.pl b/main/openssl/crypto/sha/asm/sha1-586.pl
index a1f87628..a1f87628 100644
--- a/openssl/crypto/sha/asm/sha1-586.pl
+++ b/main/openssl/crypto/sha/asm/sha1-586.pl
diff --git a/openssl/crypto/sha/asm/sha1-armv4-large.pl b/main/openssl/crypto/sha/asm/sha1-armv4-large.pl
index 79e3f613..79e3f613 100644
--- a/openssl/crypto/sha/asm/sha1-armv4-large.pl
+++ b/main/openssl/crypto/sha/asm/sha1-armv4-large.pl
diff --git a/openssl/crypto/sha/asm/sha1-armv4-large.s b/main/openssl/crypto/sha/asm/sha1-armv4-large.s
index 7f687d9f..7f687d9f 100644
--- a/openssl/crypto/sha/asm/sha1-armv4-large.s
+++ b/main/openssl/crypto/sha/asm/sha1-armv4-large.s
diff --git a/openssl/crypto/sha/asm/sha1-ia64.pl b/main/openssl/crypto/sha/asm/sha1-ia64.pl
index 51c4f47e..51c4f47e 100644
--- a/openssl/crypto/sha/asm/sha1-ia64.pl
+++ b/main/openssl/crypto/sha/asm/sha1-ia64.pl
diff --git a/openssl/crypto/sha/asm/sha1-ppc.pl b/main/openssl/crypto/sha/asm/sha1-ppc.pl
index dcd0fcdf..dcd0fcdf 100755
--- a/openssl/crypto/sha/asm/sha1-ppc.pl
+++ b/main/openssl/crypto/sha/asm/sha1-ppc.pl
diff --git a/openssl/crypto/sha/asm/sha1-s390x.pl b/main/openssl/crypto/sha/asm/sha1-s390x.pl
index 4b178482..4b178482 100644
--- a/openssl/crypto/sha/asm/sha1-s390x.pl
+++ b/main/openssl/crypto/sha/asm/sha1-s390x.pl
diff --git a/openssl/crypto/sha/asm/sha1-sparcv9.pl b/main/openssl/crypto/sha/asm/sha1-sparcv9.pl
index 5c161cec..5c161cec 100644
--- a/openssl/crypto/sha/asm/sha1-sparcv9.pl
+++ b/main/openssl/crypto/sha/asm/sha1-sparcv9.pl
diff --git a/openssl/crypto/sha/asm/sha1-sparcv9a.pl b/main/openssl/crypto/sha/asm/sha1-sparcv9a.pl
index 85e8d680..85e8d680 100644
--- a/openssl/crypto/sha/asm/sha1-sparcv9a.pl
+++ b/main/openssl/crypto/sha/asm/sha1-sparcv9a.pl
diff --git a/openssl/crypto/sha/asm/sha1-thumb.pl b/main/openssl/crypto/sha/asm/sha1-thumb.pl
index 7c9ea9b0..7c9ea9b0 100644
--- a/openssl/crypto/sha/asm/sha1-thumb.pl
+++ b/main/openssl/crypto/sha/asm/sha1-thumb.pl
diff --git a/openssl/crypto/sha/asm/sha1-x86_64.pl b/main/openssl/crypto/sha/asm/sha1-x86_64.pl
index 4edc5ea9..4edc5ea9 100755
--- a/openssl/crypto/sha/asm/sha1-x86_64.pl
+++ b/main/openssl/crypto/sha/asm/sha1-x86_64.pl
diff --git a/openssl/crypto/sha/asm/sha256-586.pl b/main/openssl/crypto/sha/asm/sha256-586.pl
index ecc8b69c..ecc8b69c 100644
--- a/openssl/crypto/sha/asm/sha256-586.pl
+++ b/main/openssl/crypto/sha/asm/sha256-586.pl
diff --git a/openssl/crypto/sha/asm/sha256-armv4.pl b/main/openssl/crypto/sha/asm/sha256-armv4.pl
index 492cb62b..492cb62b 100644
--- a/openssl/crypto/sha/asm/sha256-armv4.pl
+++ b/main/openssl/crypto/sha/asm/sha256-armv4.pl
diff --git a/openssl/crypto/sha/asm/sha256-armv4.s b/main/openssl/crypto/sha/asm/sha256-armv4.s
index ee903dc4..ee903dc4 100644
--- a/openssl/crypto/sha/asm/sha256-armv4.s
+++ b/main/openssl/crypto/sha/asm/sha256-armv4.s
diff --git a/openssl/crypto/sha/asm/sha512-586.pl b/main/openssl/crypto/sha/asm/sha512-586.pl
index 5b9f3337..5b9f3337 100644
--- a/openssl/crypto/sha/asm/sha512-586.pl
+++ b/main/openssl/crypto/sha/asm/sha512-586.pl
diff --git a/openssl/crypto/sha/asm/sha512-armv4.pl b/main/openssl/crypto/sha/asm/sha512-armv4.pl
index 3a35861a..3a35861a 100644
--- a/openssl/crypto/sha/asm/sha512-armv4.pl
+++ b/main/openssl/crypto/sha/asm/sha512-armv4.pl
diff --git a/openssl/crypto/sha/asm/sha512-armv4.s b/main/openssl/crypto/sha/asm/sha512-armv4.s
index b030c16c..b030c16c 100644
--- a/openssl/crypto/sha/asm/sha512-armv4.s
+++ b/main/openssl/crypto/sha/asm/sha512-armv4.s
diff --git a/openssl/crypto/sha/asm/sha512-ia64.pl b/main/openssl/crypto/sha/asm/sha512-ia64.pl
index 1c6ce565..1c6ce565 100755
--- a/openssl/crypto/sha/asm/sha512-ia64.pl
+++ b/main/openssl/crypto/sha/asm/sha512-ia64.pl
diff --git a/openssl/crypto/sha/asm/sha512-ppc.pl b/main/openssl/crypto/sha/asm/sha512-ppc.pl
index 768a6a6f..768a6a6f 100755
--- a/openssl/crypto/sha/asm/sha512-ppc.pl
+++ b/main/openssl/crypto/sha/asm/sha512-ppc.pl
diff --git a/openssl/crypto/sha/asm/sha512-s390x.pl b/main/openssl/crypto/sha/asm/sha512-s390x.pl
index e7ef2d5a..e7ef2d5a 100644
--- a/openssl/crypto/sha/asm/sha512-s390x.pl
+++ b/main/openssl/crypto/sha/asm/sha512-s390x.pl
diff --git a/openssl/crypto/sha/asm/sha512-sparcv9.pl b/main/openssl/crypto/sha/asm/sha512-sparcv9.pl
index ec5d7813..ec5d7813 100644
--- a/openssl/crypto/sha/asm/sha512-sparcv9.pl
+++ b/main/openssl/crypto/sha/asm/sha512-sparcv9.pl
diff --git a/openssl/crypto/sha/asm/sha512-x86_64.pl b/main/openssl/crypto/sha/asm/sha512-x86_64.pl
index e6643f8c..e6643f8c 100755
--- a/openssl/crypto/sha/asm/sha512-x86_64.pl
+++ b/main/openssl/crypto/sha/asm/sha512-x86_64.pl
diff --git a/openssl/crypto/sha/sha.c b/main/openssl/crypto/sha/sha.c
index 42126551..42126551 100644
--- a/openssl/crypto/sha/sha.c
+++ b/main/openssl/crypto/sha/sha.c
diff --git a/openssl/crypto/sha/sha.h b/main/openssl/crypto/sha/sha.h
index 16cacf9f..16cacf9f 100644
--- a/openssl/crypto/sha/sha.h
+++ b/main/openssl/crypto/sha/sha.h
diff --git a/openssl/crypto/sha/sha1.c b/main/openssl/crypto/sha/sha1.c
index d350c88e..d350c88e 100644
--- a/openssl/crypto/sha/sha1.c
+++ b/main/openssl/crypto/sha/sha1.c
diff --git a/openssl/crypto/sha/sha1_one.c b/main/openssl/crypto/sha/sha1_one.c
index 7c65b602..7c65b602 100644
--- a/openssl/crypto/sha/sha1_one.c
+++ b/main/openssl/crypto/sha/sha1_one.c
diff --git a/openssl/crypto/sha/sha1dgst.c b/main/openssl/crypto/sha/sha1dgst.c
index 50d1925c..50d1925c 100644
--- a/openssl/crypto/sha/sha1dgst.c
+++ b/main/openssl/crypto/sha/sha1dgst.c
diff --git a/openssl/crypto/sha/sha1test.c b/main/openssl/crypto/sha/sha1test.c
index 6feb3964..6feb3964 100644
--- a/openssl/crypto/sha/sha1test.c
+++ b/main/openssl/crypto/sha/sha1test.c
diff --git a/openssl/crypto/sha/sha256.c b/main/openssl/crypto/sha/sha256.c
index 8952d876..8952d876 100644
--- a/openssl/crypto/sha/sha256.c
+++ b/main/openssl/crypto/sha/sha256.c
diff --git a/openssl/crypto/sha/sha256t.c b/main/openssl/crypto/sha/sha256t.c
index 6b4a3bd0..6b4a3bd0 100644
--- a/openssl/crypto/sha/sha256t.c
+++ b/main/openssl/crypto/sha/sha256t.c
diff --git a/openssl/crypto/sha/sha512.c b/main/openssl/crypto/sha/sha512.c
index cbc0e58c..cbc0e58c 100644
--- a/openssl/crypto/sha/sha512.c
+++ b/main/openssl/crypto/sha/sha512.c
diff --git a/openssl/crypto/sha/sha512t.c b/main/openssl/crypto/sha/sha512t.c
index 210041d4..210041d4 100644
--- a/openssl/crypto/sha/sha512t.c
+++ b/main/openssl/crypto/sha/sha512t.c
diff --git a/openssl/crypto/sha/sha_dgst.c b/main/openssl/crypto/sha/sha_dgst.c
index 70eb5603..70eb5603 100644
--- a/openssl/crypto/sha/sha_dgst.c
+++ b/main/openssl/crypto/sha/sha_dgst.c
diff --git a/openssl/crypto/sha/sha_locl.h b/main/openssl/crypto/sha/sha_locl.h
index 672c26ee..672c26ee 100644
--- a/openssl/crypto/sha/sha_locl.h
+++ b/main/openssl/crypto/sha/sha_locl.h
diff --git a/openssl/crypto/sha/shatest.c b/main/openssl/crypto/sha/shatest.c
index 27614646..27614646 100644
--- a/openssl/crypto/sha/shatest.c
+++ b/main/openssl/crypto/sha/shatest.c
diff --git a/openssl/crypto/sparccpuid.S b/main/openssl/crypto/sparccpuid.S
index ae61f7f5..ae61f7f5 100644
--- a/openssl/crypto/sparccpuid.S
+++ b/main/openssl/crypto/sparccpuid.S
diff --git a/openssl/crypto/sparcv9cap.c b/main/openssl/crypto/sparcv9cap.c
index ed195ab4..ed195ab4 100644
--- a/openssl/crypto/sparcv9cap.c
+++ b/main/openssl/crypto/sparcv9cap.c
diff --git a/openssl/crypto/stack/safestack.h b/main/openssl/crypto/stack/safestack.h
index 3e76aa58..3e76aa58 100644
--- a/openssl/crypto/stack/safestack.h
+++ b/main/openssl/crypto/stack/safestack.h
diff --git a/openssl/crypto/stack/stack.c b/main/openssl/crypto/stack/stack.c
index 76cf1a11..76cf1a11 100644
--- a/openssl/crypto/stack/stack.c
+++ b/main/openssl/crypto/stack/stack.c
diff --git a/openssl/crypto/stack/stack.h b/main/openssl/crypto/stack/stack.h
index ce35e554..ce35e554 100644
--- a/openssl/crypto/stack/stack.h
+++ b/main/openssl/crypto/stack/stack.h
diff --git a/openssl/crypto/store/README b/main/openssl/crypto/store/README
index 966168f6..966168f6 100644
--- a/openssl/crypto/store/README
+++ b/main/openssl/crypto/store/README
diff --git a/openssl/crypto/store/store.h b/main/openssl/crypto/store/store.h
index 0a28c7d5..0a28c7d5 100644
--- a/openssl/crypto/store/store.h
+++ b/main/openssl/crypto/store/store.h
diff --git a/openssl/crypto/store/str_err.c b/main/openssl/crypto/store/str_err.c
index 924edf05..924edf05 100644
--- a/openssl/crypto/store/str_err.c
+++ b/main/openssl/crypto/store/str_err.c
diff --git a/openssl/crypto/store/str_lib.c b/main/openssl/crypto/store/str_lib.c
index f1dbcbd0..f1dbcbd0 100644
--- a/openssl/crypto/store/str_lib.c
+++ b/main/openssl/crypto/store/str_lib.c
diff --git a/openssl/crypto/store/str_locl.h b/main/openssl/crypto/store/str_locl.h
index 3f8cb756..3f8cb756 100644
--- a/openssl/crypto/store/str_locl.h
+++ b/main/openssl/crypto/store/str_locl.h
diff --git a/openssl/crypto/store/str_mem.c b/main/openssl/crypto/store/str_mem.c
index 8ac4f7e5..8ac4f7e5 100644
--- a/openssl/crypto/store/str_mem.c
+++ b/main/openssl/crypto/store/str_mem.c
diff --git a/openssl/crypto/store/str_meth.c b/main/openssl/crypto/store/str_meth.c
index a46de03a..a46de03a 100644
--- a/openssl/crypto/store/str_meth.c
+++ b/main/openssl/crypto/store/str_meth.c
diff --git a/openssl/crypto/symhacks.h b/main/openssl/crypto/symhacks.h
index 3fd4a816..3fd4a816 100644
--- a/openssl/crypto/symhacks.h
+++ b/main/openssl/crypto/symhacks.h
diff --git a/openssl/crypto/threads/README b/main/openssl/crypto/threads/README
index df6b26e1..df6b26e1 100644
--- a/openssl/crypto/threads/README
+++ b/main/openssl/crypto/threads/README
diff --git a/openssl/crypto/threads/mttest.c b/main/openssl/crypto/threads/mttest.c
index eba7aa8a..eba7aa8a 100644
--- a/openssl/crypto/threads/mttest.c
+++ b/main/openssl/crypto/threads/mttest.c
diff --git a/openssl/crypto/threads/netware.bat b/main/openssl/crypto/threads/netware.bat
index 0b3eca3c..0b3eca3c 100644
--- a/openssl/crypto/threads/netware.bat
+++ b/main/openssl/crypto/threads/netware.bat
diff --git a/openssl/crypto/threads/profile.sh b/main/openssl/crypto/threads/profile.sh
index 6e3e342f..6e3e342f 100644
--- a/openssl/crypto/threads/profile.sh
+++ b/main/openssl/crypto/threads/profile.sh
diff --git a/openssl/crypto/threads/ptest.bat b/main/openssl/crypto/threads/ptest.bat
index 4071b5ff..4071b5ff 100755
--- a/openssl/crypto/threads/ptest.bat
+++ b/main/openssl/crypto/threads/ptest.bat
diff --git a/openssl/crypto/threads/pthread.sh b/main/openssl/crypto/threads/pthread.sh
index f1c49821..f1c49821 100644
--- a/openssl/crypto/threads/pthread.sh
+++ b/main/openssl/crypto/threads/pthread.sh
diff --git a/openssl/crypto/threads/pthread2.sh b/main/openssl/crypto/threads/pthread2.sh
index 41264c6a..41264c6a 100755
--- a/openssl/crypto/threads/pthread2.sh
+++ b/main/openssl/crypto/threads/pthread2.sh
diff --git a/openssl/crypto/threads/purify.sh b/main/openssl/crypto/threads/purify.sh
index 6d44fe26..6d44fe26 100644
--- a/openssl/crypto/threads/purify.sh
+++ b/main/openssl/crypto/threads/purify.sh
diff --git a/openssl/crypto/threads/solaris.sh b/main/openssl/crypto/threads/solaris.sh
index bc93094a..bc93094a 100644
--- a/openssl/crypto/threads/solaris.sh
+++ b/main/openssl/crypto/threads/solaris.sh
diff --git a/openssl/crypto/threads/th-lock.c b/main/openssl/crypto/threads/th-lock.c
index 14aae5f9..14aae5f9 100644
--- a/openssl/crypto/threads/th-lock.c
+++ b/main/openssl/crypto/threads/th-lock.c
diff --git a/openssl/crypto/ts/ts_err.c b/main/openssl/crypto/ts/ts_err.c
index a08b0ffa..a08b0ffa 100644
--- a/openssl/crypto/ts/ts_err.c
+++ b/main/openssl/crypto/ts/ts_err.c
diff --git a/openssl/crypto/txt_db/txt_db.c b/main/openssl/crypto/txt_db/txt_db.c
index 6f2ce3b5..6f2ce3b5 100644
--- a/openssl/crypto/txt_db/txt_db.c
+++ b/main/openssl/crypto/txt_db/txt_db.c
diff --git a/openssl/crypto/txt_db/txt_db.h b/main/openssl/crypto/txt_db/txt_db.h
index 6abe435b..6abe435b 100644
--- a/openssl/crypto/txt_db/txt_db.h
+++ b/main/openssl/crypto/txt_db/txt_db.h
diff --git a/openssl/crypto/ui/ui.h b/main/openssl/crypto/ui/ui.h
index 2b1cfa22..2b1cfa22 100644
--- a/openssl/crypto/ui/ui.h
+++ b/main/openssl/crypto/ui/ui.h
diff --git a/openssl/crypto/ui/ui_compat.c b/main/openssl/crypto/ui/ui_compat.c
index 13e0f70d..13e0f70d 100644
--- a/openssl/crypto/ui/ui_compat.c
+++ b/main/openssl/crypto/ui/ui_compat.c
diff --git a/openssl/crypto/ui/ui_compat.h b/main/openssl/crypto/ui/ui_compat.h
index b35c9bb7..b35c9bb7 100644
--- a/openssl/crypto/ui/ui_compat.h
+++ b/main/openssl/crypto/ui/ui_compat.h
diff --git a/openssl/crypto/ui/ui_err.c b/main/openssl/crypto/ui/ui_err.c
index a6b96299..a6b96299 100644
--- a/openssl/crypto/ui/ui_err.c
+++ b/main/openssl/crypto/ui/ui_err.c
diff --git a/openssl/crypto/ui/ui_lib.c b/main/openssl/crypto/ui/ui_lib.c
index a8abc270..a8abc270 100644
--- a/openssl/crypto/ui/ui_lib.c
+++ b/main/openssl/crypto/ui/ui_lib.c
diff --git a/openssl/crypto/ui/ui_locl.h b/main/openssl/crypto/ui/ui_locl.h
index aa4a5563..aa4a5563 100644
--- a/openssl/crypto/ui/ui_locl.h
+++ b/main/openssl/crypto/ui/ui_locl.h
diff --git a/openssl/crypto/ui/ui_openssl.c b/main/openssl/crypto/ui/ui_openssl.c
index b05cbf34..b05cbf34 100644
--- a/openssl/crypto/ui/ui_openssl.c
+++ b/main/openssl/crypto/ui/ui_openssl.c
diff --git a/openssl/crypto/ui/ui_util.c b/main/openssl/crypto/ui/ui_util.c
index 5d9760bb..5d9760bb 100644
--- a/openssl/crypto/ui/ui_util.c
+++ b/main/openssl/crypto/ui/ui_util.c
diff --git a/openssl/crypto/uid.c b/main/openssl/crypto/uid.c
index b1fd52ba..b1fd52ba 100644
--- a/openssl/crypto/uid.c
+++ b/main/openssl/crypto/uid.c
diff --git a/openssl/crypto/x509/by_dir.c b/main/openssl/crypto/x509/by_dir.c
index 27ca5150..27ca5150 100644
--- a/openssl/crypto/x509/by_dir.c
+++ b/main/openssl/crypto/x509/by_dir.c
diff --git a/openssl/crypto/x509/by_file.c b/main/openssl/crypto/x509/by_file.c
index 57b08ee0..57b08ee0 100644
--- a/openssl/crypto/x509/by_file.c
+++ b/main/openssl/crypto/x509/by_file.c
diff --git a/openssl/crypto/x509/x509.h b/main/openssl/crypto/x509/x509.h
index e6f8a403..e6f8a403 100644
--- a/openssl/crypto/x509/x509.h
+++ b/main/openssl/crypto/x509/x509.h
diff --git a/openssl/crypto/x509/x509_att.c b/main/openssl/crypto/x509/x509_att.c
index 98460e89..98460e89 100644
--- a/openssl/crypto/x509/x509_att.c
+++ b/main/openssl/crypto/x509/x509_att.c
diff --git a/openssl/crypto/x509/x509_cmp.c b/main/openssl/crypto/x509/x509_cmp.c
index 4bc9da07..4bc9da07 100644
--- a/openssl/crypto/x509/x509_cmp.c
+++ b/main/openssl/crypto/x509/x509_cmp.c
diff --git a/openssl/crypto/x509/x509_d2.c b/main/openssl/crypto/x509/x509_d2.c
index 51410cfd..51410cfd 100644
--- a/openssl/crypto/x509/x509_d2.c
+++ b/main/openssl/crypto/x509/x509_d2.c
diff --git a/openssl/crypto/x509/x509_def.c b/main/openssl/crypto/x509/x509_def.c
index e0ac151a..e0ac151a 100644
--- a/openssl/crypto/x509/x509_def.c
+++ b/main/openssl/crypto/x509/x509_def.c
diff --git a/openssl/crypto/x509/x509_err.c b/main/openssl/crypto/x509/x509_err.c
index a01402f4..a01402f4 100644
--- a/openssl/crypto/x509/x509_err.c
+++ b/main/openssl/crypto/x509/x509_err.c
diff --git a/openssl/crypto/x509/x509_ext.c b/main/openssl/crypto/x509/x509_ext.c
index e7fdacb5..e7fdacb5 100644
--- a/openssl/crypto/x509/x509_ext.c
+++ b/main/openssl/crypto/x509/x509_ext.c
diff --git a/openssl/crypto/x509/x509_lu.c b/main/openssl/crypto/x509/x509_lu.c
index 3a6e04a1..3a6e04a1 100644
--- a/openssl/crypto/x509/x509_lu.c
+++ b/main/openssl/crypto/x509/x509_lu.c
diff --git a/openssl/crypto/x509/x509_obj.c b/main/openssl/crypto/x509/x509_obj.c
index 21fed9f8..21fed9f8 100644
--- a/openssl/crypto/x509/x509_obj.c
+++ b/main/openssl/crypto/x509/x509_obj.c
diff --git a/openssl/crypto/x509/x509_r2x.c b/main/openssl/crypto/x509/x509_r2x.c
index 254a1469..254a1469 100644
--- a/openssl/crypto/x509/x509_r2x.c
+++ b/main/openssl/crypto/x509/x509_r2x.c
diff --git a/openssl/crypto/x509/x509_req.c b/main/openssl/crypto/x509/x509_req.c
index 48183dc0..48183dc0 100644
--- a/openssl/crypto/x509/x509_req.c
+++ b/main/openssl/crypto/x509/x509_req.c
diff --git a/openssl/crypto/x509/x509_set.c b/main/openssl/crypto/x509/x509_set.c
index 4b94fc58..4b94fc58 100644
--- a/openssl/crypto/x509/x509_set.c
+++ b/main/openssl/crypto/x509/x509_set.c
diff --git a/openssl/crypto/x509/x509_trs.c b/main/openssl/crypto/x509/x509_trs.c
index a6cb9c8b..a6cb9c8b 100644
--- a/openssl/crypto/x509/x509_trs.c
+++ b/main/openssl/crypto/x509/x509_trs.c
diff --git a/openssl/crypto/x509/x509_txt.c b/main/openssl/crypto/x509/x509_txt.c
index c44f753c..c44f753c 100644
--- a/openssl/crypto/x509/x509_txt.c
+++ b/main/openssl/crypto/x509/x509_txt.c
diff --git a/openssl/crypto/x509/x509_v3.c b/main/openssl/crypto/x509/x509_v3.c
index 42e6f0ab..42e6f0ab 100644
--- a/openssl/crypto/x509/x509_v3.c
+++ b/main/openssl/crypto/x509/x509_v3.c
diff --git a/openssl/crypto/x509/x509_vfy.c b/main/openssl/crypto/x509/x509_vfy.c
index 5a0b0249..5a0b0249 100644
--- a/openssl/crypto/x509/x509_vfy.c
+++ b/main/openssl/crypto/x509/x509_vfy.c
diff --git a/openssl/crypto/x509/x509_vfy.h b/main/openssl/crypto/x509/x509_vfy.h
index fe09b30a..fe09b30a 100644
--- a/openssl/crypto/x509/x509_vfy.h
+++ b/main/openssl/crypto/x509/x509_vfy.h
diff --git a/openssl/crypto/x509/x509_vpm.c b/main/openssl/crypto/x509/x509_vpm.c
index dfd89d89..dfd89d89 100644
--- a/openssl/crypto/x509/x509_vpm.c
+++ b/main/openssl/crypto/x509/x509_vpm.c
diff --git a/openssl/crypto/x509/x509cset.c b/main/openssl/crypto/x509/x509cset.c
index 3109defb..3109defb 100644
--- a/openssl/crypto/x509/x509cset.c
+++ b/main/openssl/crypto/x509/x509cset.c
diff --git a/openssl/crypto/x509/x509name.c b/main/openssl/crypto/x509/x509name.c
index 27bc4dc9..27bc4dc9 100644
--- a/openssl/crypto/x509/x509name.c
+++ b/main/openssl/crypto/x509/x509name.c
diff --git a/openssl/crypto/x509/x509rset.c b/main/openssl/crypto/x509/x509rset.c
index d9f6b573..d9f6b573 100644
--- a/openssl/crypto/x509/x509rset.c
+++ b/main/openssl/crypto/x509/x509rset.c
diff --git a/openssl/crypto/x509/x509spki.c b/main/openssl/crypto/x509/x509spki.c
index 02a203d7..02a203d7 100644
--- a/openssl/crypto/x509/x509spki.c
+++ b/main/openssl/crypto/x509/x509spki.c
diff --git a/openssl/crypto/x509/x509type.c b/main/openssl/crypto/x509/x509type.c
index 3385ad3f..3385ad3f 100644
--- a/openssl/crypto/x509/x509type.c
+++ b/main/openssl/crypto/x509/x509type.c
diff --git a/openssl/crypto/x509/x_all.c b/main/openssl/crypto/x509/x_all.c
index 8ec88c21..8ec88c21 100644
--- a/openssl/crypto/x509/x_all.c
+++ b/main/openssl/crypto/x509/x_all.c
diff --git a/openssl/crypto/x509v3/ext_dat.h b/main/openssl/crypto/x509v3/ext_dat.h
index 76daee6f..76daee6f 100644
--- a/openssl/crypto/x509v3/ext_dat.h
+++ b/main/openssl/crypto/x509v3/ext_dat.h
diff --git a/openssl/crypto/x509v3/pcy_cache.c b/main/openssl/crypto/x509v3/pcy_cache.c
index 172b7e7e..172b7e7e 100644
--- a/openssl/crypto/x509v3/pcy_cache.c
+++ b/main/openssl/crypto/x509v3/pcy_cache.c
diff --git a/openssl/crypto/x509v3/pcy_data.c b/main/openssl/crypto/x509v3/pcy_data.c
index 3444b031..3444b031 100644
--- a/openssl/crypto/x509v3/pcy_data.c
+++ b/main/openssl/crypto/x509v3/pcy_data.c
diff --git a/openssl/crypto/x509v3/pcy_int.h b/main/openssl/crypto/x509v3/pcy_int.h
index ccff9284..ccff9284 100644
--- a/openssl/crypto/x509v3/pcy_int.h
+++ b/main/openssl/crypto/x509v3/pcy_int.h
diff --git a/openssl/crypto/x509v3/pcy_lib.c b/main/openssl/crypto/x509v3/pcy_lib.c
index 93bfd927..93bfd927 100644
--- a/openssl/crypto/x509v3/pcy_lib.c
+++ b/main/openssl/crypto/x509v3/pcy_lib.c
diff --git a/openssl/crypto/x509v3/pcy_map.c b/main/openssl/crypto/x509v3/pcy_map.c
index 21163b52..21163b52 100644
--- a/openssl/crypto/x509v3/pcy_map.c
+++ b/main/openssl/crypto/x509v3/pcy_map.c
diff --git a/openssl/crypto/x509v3/pcy_node.c b/main/openssl/crypto/x509v3/pcy_node.c
index bd1e7f1a..bd1e7f1a 100644
--- a/openssl/crypto/x509v3/pcy_node.c
+++ b/main/openssl/crypto/x509v3/pcy_node.c
diff --git a/openssl/crypto/x509v3/pcy_tree.c b/main/openssl/crypto/x509v3/pcy_tree.c
index bb977734..bb977734 100644
--- a/openssl/crypto/x509v3/pcy_tree.c
+++ b/main/openssl/crypto/x509v3/pcy_tree.c
diff --git a/openssl/crypto/x509v3/tabtest.c b/main/openssl/crypto/x509v3/tabtest.c
index 5ed6eb68..5ed6eb68 100644
--- a/openssl/crypto/x509v3/tabtest.c
+++ b/main/openssl/crypto/x509v3/tabtest.c
diff --git a/openssl/crypto/x509v3/v3_addr.c b/main/openssl/crypto/x509v3/v3_addr.c
index 0d70e869..0d70e869 100644
--- a/openssl/crypto/x509v3/v3_addr.c
+++ b/main/openssl/crypto/x509v3/v3_addr.c
diff --git a/openssl/crypto/x509v3/v3_akey.c b/main/openssl/crypto/x509v3/v3_akey.c
index c6b68ee2..c6b68ee2 100644
--- a/openssl/crypto/x509v3/v3_akey.c
+++ b/main/openssl/crypto/x509v3/v3_akey.c
diff --git a/openssl/crypto/x509v3/v3_akeya.c b/main/openssl/crypto/x509v3/v3_akeya.c
index 2c50f736..2c50f736 100644
--- a/openssl/crypto/x509v3/v3_akeya.c
+++ b/main/openssl/crypto/x509v3/v3_akeya.c
diff --git a/openssl/crypto/x509v3/v3_alt.c b/main/openssl/crypto/x509v3/v3_alt.c
index d29d9433..d29d9433 100644
--- a/openssl/crypto/x509v3/v3_alt.c
+++ b/main/openssl/crypto/x509v3/v3_alt.c
diff --git a/openssl/crypto/x509v3/v3_asid.c b/main/openssl/crypto/x509v3/v3_asid.c
index 3f434c06..3f434c06 100644
--- a/openssl/crypto/x509v3/v3_asid.c
+++ b/main/openssl/crypto/x509v3/v3_asid.c
diff --git a/openssl/crypto/x509v3/v3_bcons.c b/main/openssl/crypto/x509v3/v3_bcons.c
index 82aa488f..82aa488f 100644
--- a/openssl/crypto/x509v3/v3_bcons.c
+++ b/main/openssl/crypto/x509v3/v3_bcons.c
diff --git a/openssl/crypto/x509v3/v3_bitst.c b/main/openssl/crypto/x509v3/v3_bitst.c
index 058d0d4d..058d0d4d 100644
--- a/openssl/crypto/x509v3/v3_bitst.c
+++ b/main/openssl/crypto/x509v3/v3_bitst.c
diff --git a/openssl/crypto/x509v3/v3_conf.c b/main/openssl/crypto/x509v3/v3_conf.c
index 6730f9a6..6730f9a6 100644
--- a/openssl/crypto/x509v3/v3_conf.c
+++ b/main/openssl/crypto/x509v3/v3_conf.c
diff --git a/openssl/crypto/x509v3/v3_cpols.c b/main/openssl/crypto/x509v3/v3_cpols.c
index 1f0798b9..1f0798b9 100644
--- a/openssl/crypto/x509v3/v3_cpols.c
+++ b/main/openssl/crypto/x509v3/v3_cpols.c
diff --git a/openssl/crypto/x509v3/v3_crld.c b/main/openssl/crypto/x509v3/v3_crld.c
index 790a6dd0..790a6dd0 100644
--- a/openssl/crypto/x509v3/v3_crld.c
+++ b/main/openssl/crypto/x509v3/v3_crld.c
diff --git a/openssl/crypto/x509v3/v3_enum.c b/main/openssl/crypto/x509v3/v3_enum.c
index c0575e36..c0575e36 100644
--- a/openssl/crypto/x509v3/v3_enum.c
+++ b/main/openssl/crypto/x509v3/v3_enum.c
diff --git a/openssl/crypto/x509v3/v3_extku.c b/main/openssl/crypto/x509v3/v3_extku.c
index 1c665327..1c665327 100644
--- a/openssl/crypto/x509v3/v3_extku.c
+++ b/main/openssl/crypto/x509v3/v3_extku.c
diff --git a/openssl/crypto/x509v3/v3_genn.c b/main/openssl/crypto/x509v3/v3_genn.c
index b6283573..b6283573 100644
--- a/openssl/crypto/x509v3/v3_genn.c
+++ b/main/openssl/crypto/x509v3/v3_genn.c
diff --git a/openssl/crypto/x509v3/v3_ia5.c b/main/openssl/crypto/x509v3/v3_ia5.c
index 4ff12b52..4ff12b52 100644
--- a/openssl/crypto/x509v3/v3_ia5.c
+++ b/main/openssl/crypto/x509v3/v3_ia5.c
diff --git a/openssl/crypto/x509v3/v3_info.c b/main/openssl/crypto/x509v3/v3_info.c
index e1b8699f..e1b8699f 100644
--- a/openssl/crypto/x509v3/v3_info.c
+++ b/main/openssl/crypto/x509v3/v3_info.c
diff --git a/openssl/crypto/x509v3/v3_int.c b/main/openssl/crypto/x509v3/v3_int.c
index 4bfd14cf..4bfd14cf 100644
--- a/openssl/crypto/x509v3/v3_int.c
+++ b/main/openssl/crypto/x509v3/v3_int.c
diff --git a/openssl/crypto/x509v3/v3_lib.c b/main/openssl/crypto/x509v3/v3_lib.c
index 0f1e1d44..0f1e1d44 100644
--- a/openssl/crypto/x509v3/v3_lib.c
+++ b/main/openssl/crypto/x509v3/v3_lib.c
diff --git a/openssl/crypto/x509v3/v3_ncons.c b/main/openssl/crypto/x509v3/v3_ncons.c
index a01dc64d..a01dc64d 100644
--- a/openssl/crypto/x509v3/v3_ncons.c
+++ b/main/openssl/crypto/x509v3/v3_ncons.c
diff --git a/openssl/crypto/x509v3/v3_ocsp.c b/main/openssl/crypto/x509v3/v3_ocsp.c
index 0c165af3..0c165af3 100644
--- a/openssl/crypto/x509v3/v3_ocsp.c
+++ b/main/openssl/crypto/x509v3/v3_ocsp.c
diff --git a/openssl/crypto/x509v3/v3_pci.c b/main/openssl/crypto/x509v3/v3_pci.c
index 0dcfa004..0dcfa004 100644
--- a/openssl/crypto/x509v3/v3_pci.c
+++ b/main/openssl/crypto/x509v3/v3_pci.c
diff --git a/openssl/crypto/x509v3/v3_pcia.c b/main/openssl/crypto/x509v3/v3_pcia.c
index bb362e0e..bb362e0e 100644
--- a/openssl/crypto/x509v3/v3_pcia.c
+++ b/main/openssl/crypto/x509v3/v3_pcia.c
diff --git a/openssl/crypto/x509v3/v3_pcons.c b/main/openssl/crypto/x509v3/v3_pcons.c
index 30ca6523..30ca6523 100644
--- a/openssl/crypto/x509v3/v3_pcons.c
+++ b/main/openssl/crypto/x509v3/v3_pcons.c
diff --git a/openssl/crypto/x509v3/v3_pku.c b/main/openssl/crypto/x509v3/v3_pku.c
index 076f3ff4..076f3ff4 100644
--- a/openssl/crypto/x509v3/v3_pku.c
+++ b/main/openssl/crypto/x509v3/v3_pku.c
diff --git a/openssl/crypto/x509v3/v3_pmaps.c b/main/openssl/crypto/x509v3/v3_pmaps.c
index 865bcd39..865bcd39 100644
--- a/openssl/crypto/x509v3/v3_pmaps.c
+++ b/main/openssl/crypto/x509v3/v3_pmaps.c
diff --git a/openssl/crypto/x509v3/v3_prn.c b/main/openssl/crypto/x509v3/v3_prn.c
index 31462187..31462187 100644
--- a/openssl/crypto/x509v3/v3_prn.c
+++ b/main/openssl/crypto/x509v3/v3_prn.c
diff --git a/openssl/crypto/x509v3/v3_purp.c b/main/openssl/crypto/x509v3/v3_purp.c
index 181bd349..181bd349 100644
--- a/openssl/crypto/x509v3/v3_purp.c
+++ b/main/openssl/crypto/x509v3/v3_purp.c
diff --git a/openssl/crypto/x509v3/v3_skey.c b/main/openssl/crypto/x509v3/v3_skey.c
index 202c9e48..202c9e48 100644
--- a/openssl/crypto/x509v3/v3_skey.c
+++ b/main/openssl/crypto/x509v3/v3_skey.c
diff --git a/openssl/crypto/x509v3/v3_sxnet.c b/main/openssl/crypto/x509v3/v3_sxnet.c
index 2a6bf11b..2a6bf11b 100644
--- a/openssl/crypto/x509v3/v3_sxnet.c
+++ b/main/openssl/crypto/x509v3/v3_sxnet.c
diff --git a/openssl/crypto/x509v3/v3_utl.c b/main/openssl/crypto/x509v3/v3_utl.c
index e0302345..e0302345 100644
--- a/openssl/crypto/x509v3/v3_utl.c
+++ b/main/openssl/crypto/x509v3/v3_utl.c
diff --git a/openssl/crypto/x509v3/v3conf.c b/main/openssl/crypto/x509v3/v3conf.c
index a9e6ca35..a9e6ca35 100644
--- a/openssl/crypto/x509v3/v3conf.c
+++ b/main/openssl/crypto/x509v3/v3conf.c
diff --git a/openssl/crypto/x509v3/v3err.c b/main/openssl/crypto/x509v3/v3err.c
index f9f6f1f9..f9f6f1f9 100644
--- a/openssl/crypto/x509v3/v3err.c
+++ b/main/openssl/crypto/x509v3/v3err.c
diff --git a/openssl/crypto/x509v3/v3prin.c b/main/openssl/crypto/x509v3/v3prin.c
index d5ff2682..d5ff2682 100644
--- a/openssl/crypto/x509v3/v3prin.c
+++ b/main/openssl/crypto/x509v3/v3prin.c
diff --git a/openssl/crypto/x509v3/x509v3.h b/main/openssl/crypto/x509v3/x509v3.h
index b308abe7..b308abe7 100644
--- a/openssl/crypto/x509v3/x509v3.h
+++ b/main/openssl/crypto/x509v3/x509v3.h
diff --git a/openssl/crypto/x86_64cpuid.pl b/main/openssl/crypto/x86_64cpuid.pl
index c96821a3..c96821a3 100644
--- a/openssl/crypto/x86_64cpuid.pl
+++ b/main/openssl/crypto/x86_64cpuid.pl
diff --git a/openssl/crypto/x86cpuid.pl b/main/openssl/crypto/x86cpuid.pl
index a7464af1..a7464af1 100644
--- a/openssl/crypto/x86cpuid.pl
+++ b/main/openssl/crypto/x86cpuid.pl
diff --git a/openssl/e_os.h b/main/openssl/e_os.h
index 5ceeeeb9..5ceeeeb9 100644
--- a/openssl/e_os.h
+++ b/main/openssl/e_os.h
diff --git a/openssl/e_os2.h b/main/openssl/e_os2.h
index 4c785c62..4c785c62 100644
--- a/openssl/e_os2.h
+++ b/main/openssl/e_os2.h
diff --git a/openssl/import_openssl.sh b/main/openssl/import_openssl.sh
index 6f601989..6f601989 100755
--- a/openssl/import_openssl.sh
+++ b/main/openssl/import_openssl.sh
diff --git a/openssl/include/openssl/aes.h b/main/openssl/include/openssl/aes.h
index d2c99730..d2c99730 100644
--- a/openssl/include/openssl/aes.h
+++ b/main/openssl/include/openssl/aes.h
diff --git a/openssl/include/openssl/asn1.h b/main/openssl/include/openssl/asn1.h
index 59540e4e..59540e4e 100644
--- a/openssl/include/openssl/asn1.h
+++ b/main/openssl/include/openssl/asn1.h
diff --git a/openssl/include/openssl/asn1_mac.h b/main/openssl/include/openssl/asn1_mac.h
index 87bd0e9e..87bd0e9e 100644
--- a/openssl/include/openssl/asn1_mac.h
+++ b/main/openssl/include/openssl/asn1_mac.h
diff --git a/openssl/include/openssl/asn1t.h b/main/openssl/include/openssl/asn1t.h
index d230e4bf..d230e4bf 100644
--- a/openssl/include/openssl/asn1t.h
+++ b/main/openssl/include/openssl/asn1t.h
diff --git a/openssl/include/openssl/bio.h b/main/openssl/include/openssl/bio.h
index 152802fb..152802fb 100644
--- a/openssl/include/openssl/bio.h
+++ b/main/openssl/include/openssl/bio.h
diff --git a/openssl/include/openssl/blowfish.h b/main/openssl/include/openssl/blowfish.h
index b97e76f9..b97e76f9 100644
--- a/openssl/include/openssl/blowfish.h
+++ b/main/openssl/include/openssl/blowfish.h
diff --git a/openssl/include/openssl/bn.h b/main/openssl/include/openssl/bn.h
index a0bc4783..a0bc4783 100644
--- a/openssl/include/openssl/bn.h
+++ b/main/openssl/include/openssl/bn.h
diff --git a/openssl/include/openssl/buffer.h b/main/openssl/include/openssl/buffer.h
index 178e4182..178e4182 100644
--- a/openssl/include/openssl/buffer.h
+++ b/main/openssl/include/openssl/buffer.h
diff --git a/openssl/include/openssl/comp.h b/main/openssl/include/openssl/comp.h
index 4b405c7d..4b405c7d 100644
--- a/openssl/include/openssl/comp.h
+++ b/main/openssl/include/openssl/comp.h
diff --git a/openssl/include/openssl/conf.h b/main/openssl/include/openssl/conf.h
index c2199978..c2199978 100644
--- a/openssl/include/openssl/conf.h
+++ b/main/openssl/include/openssl/conf.h
diff --git a/openssl/include/openssl/conf_api.h b/main/openssl/include/openssl/conf_api.h
index 87a954af..87a954af 100644
--- a/openssl/include/openssl/conf_api.h
+++ b/main/openssl/include/openssl/conf_api.h
diff --git a/openssl/include/openssl/crypto.h b/main/openssl/include/openssl/crypto.h
index b0360cec..b0360cec 100644
--- a/openssl/include/openssl/crypto.h
+++ b/main/openssl/include/openssl/crypto.h
diff --git a/openssl/include/openssl/des.h b/main/openssl/include/openssl/des.h
index 92b66635..92b66635 100644
--- a/openssl/include/openssl/des.h
+++ b/main/openssl/include/openssl/des.h
diff --git a/openssl/include/openssl/des_old.h b/main/openssl/include/openssl/des_old.h
index 2b2c3723..2b2c3723 100644
--- a/openssl/include/openssl/des_old.h
+++ b/main/openssl/include/openssl/des_old.h
diff --git a/openssl/include/openssl/dh.h b/main/openssl/include/openssl/dh.h
index 849309a4..849309a4 100644
--- a/openssl/include/openssl/dh.h
+++ b/main/openssl/include/openssl/dh.h
diff --git a/openssl/include/openssl/dsa.h b/main/openssl/include/openssl/dsa.h
index ac50a5c8..ac50a5c8 100644
--- a/openssl/include/openssl/dsa.h
+++ b/main/openssl/include/openssl/dsa.h
diff --git a/openssl/include/openssl/dso.h b/main/openssl/include/openssl/dso.h
index 839f2e06..839f2e06 100644
--- a/openssl/include/openssl/dso.h
+++ b/main/openssl/include/openssl/dso.h
diff --git a/openssl/include/openssl/dtls1.h b/main/openssl/include/openssl/dtls1.h
index 2900d1d8..2900d1d8 100644
--- a/openssl/include/openssl/dtls1.h
+++ b/main/openssl/include/openssl/dtls1.h
diff --git a/openssl/include/openssl/e_os2.h b/main/openssl/include/openssl/e_os2.h
index 4c785c62..4c785c62 100644
--- a/openssl/include/openssl/e_os2.h
+++ b/main/openssl/include/openssl/e_os2.h
diff --git a/openssl/include/openssl/ebcdic.h b/main/openssl/include/openssl/ebcdic.h
index 6d65afcf..6d65afcf 100644
--- a/openssl/include/openssl/ebcdic.h
+++ b/main/openssl/include/openssl/ebcdic.h
diff --git a/openssl/include/openssl/ec.h b/main/openssl/include/openssl/ec.h
index ee707813..ee707813 100644
--- a/openssl/include/openssl/ec.h
+++ b/main/openssl/include/openssl/ec.h
diff --git a/openssl/include/openssl/ecdh.h b/main/openssl/include/openssl/ecdh.h
index b4b58ee6..b4b58ee6 100644
--- a/openssl/include/openssl/ecdh.h
+++ b/main/openssl/include/openssl/ecdh.h
diff --git a/openssl/include/openssl/ecdsa.h b/main/openssl/include/openssl/ecdsa.h
index e61c5398..e61c5398 100644
--- a/openssl/include/openssl/ecdsa.h
+++ b/main/openssl/include/openssl/ecdsa.h
diff --git a/openssl/include/openssl/engine.h b/main/openssl/include/openssl/engine.h
index 943aeae2..943aeae2 100644
--- a/openssl/include/openssl/engine.h
+++ b/main/openssl/include/openssl/engine.h
diff --git a/openssl/include/openssl/err.h b/main/openssl/include/openssl/err.h
index b9f8c16d..b9f8c16d 100644
--- a/openssl/include/openssl/err.h
+++ b/main/openssl/include/openssl/err.h
diff --git a/openssl/include/openssl/evp.h b/main/openssl/include/openssl/evp.h
index 9f9795e2..9f9795e2 100644
--- a/openssl/include/openssl/evp.h
+++ b/main/openssl/include/openssl/evp.h
diff --git a/openssl/include/openssl/hmac.h b/main/openssl/include/openssl/hmac.h
index 1be00221..1be00221 100644
--- a/openssl/include/openssl/hmac.h
+++ b/main/openssl/include/openssl/hmac.h
diff --git a/openssl/include/openssl/krb5_asn.h b/main/openssl/include/openssl/krb5_asn.h
index 41725d0d..41725d0d 100644
--- a/openssl/include/openssl/krb5_asn.h
+++ b/main/openssl/include/openssl/krb5_asn.h
diff --git a/openssl/include/openssl/kssl.h b/main/openssl/include/openssl/kssl.h
index a3d20e1c..a3d20e1c 100644
--- a/openssl/include/openssl/kssl.h
+++ b/main/openssl/include/openssl/kssl.h
diff --git a/openssl/include/openssl/lhash.h b/main/openssl/include/openssl/lhash.h
index e7d87635..e7d87635 100644
--- a/openssl/include/openssl/lhash.h
+++ b/main/openssl/include/openssl/lhash.h
diff --git a/openssl/include/openssl/md4.h b/main/openssl/include/openssl/md4.h
index c3ed9b3f..c3ed9b3f 100644
--- a/openssl/include/openssl/md4.h
+++ b/main/openssl/include/openssl/md4.h
diff --git a/openssl/include/openssl/md5.h b/main/openssl/include/openssl/md5.h
index 4cbf8438..4cbf8438 100644
--- a/openssl/include/openssl/md5.h
+++ b/main/openssl/include/openssl/md5.h
diff --git a/openssl/include/openssl/modes.h b/main/openssl/include/openssl/modes.h
index af8d97d7..af8d97d7 100644
--- a/openssl/include/openssl/modes.h
+++ b/main/openssl/include/openssl/modes.h
diff --git a/openssl/include/openssl/obj_mac.h b/main/openssl/include/openssl/obj_mac.h
index 282f11a8..282f11a8 100644
--- a/openssl/include/openssl/obj_mac.h
+++ b/main/openssl/include/openssl/obj_mac.h
diff --git a/openssl/include/openssl/objects.h b/main/openssl/include/openssl/objects.h
index bd0ee52f..bd0ee52f 100644
--- a/openssl/include/openssl/objects.h
+++ b/main/openssl/include/openssl/objects.h
diff --git a/openssl/include/openssl/ocsp.h b/main/openssl/include/openssl/ocsp.h
index 31e45744..31e45744 100644
--- a/openssl/include/openssl/ocsp.h
+++ b/main/openssl/include/openssl/ocsp.h
diff --git a/openssl/include/openssl/opensslconf.h b/main/openssl/include/openssl/opensslconf.h
index 26ac6ba3..26ac6ba3 100644
--- a/openssl/include/openssl/opensslconf.h
+++ b/main/openssl/include/openssl/opensslconf.h
diff --git a/openssl/include/openssl/opensslv.h b/main/openssl/include/openssl/opensslv.h
index 310a3387..310a3387 100644
--- a/openssl/include/openssl/opensslv.h
+++ b/main/openssl/include/openssl/opensslv.h
diff --git a/openssl/include/openssl/ossl_typ.h b/main/openssl/include/openssl/ossl_typ.h
index 12bd7014..12bd7014 100644
--- a/openssl/include/openssl/ossl_typ.h
+++ b/main/openssl/include/openssl/ossl_typ.h
diff --git a/openssl/include/openssl/pem.h b/main/openssl/include/openssl/pem.h
index 8a6ababe..8a6ababe 100644
--- a/openssl/include/openssl/pem.h
+++ b/main/openssl/include/openssl/pem.h
diff --git a/openssl/include/openssl/pem2.h b/main/openssl/include/openssl/pem2.h
index f31790d6..f31790d6 100644
--- a/openssl/include/openssl/pem2.h
+++ b/main/openssl/include/openssl/pem2.h
diff --git a/openssl/include/openssl/pkcs12.h b/main/openssl/include/openssl/pkcs12.h
index b17eb9f4..b17eb9f4 100644
--- a/openssl/include/openssl/pkcs12.h
+++ b/main/openssl/include/openssl/pkcs12.h
diff --git a/openssl/include/openssl/pkcs7.h b/main/openssl/include/openssl/pkcs7.h
index e4d44319..e4d44319 100644
--- a/openssl/include/openssl/pkcs7.h
+++ b/main/openssl/include/openssl/pkcs7.h
diff --git a/openssl/include/openssl/pqueue.h b/main/openssl/include/openssl/pqueue.h
index 87fc9037..87fc9037 100644
--- a/openssl/include/openssl/pqueue.h
+++ b/main/openssl/include/openssl/pqueue.h
diff --git a/openssl/include/openssl/rand.h b/main/openssl/include/openssl/rand.h
index ac6c0217..ac6c0217 100644
--- a/openssl/include/openssl/rand.h
+++ b/main/openssl/include/openssl/rand.h
diff --git a/openssl/include/openssl/rc2.h b/main/openssl/include/openssl/rc2.h
index 34c83623..34c83623 100644
--- a/openssl/include/openssl/rc2.h
+++ b/main/openssl/include/openssl/rc2.h
diff --git a/openssl/include/openssl/rc4.h b/main/openssl/include/openssl/rc4.h
index 29d1accc..29d1accc 100644
--- a/openssl/include/openssl/rc4.h
+++ b/main/openssl/include/openssl/rc4.h
diff --git a/openssl/include/openssl/ripemd.h b/main/openssl/include/openssl/ripemd.h
index 5942eb61..5942eb61 100644
--- a/openssl/include/openssl/ripemd.h
+++ b/main/openssl/include/openssl/ripemd.h
diff --git a/openssl/include/openssl/rsa.h b/main/openssl/include/openssl/rsa.h
index cf743436..cf743436 100644
--- a/openssl/include/openssl/rsa.h
+++ b/main/openssl/include/openssl/rsa.h
diff --git a/openssl/include/openssl/safestack.h b/main/openssl/include/openssl/safestack.h
index 3e76aa58..3e76aa58 100644
--- a/openssl/include/openssl/safestack.h
+++ b/main/openssl/include/openssl/safestack.h
diff --git a/openssl/include/openssl/sha.h b/main/openssl/include/openssl/sha.h
index 16cacf9f..16cacf9f 100644
--- a/openssl/include/openssl/sha.h
+++ b/main/openssl/include/openssl/sha.h
diff --git a/openssl/include/openssl/ssl.h b/main/openssl/include/openssl/ssl.h
index 9cb2bf93..9cb2bf93 100644
--- a/openssl/include/openssl/ssl.h
+++ b/main/openssl/include/openssl/ssl.h
diff --git a/openssl/include/openssl/ssl2.h b/main/openssl/include/openssl/ssl2.h
index 99a52ea0..99a52ea0 100644
--- a/openssl/include/openssl/ssl2.h
+++ b/main/openssl/include/openssl/ssl2.h
diff --git a/openssl/include/openssl/ssl23.h b/main/openssl/include/openssl/ssl23.h
index d3228983..d3228983 100644
--- a/openssl/include/openssl/ssl23.h
+++ b/main/openssl/include/openssl/ssl23.h
diff --git a/openssl/include/openssl/ssl3.h b/main/openssl/include/openssl/ssl3.h
index f9268c57..f9268c57 100644
--- a/openssl/include/openssl/ssl3.h
+++ b/main/openssl/include/openssl/ssl3.h
diff --git a/openssl/include/openssl/stack.h b/main/openssl/include/openssl/stack.h
index ce35e554..ce35e554 100644
--- a/openssl/include/openssl/stack.h
+++ b/main/openssl/include/openssl/stack.h
diff --git a/openssl/include/openssl/symhacks.h b/main/openssl/include/openssl/symhacks.h
index 3fd4a816..3fd4a816 100644
--- a/openssl/include/openssl/symhacks.h
+++ b/main/openssl/include/openssl/symhacks.h
diff --git a/openssl/include/openssl/tls1.h b/main/openssl/include/openssl/tls1.h
index 76f368ac..76f368ac 100644
--- a/openssl/include/openssl/tls1.h
+++ b/main/openssl/include/openssl/tls1.h
diff --git a/openssl/include/openssl/ts.h b/main/openssl/include/openssl/ts.h
index 190e8a1b..190e8a1b 100644
--- a/openssl/include/openssl/ts.h
+++ b/main/openssl/include/openssl/ts.h
diff --git a/openssl/include/openssl/txt_db.h b/main/openssl/include/openssl/txt_db.h
index 6abe435b..6abe435b 100644
--- a/openssl/include/openssl/txt_db.h
+++ b/main/openssl/include/openssl/txt_db.h
diff --git a/openssl/include/openssl/ui.h b/main/openssl/include/openssl/ui.h
index 2b1cfa22..2b1cfa22 100644
--- a/openssl/include/openssl/ui.h
+++ b/main/openssl/include/openssl/ui.h
diff --git a/openssl/include/openssl/ui_compat.h b/main/openssl/include/openssl/ui_compat.h
index b35c9bb7..b35c9bb7 100644
--- a/openssl/include/openssl/ui_compat.h
+++ b/main/openssl/include/openssl/ui_compat.h
diff --git a/openssl/include/openssl/x509.h b/main/openssl/include/openssl/x509.h
index e6f8a403..e6f8a403 100644
--- a/openssl/include/openssl/x509.h
+++ b/main/openssl/include/openssl/x509.h
diff --git a/openssl/include/openssl/x509_vfy.h b/main/openssl/include/openssl/x509_vfy.h
index fe09b30a..fe09b30a 100644
--- a/openssl/include/openssl/x509_vfy.h
+++ b/main/openssl/include/openssl/x509_vfy.h
diff --git a/openssl/include/openssl/x509v3.h b/main/openssl/include/openssl/x509v3.h
index b308abe7..b308abe7 100644
--- a/openssl/include/openssl/x509v3.h
+++ b/main/openssl/include/openssl/x509v3.h
diff --git a/openssl/openssl.config b/main/openssl/openssl.config
index 293c744c..293c744c 100644
--- a/openssl/openssl.config
+++ b/main/openssl/openssl.config
diff --git a/openssl/openssl.version b/main/openssl/openssl.version
index 721c467b..721c467b 100644
--- a/openssl/openssl.version
+++ b/main/openssl/openssl.version
diff --git a/openssl/patches/README b/main/openssl/patches/README
index 54b6e068..54b6e068 100644
--- a/openssl/patches/README
+++ b/main/openssl/patches/README
diff --git a/openssl/patches/apps_Android.mk b/main/openssl/patches/apps_Android.mk
index 20cc5a9d..20cc5a9d 100644
--- a/openssl/patches/apps_Android.mk
+++ b/main/openssl/patches/apps_Android.mk
diff --git a/openssl/patches/crypto_Android.mk b/main/openssl/patches/crypto_Android.mk
index 6f09fa53..6f09fa53 100644
--- a/openssl/patches/crypto_Android.mk
+++ b/main/openssl/patches/crypto_Android.mk
diff --git a/openssl/patches/handshake_cutthrough.patch b/main/openssl/patches/handshake_cutthrough.patch
index 4f298399..4f298399 100644
--- a/openssl/patches/handshake_cutthrough.patch
+++ b/main/openssl/patches/handshake_cutthrough.patch
diff --git a/openssl/patches/jsse.patch b/main/openssl/patches/jsse.patch
index 249fb5b2..249fb5b2 100644
--- a/openssl/patches/jsse.patch
+++ b/main/openssl/patches/jsse.patch
diff --git a/openssl/patches/npn.patch b/main/openssl/patches/npn.patch
index 46b7a7df..46b7a7df 100644
--- a/openssl/patches/npn.patch
+++ b/main/openssl/patches/npn.patch
diff --git a/openssl/patches/progs.patch b/main/openssl/patches/progs.patch
index 16fd9b0b..16fd9b0b 100644
--- a/openssl/patches/progs.patch
+++ b/main/openssl/patches/progs.patch
diff --git a/openssl/patches/sha1_armv4_large.patch b/main/openssl/patches/sha1_armv4_large.patch
index 359ff94a..359ff94a 100644
--- a/openssl/patches/sha1_armv4_large.patch
+++ b/main/openssl/patches/sha1_armv4_large.patch
diff --git a/openssl/patches/small_records.patch b/main/openssl/patches/small_records.patch
index a2ea51ca..a2ea51ca 100644
--- a/openssl/patches/small_records.patch
+++ b/main/openssl/patches/small_records.patch
diff --git a/openssl/patches/ssl_Android.mk b/main/openssl/patches/ssl_Android.mk
index 487aabbc..487aabbc 100644
--- a/openssl/patches/ssl_Android.mk
+++ b/main/openssl/patches/ssl_Android.mk
diff --git a/openssl/patches/sslv3_uninit_padding.patch b/main/openssl/patches/sslv3_uninit_padding.patch
index 89fff7b5..89fff7b5 100644
--- a/openssl/patches/sslv3_uninit_padding.patch
+++ b/main/openssl/patches/sslv3_uninit_padding.patch
diff --git a/openssl/patches/testssl.sh b/main/openssl/patches/testssl.sh
index cd560928..cd560928 100755
--- a/openssl/patches/testssl.sh
+++ b/main/openssl/patches/testssl.sh
diff --git a/openssl/ssl/Android.mk b/main/openssl/ssl/Android.mk
index 1319d5e1..1319d5e1 100644
--- a/openssl/ssl/Android.mk
+++ b/main/openssl/ssl/Android.mk
diff --git a/openssl/ssl/Makefile b/main/openssl/ssl/Makefile
index 2b275faf..2b275faf 100644
--- a/openssl/ssl/Makefile
+++ b/main/openssl/ssl/Makefile
diff --git a/openssl/ssl/bio_ssl.c b/main/openssl/ssl/bio_ssl.c
index eedac8a3..eedac8a3 100644
--- a/openssl/ssl/bio_ssl.c
+++ b/main/openssl/ssl/bio_ssl.c
diff --git a/openssl/ssl/d1_both.c b/main/openssl/ssl/d1_both.c
index 2180c6d4..2180c6d4 100644
--- a/openssl/ssl/d1_both.c
+++ b/main/openssl/ssl/d1_both.c
diff --git a/openssl/ssl/d1_clnt.c b/main/openssl/ssl/d1_clnt.c
index 57766717..57766717 100644
--- a/openssl/ssl/d1_clnt.c
+++ b/main/openssl/ssl/d1_clnt.c
diff --git a/openssl/ssl/d1_enc.c b/main/openssl/ssl/d1_enc.c
index becbab91..becbab91 100644
--- a/openssl/ssl/d1_enc.c
+++ b/main/openssl/ssl/d1_enc.c
diff --git a/openssl/ssl/d1_lib.c b/main/openssl/ssl/d1_lib.c
index 48e8b6ff..48e8b6ff 100644
--- a/openssl/ssl/d1_lib.c
+++ b/main/openssl/ssl/d1_lib.c
diff --git a/openssl/ssl/d1_meth.c b/main/openssl/ssl/d1_meth.c
index 5c4004bf..5c4004bf 100644
--- a/openssl/ssl/d1_meth.c
+++ b/main/openssl/ssl/d1_meth.c
diff --git a/openssl/ssl/d1_pkt.c b/main/openssl/ssl/d1_pkt.c
index 91562f35..91562f35 100644
--- a/openssl/ssl/d1_pkt.c
+++ b/main/openssl/ssl/d1_pkt.c
diff --git a/openssl/ssl/d1_srvr.c b/main/openssl/ssl/d1_srvr.c
index a6a4c87e..a6a4c87e 100644
--- a/openssl/ssl/d1_srvr.c
+++ b/main/openssl/ssl/d1_srvr.c
diff --git a/openssl/ssl/dtls1.h b/main/openssl/ssl/dtls1.h
index 2900d1d8..2900d1d8 100644
--- a/openssl/ssl/dtls1.h
+++ b/main/openssl/ssl/dtls1.h
diff --git a/openssl/ssl/kssl.c b/main/openssl/ssl/kssl.c
index b820e374..b820e374 100644
--- a/openssl/ssl/kssl.c
+++ b/main/openssl/ssl/kssl.c
diff --git a/openssl/ssl/kssl.h b/main/openssl/ssl/kssl.h
index a3d20e1c..a3d20e1c 100644
--- a/openssl/ssl/kssl.h
+++ b/main/openssl/ssl/kssl.h
diff --git a/openssl/ssl/kssl_lcl.h b/main/openssl/ssl/kssl_lcl.h
index c039c91b..c039c91b 100644
--- a/openssl/ssl/kssl_lcl.h
+++ b/main/openssl/ssl/kssl_lcl.h
diff --git a/openssl/ssl/s23_clnt.c b/main/openssl/ssl/s23_clnt.c
index f41fe3ab..f41fe3ab 100644
--- a/openssl/ssl/s23_clnt.c
+++ b/main/openssl/ssl/s23_clnt.c
diff --git a/openssl/ssl/s23_lib.c b/main/openssl/ssl/s23_lib.c
index 3bf72831..3bf72831 100644
--- a/openssl/ssl/s23_lib.c
+++ b/main/openssl/ssl/s23_lib.c
diff --git a/openssl/ssl/s23_meth.c b/main/openssl/ssl/s23_meth.c
index c6099efc..c6099efc 100644
--- a/openssl/ssl/s23_meth.c
+++ b/main/openssl/ssl/s23_meth.c
diff --git a/openssl/ssl/s23_pkt.c b/main/openssl/ssl/s23_pkt.c
index 4ca6a1b2..4ca6a1b2 100644
--- a/openssl/ssl/s23_pkt.c
+++ b/main/openssl/ssl/s23_pkt.c
diff --git a/openssl/ssl/s23_srvr.c b/main/openssl/ssl/s23_srvr.c
index e22879c8..e22879c8 100644
--- a/openssl/ssl/s23_srvr.c
+++ b/main/openssl/ssl/s23_srvr.c
diff --git a/openssl/ssl/s2_clnt.c b/main/openssl/ssl/s2_clnt.c
index 00ac158f..00ac158f 100644
--- a/openssl/ssl/s2_clnt.c
+++ b/main/openssl/ssl/s2_clnt.c
diff --git a/openssl/ssl/s2_enc.c b/main/openssl/ssl/s2_enc.c
index ff3395f4..ff3395f4 100644
--- a/openssl/ssl/s2_enc.c
+++ b/main/openssl/ssl/s2_enc.c
diff --git a/openssl/ssl/s2_lib.c b/main/openssl/ssl/s2_lib.c
index 99146041..99146041 100644
--- a/openssl/ssl/s2_lib.c
+++ b/main/openssl/ssl/s2_lib.c
diff --git a/openssl/ssl/s2_meth.c b/main/openssl/ssl/s2_meth.c
index f0e8ca59..f0e8ca59 100644
--- a/openssl/ssl/s2_meth.c
+++ b/main/openssl/ssl/s2_meth.c
diff --git a/openssl/ssl/s2_pkt.c b/main/openssl/ssl/s2_pkt.c
index ac963b2d..ac963b2d 100644
--- a/openssl/ssl/s2_pkt.c
+++ b/main/openssl/ssl/s2_pkt.c
diff --git a/openssl/ssl/s2_srvr.c b/main/openssl/ssl/s2_srvr.c
index bc885e8e..bc885e8e 100644
--- a/openssl/ssl/s2_srvr.c
+++ b/main/openssl/ssl/s2_srvr.c
diff --git a/openssl/ssl/s3_both.c b/main/openssl/ssl/s3_both.c
index 508e3902..508e3902 100644
--- a/openssl/ssl/s3_both.c
+++ b/main/openssl/ssl/s3_both.c
diff --git a/openssl/ssl/s3_clnt.c b/main/openssl/ssl/s3_clnt.c
index 42bcd629..42bcd629 100644
--- a/openssl/ssl/s3_clnt.c
+++ b/main/openssl/ssl/s3_clnt.c
diff --git a/openssl/ssl/s3_enc.c b/main/openssl/ssl/s3_enc.c
index b1459707..b1459707 100644
--- a/openssl/ssl/s3_enc.c
+++ b/main/openssl/ssl/s3_enc.c
diff --git a/openssl/ssl/s3_lib.c b/main/openssl/ssl/s3_lib.c
index 28ee4746..28ee4746 100644
--- a/openssl/ssl/s3_lib.c
+++ b/main/openssl/ssl/s3_lib.c
diff --git a/openssl/ssl/s3_meth.c b/main/openssl/ssl/s3_meth.c
index cdddb17b..cdddb17b 100644
--- a/openssl/ssl/s3_meth.c
+++ b/main/openssl/ssl/s3_meth.c
diff --git a/openssl/ssl/s3_pkt.c b/main/openssl/ssl/s3_pkt.c
index 0d3874ae..0d3874ae 100644
--- a/openssl/ssl/s3_pkt.c
+++ b/main/openssl/ssl/s3_pkt.c
diff --git a/openssl/ssl/s3_srvr.c b/main/openssl/ssl/s3_srvr.c
index 60591622..60591622 100644
--- a/openssl/ssl/s3_srvr.c
+++ b/main/openssl/ssl/s3_srvr.c
diff --git a/openssl/ssl/ssl.h b/main/openssl/ssl/ssl.h
index 9cb2bf93..9cb2bf93 100644
--- a/openssl/ssl/ssl.h
+++ b/main/openssl/ssl/ssl.h
diff --git a/openssl/ssl/ssl2.h b/main/openssl/ssl/ssl2.h
index 99a52ea0..99a52ea0 100644
--- a/openssl/ssl/ssl2.h
+++ b/main/openssl/ssl/ssl2.h
diff --git a/openssl/ssl/ssl23.h b/main/openssl/ssl/ssl23.h
index d3228983..d3228983 100644
--- a/openssl/ssl/ssl23.h
+++ b/main/openssl/ssl/ssl23.h
diff --git a/openssl/ssl/ssl3.h b/main/openssl/ssl/ssl3.h
index f9268c57..f9268c57 100644
--- a/openssl/ssl/ssl3.h
+++ b/main/openssl/ssl/ssl3.h
diff --git a/openssl/ssl/ssl_algs.c b/main/openssl/ssl/ssl_algs.c
index 0967b2df..0967b2df 100644
--- a/openssl/ssl/ssl_algs.c
+++ b/main/openssl/ssl/ssl_algs.c
diff --git a/openssl/ssl/ssl_asn1.c b/main/openssl/ssl/ssl_asn1.c
index d7f4c608..d7f4c608 100644
--- a/openssl/ssl/ssl_asn1.c
+++ b/main/openssl/ssl/ssl_asn1.c
diff --git a/openssl/ssl/ssl_cert.c b/main/openssl/ssl/ssl_cert.c
index 27256eea..27256eea 100644
--- a/openssl/ssl/ssl_cert.c
+++ b/main/openssl/ssl/ssl_cert.c
diff --git a/openssl/ssl/ssl_ciph.c b/main/openssl/ssl/ssl_ciph.c
index e523a8f2..e523a8f2 100644
--- a/openssl/ssl/ssl_ciph.c
+++ b/main/openssl/ssl/ssl_ciph.c
diff --git a/openssl/ssl/ssl_err.c b/main/openssl/ssl/ssl_err.c
index 8bff5905..8bff5905 100644
--- a/openssl/ssl/ssl_err.c
+++ b/main/openssl/ssl/ssl_err.c
diff --git a/openssl/ssl/ssl_err2.c b/main/openssl/ssl/ssl_err2.c
index ea95a5f9..ea95a5f9 100644
--- a/openssl/ssl/ssl_err2.c
+++ b/main/openssl/ssl/ssl_err2.c
diff --git a/openssl/ssl/ssl_lib.c b/main/openssl/ssl/ssl_lib.c
index b169ba93..b169ba93 100644
--- a/openssl/ssl/ssl_lib.c
+++ b/main/openssl/ssl/ssl_lib.c
diff --git a/openssl/ssl/ssl_locl.h b/main/openssl/ssl/ssl_locl.h
index 25f8e16c..25f8e16c 100644
--- a/openssl/ssl/ssl_locl.h
+++ b/main/openssl/ssl/ssl_locl.h
diff --git a/openssl/ssl/ssl_rsa.c b/main/openssl/ssl/ssl_rsa.c
index c43f3e2a..c43f3e2a 100644
--- a/openssl/ssl/ssl_rsa.c
+++ b/main/openssl/ssl/ssl_rsa.c
diff --git a/openssl/ssl/ssl_sess.c b/main/openssl/ssl/ssl_sess.c
index 93954e48..93954e48 100644
--- a/openssl/ssl/ssl_sess.c
+++ b/main/openssl/ssl/ssl_sess.c
diff --git a/openssl/ssl/ssl_stat.c b/main/openssl/ssl/ssl_stat.c
index 144b81e5..144b81e5 100644
--- a/openssl/ssl/ssl_stat.c
+++ b/main/openssl/ssl/ssl_stat.c
diff --git a/openssl/ssl/ssl_txt.c b/main/openssl/ssl/ssl_txt.c
index 3122440e..3122440e 100644
--- a/openssl/ssl/ssl_txt.c
+++ b/main/openssl/ssl/ssl_txt.c
diff --git a/openssl/ssl/ssltest.c b/main/openssl/ssl/ssltest.c
index f6a2c79d..f6a2c79d 100644
--- a/openssl/ssl/ssltest.c
+++ b/main/openssl/ssl/ssltest.c
diff --git a/openssl/ssl/t1_clnt.c b/main/openssl/ssl/t1_clnt.c
index c87af177..c87af177 100644
--- a/openssl/ssl/t1_clnt.c
+++ b/main/openssl/ssl/t1_clnt.c
diff --git a/openssl/ssl/t1_enc.c b/main/openssl/ssl/t1_enc.c
index 793ea43e..793ea43e 100644
--- a/openssl/ssl/t1_enc.c
+++ b/main/openssl/ssl/t1_enc.c
diff --git a/openssl/ssl/t1_lib.c b/main/openssl/ssl/t1_lib.c
index bbab4675..bbab4675 100644
--- a/openssl/ssl/t1_lib.c
+++ b/main/openssl/ssl/t1_lib.c
diff --git a/openssl/ssl/t1_meth.c b/main/openssl/ssl/t1_meth.c
index 6ce7c0bb..6ce7c0bb 100644
--- a/openssl/ssl/t1_meth.c
+++ b/main/openssl/ssl/t1_meth.c
diff --git a/openssl/ssl/t1_reneg.c b/main/openssl/ssl/t1_reneg.c
index 9c2cc3c7..9c2cc3c7 100644
--- a/openssl/ssl/t1_reneg.c
+++ b/main/openssl/ssl/t1_reneg.c
diff --git a/openssl/ssl/t1_srvr.c b/main/openssl/ssl/t1_srvr.c
index 42525e9e..42525e9e 100644
--- a/openssl/ssl/t1_srvr.c
+++ b/main/openssl/ssl/t1_srvr.c
diff --git a/openssl/ssl/tls1.h b/main/openssl/ssl/tls1.h
index 76f368ac..76f368ac 100644
--- a/openssl/ssl/tls1.h
+++ b/main/openssl/ssl/tls1.h
diff --git a/openvpn/.gitignore b/main/openvpn/.gitignore
index 538c0208..538c0208 100644
--- a/openvpn/.gitignore
+++ b/main/openvpn/.gitignore
diff --git a/openvpn/.mailmap b/main/openvpn/.mailmap
index 91ff5537..91ff5537 100644
--- a/openvpn/.mailmap
+++ b/main/openvpn/.mailmap
diff --git a/openvpn/.svncommitters b/main/openvpn/.svncommitters
index 0772102d..0772102d 100644
--- a/openvpn/.svncommitters
+++ b/main/openvpn/.svncommitters
diff --git a/openvpn/AUTHORS b/main/openvpn/AUTHORS
index 0f90aa2a..0f90aa2a 100644
--- a/openvpn/AUTHORS
+++ b/main/openvpn/AUTHORS
diff --git a/openvpn/Android.mk b/main/openvpn/Android.mk
index b373497e..b373497e 100644
--- a/openvpn/Android.mk
+++ b/main/openvpn/Android.mk
diff --git a/openvpn/COPYING b/main/openvpn/COPYING
index f6e5c431..f6e5c431 100644
--- a/openvpn/COPYING
+++ b/main/openvpn/COPYING
diff --git a/openvpn/COPYRIGHT.GPL b/main/openvpn/COPYRIGHT.GPL
index ff8a7f00..ff8a7f00 100644
--- a/openvpn/COPYRIGHT.GPL
+++ b/main/openvpn/COPYRIGHT.GPL
diff --git a/openvpn/ChangeLog b/main/openvpn/ChangeLog
index 7b945c80..7b945c80 100644
--- a/openvpn/ChangeLog
+++ b/main/openvpn/ChangeLog
diff --git a/openvpn/INSTALL b/main/openvpn/INSTALL
index 2ef7904b..2ef7904b 100644
--- a/openvpn/INSTALL
+++ b/main/openvpn/INSTALL
diff --git a/openvpn/INSTALL-win32.txt b/main/openvpn/INSTALL-win32.txt
index 7c056858..7c056858 100644
--- a/openvpn/INSTALL-win32.txt
+++ b/main/openvpn/INSTALL-win32.txt
diff --git a/openvpn/Makefile.am b/main/openvpn/Makefile.am
index 1a30aa5a..1a30aa5a 100644
--- a/openvpn/Makefile.am
+++ b/main/openvpn/Makefile.am
diff --git a/openvpn/NEWS b/main/openvpn/NEWS
index e69de29b..e69de29b 100644
--- a/openvpn/NEWS
+++ b/main/openvpn/NEWS
diff --git a/openvpn/PORTS b/main/openvpn/PORTS
index 735493c7..735493c7 100644
--- a/openvpn/PORTS
+++ b/main/openvpn/PORTS
diff --git a/openvpn/README b/main/openvpn/README
index 349e08af..349e08af 100644
--- a/openvpn/README
+++ b/main/openvpn/README
diff --git a/openvpn/README.IPv6 b/main/openvpn/README.IPv6
index 18068fee..18068fee 100644
--- a/openvpn/README.IPv6
+++ b/main/openvpn/README.IPv6
diff --git a/openvpn/README.polarssl b/main/openvpn/README.polarssl
index ab7c2d78..ab7c2d78 100644
--- a/openvpn/README.polarssl
+++ b/main/openvpn/README.polarssl
diff --git a/openvpn/TODO.IPv6 b/main/openvpn/TODO.IPv6
index 24bf865a..24bf865a 100644
--- a/openvpn/TODO.IPv6
+++ b/main/openvpn/TODO.IPv6
diff --git a/openvpn/build/Makefile.am b/main/openvpn/build/Makefile.am
index b53ff52d..b53ff52d 100644
--- a/openvpn/build/Makefile.am
+++ b/main/openvpn/build/Makefile.am
diff --git a/openvpn/build/ltrc.inc b/main/openvpn/build/ltrc.inc
index 701f200d..701f200d 100644
--- a/openvpn/build/ltrc.inc
+++ b/main/openvpn/build/ltrc.inc
diff --git a/openvpn/build/msvc/Makefile.am b/main/openvpn/build/msvc/Makefile.am
index 7dc3def0..7dc3def0 100644
--- a/openvpn/build/msvc/Makefile.am
+++ b/main/openvpn/build/msvc/Makefile.am
diff --git a/openvpn/build/msvc/msvc-generate/Makefile.am b/main/openvpn/build/msvc/msvc-generate/Makefile.am
index 539fb6ce..539fb6ce 100644
--- a/openvpn/build/msvc/msvc-generate/Makefile.am
+++ b/main/openvpn/build/msvc/msvc-generate/Makefile.am
diff --git a/openvpn/build/msvc/msvc-generate/Makefile.mak b/main/openvpn/build/msvc/msvc-generate/Makefile.mak
index 72415f17..72415f17 100755
--- a/openvpn/build/msvc/msvc-generate/Makefile.mak
+++ b/main/openvpn/build/msvc/msvc-generate/Makefile.mak
diff --git a/openvpn/build/msvc/msvc-generate/msvc-generate.js b/main/openvpn/build/msvc/msvc-generate/msvc-generate.js
index d9564cfd..d9564cfd 100644
--- a/openvpn/build/msvc/msvc-generate/msvc-generate.js
+++ b/main/openvpn/build/msvc/msvc-generate/msvc-generate.js
diff --git a/openvpn/build/msvc/msvc-generate/msvc-generate.vcxproj b/main/openvpn/build/msvc/msvc-generate/msvc-generate.vcxproj
index e6491aba..e6491aba 100644
--- a/openvpn/build/msvc/msvc-generate/msvc-generate.vcxproj
+++ b/main/openvpn/build/msvc/msvc-generate/msvc-generate.vcxproj
diff --git a/openvpn/compat.m4 b/main/openvpn/compat.m4
index 4c132544..4c132544 100644
--- a/openvpn/compat.m4
+++ b/main/openvpn/compat.m4
diff --git a/openvpn/config-msvc-version.h.in b/main/openvpn/config-msvc-version.h.in
index 4bc89e7b..4bc89e7b 100644
--- a/openvpn/config-msvc-version.h.in
+++ b/main/openvpn/config-msvc-version.h.in
diff --git a/openvpn/config-msvc.h b/main/openvpn/config-msvc.h
index 99c00f9f..99c00f9f 100644
--- a/openvpn/config-msvc.h
+++ b/main/openvpn/config-msvc.h
diff --git a/openvpn/config-version.h b/main/openvpn/config-version.h
index 42a28412..42a28412 100644
--- a/openvpn/config-version.h
+++ b/main/openvpn/config-version.h
diff --git a/openvpn/config.h b/main/openvpn/config.h
index 993a46f1..993a46f1 100644
--- a/openvpn/config.h
+++ b/main/openvpn/config.h
diff --git a/openvpn/configure.ac b/main/openvpn/configure.ac
index 380dcdbb..380dcdbb 100644
--- a/openvpn/configure.ac
+++ b/main/openvpn/configure.ac
diff --git a/openvpn/contrib/OCSP_check/OCSP_check.sh b/main/openvpn/contrib/OCSP_check/OCSP_check.sh
index 847be450..847be450 100644
--- a/openvpn/contrib/OCSP_check/OCSP_check.sh
+++ b/main/openvpn/contrib/OCSP_check/OCSP_check.sh
diff --git a/openvpn/contrib/README b/main/openvpn/contrib/README
index e1a57d0e..e1a57d0e 100644
--- a/openvpn/contrib/README
+++ b/main/openvpn/contrib/README
diff --git a/openvpn/contrib/multilevel-init.patch b/main/openvpn/contrib/multilevel-init.patch
index 8d48fbcd..8d48fbcd 100644
--- a/openvpn/contrib/multilevel-init.patch
+++ b/main/openvpn/contrib/multilevel-init.patch
diff --git a/openvpn/contrib/openvpn-fwmarkroute-1.00/README b/main/openvpn/contrib/openvpn-fwmarkroute-1.00/README
index 66fe61ad..66fe61ad 100644
--- a/openvpn/contrib/openvpn-fwmarkroute-1.00/README
+++ b/main/openvpn/contrib/openvpn-fwmarkroute-1.00/README
diff --git a/openvpn/contrib/openvpn-fwmarkroute-1.00/fwmarkroute.down b/main/openvpn/contrib/openvpn-fwmarkroute-1.00/fwmarkroute.down
index 87d67d4d..87d67d4d 100755
--- a/openvpn/contrib/openvpn-fwmarkroute-1.00/fwmarkroute.down
+++ b/main/openvpn/contrib/openvpn-fwmarkroute-1.00/fwmarkroute.down
diff --git a/openvpn/contrib/openvpn-fwmarkroute-1.00/fwmarkroute.up b/main/openvpn/contrib/openvpn-fwmarkroute-1.00/fwmarkroute.up
index 661ec313..661ec313 100755
--- a/openvpn/contrib/openvpn-fwmarkroute-1.00/fwmarkroute.up
+++ b/main/openvpn/contrib/openvpn-fwmarkroute-1.00/fwmarkroute.up
diff --git a/openvpn/contrib/pull-resolv-conf/client.down b/main/openvpn/contrib/pull-resolv-conf/client.down
index 05f2d4d5..05f2d4d5 100644
--- a/openvpn/contrib/pull-resolv-conf/client.down
+++ b/main/openvpn/contrib/pull-resolv-conf/client.down
diff --git a/openvpn/contrib/pull-resolv-conf/client.up b/main/openvpn/contrib/pull-resolv-conf/client.up
index b28d4d19..b28d4d19 100644
--- a/openvpn/contrib/pull-resolv-conf/client.up
+++ b/main/openvpn/contrib/pull-resolv-conf/client.up
diff --git a/openvpn/debug/doval b/main/openvpn/debug/doval
index e2155107..e2155107 100755
--- a/openvpn/debug/doval
+++ b/main/openvpn/debug/doval
diff --git a/openvpn/debug/dovalns b/main/openvpn/debug/dovalns
index 482ae3fd..482ae3fd 100755
--- a/openvpn/debug/dovalns
+++ b/main/openvpn/debug/dovalns
diff --git a/openvpn/debug/valgrind-suppress b/main/openvpn/debug/valgrind-suppress
index d7de12fd..d7de12fd 100644
--- a/openvpn/debug/valgrind-suppress
+++ b/main/openvpn/debug/valgrind-suppress
diff --git a/openvpn/distro/Makefile.am b/main/openvpn/distro/Makefile.am
index 2dd6a6ee..2dd6a6ee 100644
--- a/openvpn/distro/Makefile.am
+++ b/main/openvpn/distro/Makefile.am
diff --git a/openvpn/distro/rpm/Makefile.am b/main/openvpn/distro/rpm/Makefile.am
index 536061dd..536061dd 100644
--- a/openvpn/distro/rpm/Makefile.am
+++ b/main/openvpn/distro/rpm/Makefile.am
diff --git a/openvpn/distro/rpm/openvpn.init.d.rhel b/main/openvpn/distro/rpm/openvpn.init.d.rhel
index 821abd58..821abd58 100755
--- a/openvpn/distro/rpm/openvpn.init.d.rhel
+++ b/main/openvpn/distro/rpm/openvpn.init.d.rhel
diff --git a/openvpn/distro/rpm/openvpn.init.d.suse b/main/openvpn/distro/rpm/openvpn.init.d.suse
index 2bac7f32..2bac7f32 100644
--- a/openvpn/distro/rpm/openvpn.init.d.suse
+++ b/main/openvpn/distro/rpm/openvpn.init.d.suse
diff --git a/openvpn/distro/rpm/openvpn.spec b/main/openvpn/distro/rpm/openvpn.spec
index 86ed85c9..86ed85c9 100644
--- a/openvpn/distro/rpm/openvpn.spec
+++ b/main/openvpn/distro/rpm/openvpn.spec
diff --git a/openvpn/distro/rpm/openvpn.spec.in b/main/openvpn/distro/rpm/openvpn.spec.in
index 20a8c890..20a8c890 100644
--- a/openvpn/distro/rpm/openvpn.spec.in
+++ b/main/openvpn/distro/rpm/openvpn.spec.in
diff --git a/openvpn/doc/Makefile.am b/main/openvpn/doc/Makefile.am
index d33e1edd..d33e1edd 100644
--- a/openvpn/doc/Makefile.am
+++ b/main/openvpn/doc/Makefile.am
diff --git a/openvpn/doc/README.plugins b/main/openvpn/doc/README.plugins
index 6e490c5a..6e490c5a 100644
--- a/openvpn/doc/README.plugins
+++ b/main/openvpn/doc/README.plugins
diff --git a/openvpn/doc/android.txt b/main/openvpn/doc/android.txt
index 871e3997..871e3997 100644
--- a/openvpn/doc/android.txt
+++ b/main/openvpn/doc/android.txt
diff --git a/openvpn/doc/doxygen/doc_compression.h b/main/openvpn/doc/doxygen/doc_compression.h
index bdc4a7ed..bdc4a7ed 100644
--- a/openvpn/doc/doxygen/doc_compression.h
+++ b/main/openvpn/doc/doxygen/doc_compression.h
diff --git a/openvpn/doc/doxygen/doc_control_processor.h b/main/openvpn/doc/doxygen/doc_control_processor.h
index 072dc372..072dc372 100644
--- a/openvpn/doc/doxygen/doc_control_processor.h
+++ b/main/openvpn/doc/doxygen/doc_control_processor.h
diff --git a/openvpn/doc/doxygen/doc_control_tls.h b/main/openvpn/doc/doxygen/doc_control_tls.h
index aba55f77..aba55f77 100644
--- a/openvpn/doc/doxygen/doc_control_tls.h
+++ b/main/openvpn/doc/doxygen/doc_control_tls.h
diff --git a/openvpn/doc/doxygen/doc_data_control.h b/main/openvpn/doc/doxygen/doc_data_control.h
index d0f65ba3..d0f65ba3 100644
--- a/openvpn/doc/doxygen/doc_data_control.h
+++ b/main/openvpn/doc/doxygen/doc_data_control.h
diff --git a/openvpn/doc/doxygen/doc_data_crypto.h b/main/openvpn/doc/doxygen/doc_data_crypto.h
index ee72b8cd..ee72b8cd 100644
--- a/openvpn/doc/doxygen/doc_data_crypto.h
+++ b/main/openvpn/doc/doxygen/doc_data_crypto.h
diff --git a/openvpn/doc/doxygen/doc_eventloop.h b/main/openvpn/doc/doxygen/doc_eventloop.h
index a860db68..a860db68 100644
--- a/openvpn/doc/doxygen/doc_eventloop.h
+++ b/main/openvpn/doc/doxygen/doc_eventloop.h
diff --git a/openvpn/doc/doxygen/doc_external_multiplexer.h b/main/openvpn/doc/doxygen/doc_external_multiplexer.h
index 76532557..76532557 100644
--- a/openvpn/doc/doxygen/doc_external_multiplexer.h
+++ b/main/openvpn/doc/doxygen/doc_external_multiplexer.h
diff --git a/openvpn/doc/doxygen/doc_fragmentation.h b/main/openvpn/doc/doxygen/doc_fragmentation.h
index ef34cdb2..ef34cdb2 100644
--- a/openvpn/doc/doxygen/doc_fragmentation.h
+++ b/main/openvpn/doc/doxygen/doc_fragmentation.h
diff --git a/openvpn/doc/doxygen/doc_internal_multiplexer.h b/main/openvpn/doc/doxygen/doc_internal_multiplexer.h
index 5142dd0d..5142dd0d 100644
--- a/openvpn/doc/doxygen/doc_internal_multiplexer.h
+++ b/main/openvpn/doc/doxygen/doc_internal_multiplexer.h
diff --git a/openvpn/doc/doxygen/doc_key_generation.h b/main/openvpn/doc/doxygen/doc_key_generation.h
index 903a4652..903a4652 100644
--- a/openvpn/doc/doxygen/doc_key_generation.h
+++ b/main/openvpn/doc/doxygen/doc_key_generation.h
diff --git a/openvpn/doc/doxygen/doc_mainpage.h b/main/openvpn/doc/doxygen/doc_mainpage.h
index 821b2e87..821b2e87 100644
--- a/openvpn/doc/doxygen/doc_mainpage.h
+++ b/main/openvpn/doc/doxygen/doc_mainpage.h
diff --git a/openvpn/doc/doxygen/doc_memory_management.h b/main/openvpn/doc/doxygen/doc_memory_management.h
index f948783e..f948783e 100644
--- a/openvpn/doc/doxygen/doc_memory_management.h
+++ b/main/openvpn/doc/doxygen/doc_memory_management.h
diff --git a/openvpn/doc/doxygen/doc_protocol_overview.h b/main/openvpn/doc/doxygen/doc_protocol_overview.h
index 26fed331..26fed331 100644
--- a/openvpn/doc/doxygen/doc_protocol_overview.h
+++ b/main/openvpn/doc/doxygen/doc_protocol_overview.h
diff --git a/openvpn/doc/doxygen/doc_reliable.h b/main/openvpn/doc/doxygen/doc_reliable.h
index 5264906a..5264906a 100644
--- a/openvpn/doc/doxygen/doc_reliable.h
+++ b/main/openvpn/doc/doxygen/doc_reliable.h
diff --git a/openvpn/doc/doxygen/doc_tunnel_state.h b/main/openvpn/doc/doxygen/doc_tunnel_state.h
index 6c93e71b..6c93e71b 100644
--- a/openvpn/doc/doxygen/doc_tunnel_state.h
+++ b/main/openvpn/doc/doxygen/doc_tunnel_state.h
diff --git a/openvpn/doc/doxygen/openvpn.doxyfile b/main/openvpn/doc/doxygen/openvpn.doxyfile
index cf26c42a..cf26c42a 100644
--- a/openvpn/doc/doxygen/openvpn.doxyfile
+++ b/main/openvpn/doc/doxygen/openvpn.doxyfile
diff --git a/openvpn/doc/management-notes.txt b/main/openvpn/doc/management-notes.txt
index ef39b855..ef39b855 100644
--- a/openvpn/doc/management-notes.txt
+++ b/main/openvpn/doc/management-notes.txt
diff --git a/openvpn/doc/openvpn.8 b/main/openvpn/doc/openvpn.8
index 3a58317d..3a58317d 100644
--- a/openvpn/doc/openvpn.8
+++ b/main/openvpn/doc/openvpn.8
diff --git a/openvpn/include/Makefile.am b/main/openvpn/include/Makefile.am
index 13dee61d..13dee61d 100644
--- a/openvpn/include/Makefile.am
+++ b/main/openvpn/include/Makefile.am
diff --git a/openvpn/include/openvpn-plugin.h b/main/openvpn/include/openvpn-plugin.h
index 03da92ab..03da92ab 100644
--- a/openvpn/include/openvpn-plugin.h
+++ b/main/openvpn/include/openvpn-plugin.h
diff --git a/openvpn/m4/.keep b/main/openvpn/m4/.keep
index e69de29b..e69de29b 100644
--- a/openvpn/m4/.keep
+++ b/main/openvpn/m4/.keep
diff --git a/openvpn/m4/ax_emptyarray.m4 b/main/openvpn/m4/ax_emptyarray.m4
index c6781c17..c6781c17 100644
--- a/openvpn/m4/ax_emptyarray.m4
+++ b/main/openvpn/m4/ax_emptyarray.m4
diff --git a/openvpn/m4/ax_socklen_t.m4 b/main/openvpn/m4/ax_socklen_t.m4
index cd7cad8a..cd7cad8a 100644
--- a/openvpn/m4/ax_socklen_t.m4
+++ b/main/openvpn/m4/ax_socklen_t.m4
diff --git a/openvpn/m4/ax_varargs.m4 b/main/openvpn/m4/ax_varargs.m4
index c295d21f..c295d21f 100644
--- a/openvpn/m4/ax_varargs.m4
+++ b/main/openvpn/m4/ax_varargs.m4
diff --git a/openvpn/m4/pkg.m4 b/main/openvpn/m4/pkg.m4
index 9a71878c..9a71878c 100644
--- a/openvpn/m4/pkg.m4
+++ b/main/openvpn/m4/pkg.m4
diff --git a/openvpn/msvc-build.bat b/main/openvpn/msvc-build.bat
index fd6d5588..fd6d5588 100644
--- a/openvpn/msvc-build.bat
+++ b/main/openvpn/msvc-build.bat
diff --git a/openvpn/msvc-dev.bat b/main/openvpn/msvc-dev.bat
index dbd7be07..dbd7be07 100644
--- a/openvpn/msvc-dev.bat
+++ b/main/openvpn/msvc-dev.bat
diff --git a/openvpn/msvc-env.bat b/main/openvpn/msvc-env.bat
index 2dd0f00d..2dd0f00d 100644
--- a/openvpn/msvc-env.bat
+++ b/main/openvpn/msvc-env.bat
diff --git a/openvpn/openvpn.sln b/main/openvpn/openvpn.sln
index f832e7a4..f832e7a4 100644
--- a/openvpn/openvpn.sln
+++ b/main/openvpn/openvpn.sln
diff --git a/openvpn/sample/Makefile.am b/main/openvpn/sample/Makefile.am
index be30c88a..be30c88a 100644
--- a/openvpn/sample/Makefile.am
+++ b/main/openvpn/sample/Makefile.am
diff --git a/openvpn/sample/sample-config-files/README b/main/openvpn/sample/sample-config-files/README
index d53ac79a..d53ac79a 100644
--- a/openvpn/sample/sample-config-files/README
+++ b/main/openvpn/sample/sample-config-files/README
diff --git a/openvpn/sample/sample-config-files/client.conf b/main/openvpn/sample/sample-config-files/client.conf
index 58b2038b..58b2038b 100644
--- a/openvpn/sample/sample-config-files/client.conf
+++ b/main/openvpn/sample/sample-config-files/client.conf
diff --git a/openvpn/sample/sample-config-files/firewall.sh b/main/openvpn/sample/sample-config-files/firewall.sh
index 19d75ee9..19d75ee9 100755
--- a/openvpn/sample/sample-config-files/firewall.sh
+++ b/main/openvpn/sample/sample-config-files/firewall.sh
diff --git a/openvpn/sample/sample-config-files/home.up b/main/openvpn/sample/sample-config-files/home.up
index 9c347cc5..9c347cc5 100755
--- a/openvpn/sample/sample-config-files/home.up
+++ b/main/openvpn/sample/sample-config-files/home.up
diff --git a/openvpn/sample/sample-config-files/loopback-client b/main/openvpn/sample/sample-config-files/loopback-client
index d7f59e69..d7f59e69 100644
--- a/openvpn/sample/sample-config-files/loopback-client
+++ b/main/openvpn/sample/sample-config-files/loopback-client
diff --git a/openvpn/sample/sample-config-files/loopback-server b/main/openvpn/sample/sample-config-files/loopback-server
index 9d21bcec..9d21bcec 100644
--- a/openvpn/sample/sample-config-files/loopback-server
+++ b/main/openvpn/sample/sample-config-files/loopback-server
diff --git a/openvpn/sample/sample-config-files/office.up b/main/openvpn/sample/sample-config-files/office.up
index 74a71a33..74a71a33 100755
--- a/openvpn/sample/sample-config-files/office.up
+++ b/main/openvpn/sample/sample-config-files/office.up
diff --git a/openvpn/sample/sample-config-files/openvpn-shutdown.sh b/main/openvpn/sample/sample-config-files/openvpn-shutdown.sh
index 8ed2d1d5..8ed2d1d5 100755
--- a/openvpn/sample/sample-config-files/openvpn-shutdown.sh
+++ b/main/openvpn/sample/sample-config-files/openvpn-shutdown.sh
diff --git a/openvpn/sample/sample-config-files/openvpn-startup.sh b/main/openvpn/sample/sample-config-files/openvpn-startup.sh
index 0ee006bc..0ee006bc 100755
--- a/openvpn/sample/sample-config-files/openvpn-startup.sh
+++ b/main/openvpn/sample/sample-config-files/openvpn-startup.sh
diff --git a/openvpn/sample/sample-config-files/server.conf b/main/openvpn/sample/sample-config-files/server.conf
index f483b6bb..f483b6bb 100644
--- a/openvpn/sample/sample-config-files/server.conf
+++ b/main/openvpn/sample/sample-config-files/server.conf
diff --git a/openvpn/sample/sample-config-files/static-home.conf b/main/openvpn/sample/sample-config-files/static-home.conf
index c9666874..c9666874 100644
--- a/openvpn/sample/sample-config-files/static-home.conf
+++ b/main/openvpn/sample/sample-config-files/static-home.conf
diff --git a/openvpn/sample/sample-config-files/static-office.conf b/main/openvpn/sample/sample-config-files/static-office.conf
index 68030cc9..68030cc9 100644
--- a/openvpn/sample/sample-config-files/static-office.conf
+++ b/main/openvpn/sample/sample-config-files/static-office.conf
diff --git a/openvpn/sample/sample-config-files/tls-home.conf b/main/openvpn/sample/sample-config-files/tls-home.conf
index daa4ea1e..daa4ea1e 100644
--- a/openvpn/sample/sample-config-files/tls-home.conf
+++ b/main/openvpn/sample/sample-config-files/tls-home.conf
diff --git a/openvpn/sample/sample-config-files/tls-office.conf b/main/openvpn/sample/sample-config-files/tls-office.conf
index f790f469..f790f469 100644
--- a/openvpn/sample/sample-config-files/tls-office.conf
+++ b/main/openvpn/sample/sample-config-files/tls-office.conf
diff --git a/openvpn/sample/sample-config-files/xinetd-client-config b/main/openvpn/sample/sample-config-files/xinetd-client-config
index 03c5c1fa..03c5c1fa 100644
--- a/openvpn/sample/sample-config-files/xinetd-client-config
+++ b/main/openvpn/sample/sample-config-files/xinetd-client-config
diff --git a/openvpn/sample/sample-config-files/xinetd-server-config b/main/openvpn/sample/sample-config-files/xinetd-server-config
index 803a6f8f..803a6f8f 100644
--- a/openvpn/sample/sample-config-files/xinetd-server-config
+++ b/main/openvpn/sample/sample-config-files/xinetd-server-config
diff --git a/openvpn/sample/sample-keys/README b/main/openvpn/sample/sample-keys/README
index 1cd473a1..1cd473a1 100644
--- a/openvpn/sample/sample-keys/README
+++ b/main/openvpn/sample/sample-keys/README
diff --git a/openvpn/sample/sample-keys/ca.crt b/main/openvpn/sample/sample-keys/ca.crt
index e063ccce..e063ccce 100644
--- a/openvpn/sample/sample-keys/ca.crt
+++ b/main/openvpn/sample/sample-keys/ca.crt
diff --git a/openvpn/sample/sample-keys/ca.key b/main/openvpn/sample/sample-keys/ca.key
index b4bf792a..b4bf792a 100644
--- a/openvpn/sample/sample-keys/ca.key
+++ b/main/openvpn/sample/sample-keys/ca.key
diff --git a/openvpn/sample/sample-keys/client.crt b/main/openvpn/sample/sample-keys/client.crt
index c0474461..c0474461 100644
--- a/openvpn/sample/sample-keys/client.crt
+++ b/main/openvpn/sample/sample-keys/client.crt
diff --git a/openvpn/sample/sample-keys/client.key b/main/openvpn/sample/sample-keys/client.key
index 17b95091..17b95091 100644
--- a/openvpn/sample/sample-keys/client.key
+++ b/main/openvpn/sample/sample-keys/client.key
diff --git a/openvpn/sample/sample-keys/dh1024.pem b/main/openvpn/sample/sample-keys/dh1024.pem
index 7ce05f0c..7ce05f0c 100644
--- a/openvpn/sample/sample-keys/dh1024.pem
+++ b/main/openvpn/sample/sample-keys/dh1024.pem
diff --git a/openvpn/sample/sample-keys/pass.crt b/main/openvpn/sample/sample-keys/pass.crt
index 8bb7b17a..8bb7b17a 100644
--- a/openvpn/sample/sample-keys/pass.crt
+++ b/main/openvpn/sample/sample-keys/pass.crt
diff --git a/openvpn/sample/sample-keys/pass.key b/main/openvpn/sample/sample-keys/pass.key
index 4916364c..4916364c 100644
--- a/openvpn/sample/sample-keys/pass.key
+++ b/main/openvpn/sample/sample-keys/pass.key
diff --git a/openvpn/sample/sample-keys/pkcs12.p12 b/main/openvpn/sample/sample-keys/pkcs12.p12
index 253d4081..253d4081 100644
--- a/openvpn/sample/sample-keys/pkcs12.p12
+++ b/main/openvpn/sample/sample-keys/pkcs12.p12
diff --git a/openvpn/sample/sample-keys/server.crt b/main/openvpn/sample/sample-keys/server.crt
index 28bb4d94..28bb4d94 100644
--- a/openvpn/sample/sample-keys/server.crt
+++ b/main/openvpn/sample/sample-keys/server.crt
diff --git a/openvpn/sample/sample-keys/server.key b/main/openvpn/sample/sample-keys/server.key
index 976acabf..976acabf 100644
--- a/openvpn/sample/sample-keys/server.key
+++ b/main/openvpn/sample/sample-keys/server.key
diff --git a/openvpn/sample/sample-plugins/defer/README b/main/openvpn/sample/sample-plugins/defer/README
index d8990f8b..d8990f8b 100644
--- a/openvpn/sample/sample-plugins/defer/README
+++ b/main/openvpn/sample/sample-plugins/defer/README
diff --git a/openvpn/sample/sample-plugins/defer/build b/main/openvpn/sample/sample-plugins/defer/build
index 0612c080..0612c080 100755
--- a/openvpn/sample/sample-plugins/defer/build
+++ b/main/openvpn/sample/sample-plugins/defer/build
diff --git a/openvpn/sample/sample-plugins/defer/simple.c b/main/openvpn/sample/sample-plugins/defer/simple.c
index 65398657..65398657 100644
--- a/openvpn/sample/sample-plugins/defer/simple.c
+++ b/main/openvpn/sample/sample-plugins/defer/simple.c
diff --git a/openvpn/sample/sample-plugins/defer/simple.def b/main/openvpn/sample/sample-plugins/defer/simple.def
index a87507d1..a87507d1 100755
--- a/openvpn/sample/sample-plugins/defer/simple.def
+++ b/main/openvpn/sample/sample-plugins/defer/simple.def
diff --git a/openvpn/sample/sample-plugins/defer/winbuild b/main/openvpn/sample/sample-plugins/defer/winbuild
index 82927d96..82927d96 100755
--- a/openvpn/sample/sample-plugins/defer/winbuild
+++ b/main/openvpn/sample/sample-plugins/defer/winbuild
diff --git a/openvpn/sample/sample-plugins/log/build b/main/openvpn/sample/sample-plugins/log/build
index c07ec408..c07ec408 100755
--- a/openvpn/sample/sample-plugins/log/build
+++ b/main/openvpn/sample/sample-plugins/log/build
diff --git a/openvpn/sample/sample-plugins/log/log.c b/main/openvpn/sample/sample-plugins/log/log.c
index 1cc4650e..1cc4650e 100644
--- a/openvpn/sample/sample-plugins/log/log.c
+++ b/main/openvpn/sample/sample-plugins/log/log.c
diff --git a/openvpn/sample/sample-plugins/log/log_v3.c b/main/openvpn/sample/sample-plugins/log/log_v3.c
index 4d3af91a..4d3af91a 100644
--- a/openvpn/sample/sample-plugins/log/log_v3.c
+++ b/main/openvpn/sample/sample-plugins/log/log_v3.c
diff --git a/openvpn/sample/sample-plugins/log/winbuild b/main/openvpn/sample/sample-plugins/log/winbuild
index decf05f8..decf05f8 100755
--- a/openvpn/sample/sample-plugins/log/winbuild
+++ b/main/openvpn/sample/sample-plugins/log/winbuild
diff --git a/openvpn/sample/sample-plugins/simple/README b/main/openvpn/sample/sample-plugins/simple/README
index 4400cd30..4400cd30 100644
--- a/openvpn/sample/sample-plugins/simple/README
+++ b/main/openvpn/sample/sample-plugins/simple/README
diff --git a/openvpn/sample/sample-plugins/simple/build b/main/openvpn/sample/sample-plugins/simple/build
index bbb05f7c..bbb05f7c 100755
--- a/openvpn/sample/sample-plugins/simple/build
+++ b/main/openvpn/sample/sample-plugins/simple/build
diff --git a/openvpn/sample/sample-plugins/simple/simple.c b/main/openvpn/sample/sample-plugins/simple/simple.c
index f26d89f6..f26d89f6 100644
--- a/openvpn/sample/sample-plugins/simple/simple.c
+++ b/main/openvpn/sample/sample-plugins/simple/simple.c
diff --git a/openvpn/sample/sample-plugins/simple/simple.def b/main/openvpn/sample/sample-plugins/simple/simple.def
index a87507d1..a87507d1 100755
--- a/openvpn/sample/sample-plugins/simple/simple.def
+++ b/main/openvpn/sample/sample-plugins/simple/simple.def
diff --git a/openvpn/sample/sample-plugins/simple/winbuild b/main/openvpn/sample/sample-plugins/simple/winbuild
index decf05f8..decf05f8 100755
--- a/openvpn/sample/sample-plugins/simple/winbuild
+++ b/main/openvpn/sample/sample-plugins/simple/winbuild
diff --git a/openvpn/sample/sample-scripts/auth-pam.pl b/main/openvpn/sample/sample-scripts/auth-pam.pl
index 5333badc..5333badc 100755
--- a/openvpn/sample/sample-scripts/auth-pam.pl
+++ b/main/openvpn/sample/sample-scripts/auth-pam.pl
diff --git a/openvpn/sample/sample-scripts/bridge-start b/main/openvpn/sample/sample-scripts/bridge-start
index d20a2603..d20a2603 100755
--- a/openvpn/sample/sample-scripts/bridge-start
+++ b/main/openvpn/sample/sample-scripts/bridge-start
diff --git a/openvpn/sample/sample-scripts/bridge-stop b/main/openvpn/sample/sample-scripts/bridge-stop
index 81927794..81927794 100755
--- a/openvpn/sample/sample-scripts/bridge-stop
+++ b/main/openvpn/sample/sample-scripts/bridge-stop
diff --git a/openvpn/sample/sample-scripts/ucn.pl b/main/openvpn/sample/sample-scripts/ucn.pl
index 6d708f82..6d708f82 100755
--- a/openvpn/sample/sample-scripts/ucn.pl
+++ b/main/openvpn/sample/sample-scripts/ucn.pl
diff --git a/openvpn/sample/sample-scripts/verify-cn b/main/openvpn/sample/sample-scripts/verify-cn
index 6e747ef1..6e747ef1 100755
--- a/openvpn/sample/sample-scripts/verify-cn
+++ b/main/openvpn/sample/sample-scripts/verify-cn
diff --git a/openvpn/sample/sample-windows/sample.ovpn b/main/openvpn/sample/sample-windows/sample.ovpn
index 5accd573..5accd573 100755
--- a/openvpn/sample/sample-windows/sample.ovpn
+++ b/main/openvpn/sample/sample-windows/sample.ovpn
diff --git a/openvpn/src/Makefile.am b/main/openvpn/src/Makefile.am
index c04468a5..c04468a5 100644
--- a/openvpn/src/Makefile.am
+++ b/main/openvpn/src/Makefile.am
diff --git a/openvpn/src/compat/Makefile.am b/main/openvpn/src/compat/Makefile.am
index 4591b851..4591b851 100644
--- a/openvpn/src/compat/Makefile.am
+++ b/main/openvpn/src/compat/Makefile.am
diff --git a/openvpn/src/compat/compat-basename.c b/main/openvpn/src/compat/compat-basename.c
index a0576919..a0576919 100644
--- a/openvpn/src/compat/compat-basename.c
+++ b/main/openvpn/src/compat/compat-basename.c
diff --git a/openvpn/src/compat/compat-daemon.c b/main/openvpn/src/compat/compat-daemon.c
index dde96a20..dde96a20 100644
--- a/openvpn/src/compat/compat-daemon.c
+++ b/main/openvpn/src/compat/compat-daemon.c
diff --git a/openvpn/src/compat/compat-dirname.c b/main/openvpn/src/compat/compat-dirname.c
index 88785950..88785950 100644
--- a/openvpn/src/compat/compat-dirname.c
+++ b/main/openvpn/src/compat/compat-dirname.c
diff --git a/openvpn/src/compat/compat-gettimeofday.c b/main/openvpn/src/compat/compat-gettimeofday.c
index 0f32d5d1..0f32d5d1 100644
--- a/openvpn/src/compat/compat-gettimeofday.c
+++ b/main/openvpn/src/compat/compat-gettimeofday.c
diff --git a/openvpn/src/compat/compat-inet_ntop.c b/main/openvpn/src/compat/compat-inet_ntop.c
index 0d521425..0d521425 100644
--- a/openvpn/src/compat/compat-inet_ntop.c
+++ b/main/openvpn/src/compat/compat-inet_ntop.c
diff --git a/openvpn/src/compat/compat-inet_pton.c b/main/openvpn/src/compat/compat-inet_pton.c
index cdc8d4b0..cdc8d4b0 100644
--- a/openvpn/src/compat/compat-inet_pton.c
+++ b/main/openvpn/src/compat/compat-inet_pton.c
diff --git a/openvpn/src/compat/compat-lz4.c b/main/openvpn/src/compat/compat-lz4.c
index c63c18ba..c63c18ba 100644
--- a/openvpn/src/compat/compat-lz4.c
+++ b/main/openvpn/src/compat/compat-lz4.c
diff --git a/openvpn/src/compat/compat-lz4.h b/main/openvpn/src/compat/compat-lz4.h
index a289fcfd..a289fcfd 100644
--- a/openvpn/src/compat/compat-lz4.h
+++ b/main/openvpn/src/compat/compat-lz4.h
diff --git a/openvpn/src/compat/compat-stdbool.h b/main/openvpn/src/compat/compat-stdbool.h
index 99412188..99412188 100644
--- a/openvpn/src/compat/compat-stdbool.h
+++ b/main/openvpn/src/compat/compat-stdbool.h
diff --git a/openvpn/src/compat/compat.h b/main/openvpn/src/compat/compat.h
index 021573eb..021573eb 100644
--- a/openvpn/src/compat/compat.h
+++ b/main/openvpn/src/compat/compat.h
diff --git a/openvpn/src/compat/compat.vcxproj b/main/openvpn/src/compat/compat.vcxproj
index d872fa75..d872fa75 100644
--- a/openvpn/src/compat/compat.vcxproj
+++ b/main/openvpn/src/compat/compat.vcxproj
diff --git a/openvpn/src/compat/compat.vcxproj.filters b/main/openvpn/src/compat/compat.vcxproj.filters
index 9576c512..9576c512 100644
--- a/openvpn/src/compat/compat.vcxproj.filters
+++ b/main/openvpn/src/compat/compat.vcxproj.filters
diff --git a/openvpn/src/openvpn/Makefile.am b/main/openvpn/src/openvpn/Makefile.am
index 0b79e104..0b79e104 100644
--- a/openvpn/src/openvpn/Makefile.am
+++ b/main/openvpn/src/openvpn/Makefile.am
diff --git a/openvpn/src/openvpn/base64.c b/main/openvpn/src/openvpn/base64.c
index bb89aae3..bb89aae3 100644
--- a/openvpn/src/openvpn/base64.c
+++ b/main/openvpn/src/openvpn/base64.c
diff --git a/openvpn/src/openvpn/base64.h b/main/openvpn/src/openvpn/base64.h
index 28a9677c..28a9677c 100644
--- a/openvpn/src/openvpn/base64.h
+++ b/main/openvpn/src/openvpn/base64.h
diff --git a/openvpn/src/openvpn/basic.h b/main/openvpn/src/openvpn/basic.h
index 298cf103..298cf103 100644
--- a/openvpn/src/openvpn/basic.h
+++ b/main/openvpn/src/openvpn/basic.h
diff --git a/openvpn/src/openvpn/breakpad.cpp b/main/openvpn/src/openvpn/breakpad.cpp
index cfcc10a8..cfcc10a8 100644
--- a/openvpn/src/openvpn/breakpad.cpp
+++ b/main/openvpn/src/openvpn/breakpad.cpp
diff --git a/openvpn/src/openvpn/breakpad.h b/main/openvpn/src/openvpn/breakpad.h
index 84df62ab..84df62ab 100644
--- a/openvpn/src/openvpn/breakpad.h
+++ b/main/openvpn/src/openvpn/breakpad.h
diff --git a/openvpn/src/openvpn/buffer.c b/main/openvpn/src/openvpn/buffer.c
index 36611415..36611415 100644
--- a/openvpn/src/openvpn/buffer.c
+++ b/main/openvpn/src/openvpn/buffer.c
diff --git a/openvpn/src/openvpn/buffer.h b/main/openvpn/src/openvpn/buffer.h
index 0010c771..0010c771 100644
--- a/openvpn/src/openvpn/buffer.h
+++ b/main/openvpn/src/openvpn/buffer.h
diff --git a/openvpn/src/openvpn/circ_list.h b/main/openvpn/src/openvpn/circ_list.h
index 583701a5..583701a5 100644
--- a/openvpn/src/openvpn/circ_list.h
+++ b/main/openvpn/src/openvpn/circ_list.h
diff --git a/openvpn/src/openvpn/clinat.c b/main/openvpn/src/openvpn/clinat.c
index af75fc9d..af75fc9d 100644
--- a/openvpn/src/openvpn/clinat.c
+++ b/main/openvpn/src/openvpn/clinat.c
diff --git a/openvpn/src/openvpn/clinat.h b/main/openvpn/src/openvpn/clinat.h
index d55a727a..d55a727a 100644
--- a/openvpn/src/openvpn/clinat.h
+++ b/main/openvpn/src/openvpn/clinat.h
diff --git a/openvpn/src/openvpn/common.h b/main/openvpn/src/openvpn/common.h
index 2f85bec2..2f85bec2 100644
--- a/openvpn/src/openvpn/common.h
+++ b/main/openvpn/src/openvpn/common.h
diff --git a/openvpn/src/openvpn/comp-lz4.c b/main/openvpn/src/openvpn/comp-lz4.c
index 46511485..46511485 100644
--- a/openvpn/src/openvpn/comp-lz4.c
+++ b/main/openvpn/src/openvpn/comp-lz4.c
diff --git a/openvpn/src/openvpn/comp-lz4.h b/main/openvpn/src/openvpn/comp-lz4.h
index ca1dfa9b..ca1dfa9b 100644
--- a/openvpn/src/openvpn/comp-lz4.h
+++ b/main/openvpn/src/openvpn/comp-lz4.h
diff --git a/openvpn/src/openvpn/comp.c b/main/openvpn/src/openvpn/comp.c
index 4ac589f9..4ac589f9 100644
--- a/openvpn/src/openvpn/comp.c
+++ b/main/openvpn/src/openvpn/comp.c
diff --git a/openvpn/src/openvpn/comp.h b/main/openvpn/src/openvpn/comp.h
index bfa25fd3..bfa25fd3 100644
--- a/openvpn/src/openvpn/comp.h
+++ b/main/openvpn/src/openvpn/comp.h
diff --git a/openvpn/src/openvpn/compstub.c b/main/openvpn/src/openvpn/compstub.c
index 2ab7163e..2ab7163e 100644
--- a/openvpn/src/openvpn/compstub.c
+++ b/main/openvpn/src/openvpn/compstub.c
diff --git a/openvpn/src/openvpn/console.c b/main/openvpn/src/openvpn/console.c
index afda8ca3..afda8ca3 100644
--- a/openvpn/src/openvpn/console.c
+++ b/main/openvpn/src/openvpn/console.c
diff --git a/openvpn/src/openvpn/console.h b/main/openvpn/src/openvpn/console.h
index 268f3feb..268f3feb 100644
--- a/openvpn/src/openvpn/console.h
+++ b/main/openvpn/src/openvpn/console.h
diff --git a/openvpn/src/openvpn/crypto.c b/main/openvpn/src/openvpn/crypto.c
index c4c356dc..c4c356dc 100644
--- a/openvpn/src/openvpn/crypto.c
+++ b/main/openvpn/src/openvpn/crypto.c
diff --git a/openvpn/src/openvpn/crypto.h b/main/openvpn/src/openvpn/crypto.h
index 3b4b88ea..3b4b88ea 100644
--- a/openvpn/src/openvpn/crypto.h
+++ b/main/openvpn/src/openvpn/crypto.h
diff --git a/openvpn/src/openvpn/crypto_backend.h b/main/openvpn/src/openvpn/crypto_backend.h
index 5ae47e6c..5ae47e6c 100644
--- a/openvpn/src/openvpn/crypto_backend.h
+++ b/main/openvpn/src/openvpn/crypto_backend.h
diff --git a/openvpn/src/openvpn/crypto_openssl.c b/main/openvpn/src/openvpn/crypto_openssl.c
index 1501bc86..1501bc86 100644
--- a/openvpn/src/openvpn/crypto_openssl.c
+++ b/main/openvpn/src/openvpn/crypto_openssl.c
diff --git a/openvpn/src/openvpn/crypto_openssl.h b/main/openvpn/src/openvpn/crypto_openssl.h
index f883c2a5..f883c2a5 100644
--- a/openvpn/src/openvpn/crypto_openssl.h
+++ b/main/openvpn/src/openvpn/crypto_openssl.h
diff --git a/openvpn/src/openvpn/crypto_polarssl.c b/main/openvpn/src/openvpn/crypto_polarssl.c
index 1f27d6ca..1f27d6ca 100644
--- a/openvpn/src/openvpn/crypto_polarssl.c
+++ b/main/openvpn/src/openvpn/crypto_polarssl.c
diff --git a/openvpn/src/openvpn/crypto_polarssl.h b/main/openvpn/src/openvpn/crypto_polarssl.h
index b6da4363..b6da4363 100644
--- a/openvpn/src/openvpn/crypto_polarssl.h
+++ b/main/openvpn/src/openvpn/crypto_polarssl.h
diff --git a/openvpn/src/openvpn/cryptoapi.c b/main/openvpn/src/openvpn/cryptoapi.c
index b7fc11e0..b7fc11e0 100644
--- a/openvpn/src/openvpn/cryptoapi.c
+++ b/main/openvpn/src/openvpn/cryptoapi.c
diff --git a/openvpn/src/openvpn/cryptoapi.h b/main/openvpn/src/openvpn/cryptoapi.h
index 8ac6db36..8ac6db36 100644
--- a/openvpn/src/openvpn/cryptoapi.h
+++ b/main/openvpn/src/openvpn/cryptoapi.h
diff --git a/openvpn/src/openvpn/dhcp.c b/main/openvpn/src/openvpn/dhcp.c
index 8d0b18ac..8d0b18ac 100644
--- a/openvpn/src/openvpn/dhcp.c
+++ b/main/openvpn/src/openvpn/dhcp.c
diff --git a/openvpn/src/openvpn/dhcp.h b/main/openvpn/src/openvpn/dhcp.h
index e823a4a8..e823a4a8 100644
--- a/openvpn/src/openvpn/dhcp.h
+++ b/main/openvpn/src/openvpn/dhcp.h
diff --git a/openvpn/src/openvpn/errlevel.h b/main/openvpn/src/openvpn/errlevel.h
index 3ee4ebc3..3ee4ebc3 100644
--- a/openvpn/src/openvpn/errlevel.h
+++ b/main/openvpn/src/openvpn/errlevel.h
diff --git a/openvpn/src/openvpn/error.c b/main/openvpn/src/openvpn/error.c
index af865f32..af865f32 100644
--- a/openvpn/src/openvpn/error.c
+++ b/main/openvpn/src/openvpn/error.c
diff --git a/openvpn/src/openvpn/error.h b/main/openvpn/src/openvpn/error.h
index 1e1f2acf..1e1f2acf 100644
--- a/openvpn/src/openvpn/error.h
+++ b/main/openvpn/src/openvpn/error.h
diff --git a/openvpn/src/openvpn/event.c b/main/openvpn/src/openvpn/event.c
index 34a3c451..34a3c451 100644
--- a/openvpn/src/openvpn/event.c
+++ b/main/openvpn/src/openvpn/event.c
diff --git a/openvpn/src/openvpn/event.h b/main/openvpn/src/openvpn/event.h
index bd29fdc1..bd29fdc1 100644
--- a/openvpn/src/openvpn/event.h
+++ b/main/openvpn/src/openvpn/event.h
diff --git a/openvpn/src/openvpn/fdmisc.c b/main/openvpn/src/openvpn/fdmisc.c
index 7fe449c5..7fe449c5 100644
--- a/openvpn/src/openvpn/fdmisc.c
+++ b/main/openvpn/src/openvpn/fdmisc.c
diff --git a/openvpn/src/openvpn/fdmisc.h b/main/openvpn/src/openvpn/fdmisc.h
index 4b6b6d04..4b6b6d04 100644
--- a/openvpn/src/openvpn/fdmisc.h
+++ b/main/openvpn/src/openvpn/fdmisc.h
diff --git a/openvpn/src/openvpn/forward-inline.h b/main/openvpn/src/openvpn/forward-inline.h
index 5853ce29..5853ce29 100644
--- a/openvpn/src/openvpn/forward-inline.h
+++ b/main/openvpn/src/openvpn/forward-inline.h
diff --git a/openvpn/src/openvpn/forward.c b/main/openvpn/src/openvpn/forward.c
index 0ec00f34..0ec00f34 100644
--- a/openvpn/src/openvpn/forward.c
+++ b/main/openvpn/src/openvpn/forward.c
diff --git a/openvpn/src/openvpn/forward.h b/main/openvpn/src/openvpn/forward.h
index 1830a00b..1830a00b 100644
--- a/openvpn/src/openvpn/forward.h
+++ b/main/openvpn/src/openvpn/forward.h
diff --git a/openvpn/src/openvpn/fragment.c b/main/openvpn/src/openvpn/fragment.c
index 7ad1d616..7ad1d616 100644
--- a/openvpn/src/openvpn/fragment.c
+++ b/main/openvpn/src/openvpn/fragment.c
diff --git a/openvpn/src/openvpn/fragment.h b/main/openvpn/src/openvpn/fragment.h
index 866573b2..866573b2 100644
--- a/openvpn/src/openvpn/fragment.h
+++ b/main/openvpn/src/openvpn/fragment.h
diff --git a/openvpn/src/openvpn/gremlin.c b/main/openvpn/src/openvpn/gremlin.c
index f0aa7f61..f0aa7f61 100644
--- a/openvpn/src/openvpn/gremlin.c
+++ b/main/openvpn/src/openvpn/gremlin.c
diff --git a/openvpn/src/openvpn/gremlin.h b/main/openvpn/src/openvpn/gremlin.h
index c0aeab18..c0aeab18 100644
--- a/openvpn/src/openvpn/gremlin.h
+++ b/main/openvpn/src/openvpn/gremlin.h
diff --git a/openvpn/src/openvpn/helper.c b/main/openvpn/src/openvpn/helper.c
index d9eef03b..d9eef03b 100644
--- a/openvpn/src/openvpn/helper.c
+++ b/main/openvpn/src/openvpn/helper.c
diff --git a/openvpn/src/openvpn/helper.h b/main/openvpn/src/openvpn/helper.h
index 444969c9..444969c9 100644
--- a/openvpn/src/openvpn/helper.h
+++ b/main/openvpn/src/openvpn/helper.h
diff --git a/openvpn/src/openvpn/httpdigest.c b/main/openvpn/src/openvpn/httpdigest.c
index 78b8344d..78b8344d 100644
--- a/openvpn/src/openvpn/httpdigest.c
+++ b/main/openvpn/src/openvpn/httpdigest.c
diff --git a/openvpn/src/openvpn/httpdigest.h b/main/openvpn/src/openvpn/httpdigest.h
index 84238413..84238413 100644
--- a/openvpn/src/openvpn/httpdigest.h
+++ b/main/openvpn/src/openvpn/httpdigest.h
diff --git a/openvpn/src/openvpn/init.c b/main/openvpn/src/openvpn/init.c
index 169f0d3c..169f0d3c 100644
--- a/openvpn/src/openvpn/init.c
+++ b/main/openvpn/src/openvpn/init.c
diff --git a/openvpn/src/openvpn/init.h b/main/openvpn/src/openvpn/init.h
index 5a1d1dcf..5a1d1dcf 100644
--- a/openvpn/src/openvpn/init.h
+++ b/main/openvpn/src/openvpn/init.h
diff --git a/openvpn/src/openvpn/integer.h b/main/openvpn/src/openvpn/integer.h
index f0fc196e..f0fc196e 100644
--- a/openvpn/src/openvpn/integer.h
+++ b/main/openvpn/src/openvpn/integer.h
diff --git a/openvpn/src/openvpn/interval.c b/main/openvpn/src/openvpn/interval.c
index 64494f1b..64494f1b 100644
--- a/openvpn/src/openvpn/interval.c
+++ b/main/openvpn/src/openvpn/interval.c
diff --git a/openvpn/src/openvpn/interval.h b/main/openvpn/src/openvpn/interval.h
index 4814ec92..4814ec92 100644
--- a/openvpn/src/openvpn/interval.h
+++ b/main/openvpn/src/openvpn/interval.h
diff --git a/openvpn/src/openvpn/list.c b/main/openvpn/src/openvpn/list.c
index ea6bd74b..ea6bd74b 100644
--- a/openvpn/src/openvpn/list.c
+++ b/main/openvpn/src/openvpn/list.c
diff --git a/openvpn/src/openvpn/list.h b/main/openvpn/src/openvpn/list.h
index adde36b3..adde36b3 100644
--- a/openvpn/src/openvpn/list.h
+++ b/main/openvpn/src/openvpn/list.h
diff --git a/openvpn/src/openvpn/lladdr.c b/main/openvpn/src/openvpn/lladdr.c
index 57f447b3..57f447b3 100644
--- a/openvpn/src/openvpn/lladdr.c
+++ b/main/openvpn/src/openvpn/lladdr.c
diff --git a/openvpn/src/openvpn/lladdr.h b/main/openvpn/src/openvpn/lladdr.h
index d6c42562..d6c42562 100644
--- a/openvpn/src/openvpn/lladdr.h
+++ b/main/openvpn/src/openvpn/lladdr.h
diff --git a/openvpn/src/openvpn/lzo.c b/main/openvpn/src/openvpn/lzo.c
index daa02ed0..daa02ed0 100644
--- a/openvpn/src/openvpn/lzo.c
+++ b/main/openvpn/src/openvpn/lzo.c
diff --git a/openvpn/src/openvpn/lzo.h b/main/openvpn/src/openvpn/lzo.h
index f33e587a..f33e587a 100644
--- a/openvpn/src/openvpn/lzo.h
+++ b/main/openvpn/src/openvpn/lzo.h
diff --git a/openvpn/src/openvpn/manage.c b/main/openvpn/src/openvpn/manage.c
index 561c252b..561c252b 100644
--- a/openvpn/src/openvpn/manage.c
+++ b/main/openvpn/src/openvpn/manage.c
diff --git a/openvpn/src/openvpn/manage.h b/main/openvpn/src/openvpn/manage.h
index 1c8dda69..1c8dda69 100644
--- a/openvpn/src/openvpn/manage.h
+++ b/main/openvpn/src/openvpn/manage.h
diff --git a/openvpn/src/openvpn/mbuf.c b/main/openvpn/src/openvpn/mbuf.c
index 82f23888..82f23888 100644
--- a/openvpn/src/openvpn/mbuf.c
+++ b/main/openvpn/src/openvpn/mbuf.c
diff --git a/openvpn/src/openvpn/mbuf.h b/main/openvpn/src/openvpn/mbuf.h
index 1085adc7..1085adc7 100644
--- a/openvpn/src/openvpn/mbuf.h
+++ b/main/openvpn/src/openvpn/mbuf.h
diff --git a/openvpn/src/openvpn/memdbg.h b/main/openvpn/src/openvpn/memdbg.h
index 1f6bb676..1f6bb676 100644
--- a/openvpn/src/openvpn/memdbg.h
+++ b/main/openvpn/src/openvpn/memdbg.h
diff --git a/openvpn/src/openvpn/misc.c b/main/openvpn/src/openvpn/misc.c
index 7483184f..7483184f 100644
--- a/openvpn/src/openvpn/misc.c
+++ b/main/openvpn/src/openvpn/misc.c
diff --git a/openvpn/src/openvpn/misc.h b/main/openvpn/src/openvpn/misc.h
index 41748bd8..41748bd8 100644
--- a/openvpn/src/openvpn/misc.h
+++ b/main/openvpn/src/openvpn/misc.h
diff --git a/openvpn/src/openvpn/mroute.c b/main/openvpn/src/openvpn/mroute.c
index ba4ef46f..ba4ef46f 100644
--- a/openvpn/src/openvpn/mroute.c
+++ b/main/openvpn/src/openvpn/mroute.c
diff --git a/openvpn/src/openvpn/mroute.h b/main/openvpn/src/openvpn/mroute.h
index 608f70be..608f70be 100644
--- a/openvpn/src/openvpn/mroute.h
+++ b/main/openvpn/src/openvpn/mroute.h
diff --git a/openvpn/src/openvpn/mss.c b/main/openvpn/src/openvpn/mss.c
index 64fd722f..64fd722f 100644
--- a/openvpn/src/openvpn/mss.c
+++ b/main/openvpn/src/openvpn/mss.c
diff --git a/openvpn/src/openvpn/mss.h b/main/openvpn/src/openvpn/mss.h
index 0d329432..0d329432 100644
--- a/openvpn/src/openvpn/mss.h
+++ b/main/openvpn/src/openvpn/mss.h
diff --git a/openvpn/src/openvpn/mstats.c b/main/openvpn/src/openvpn/mstats.c
index 3be493cd..3be493cd 100644
--- a/openvpn/src/openvpn/mstats.c
+++ b/main/openvpn/src/openvpn/mstats.c
diff --git a/openvpn/src/openvpn/mstats.h b/main/openvpn/src/openvpn/mstats.h
index dab05fe9..dab05fe9 100644
--- a/openvpn/src/openvpn/mstats.h
+++ b/main/openvpn/src/openvpn/mstats.h
diff --git a/openvpn/src/openvpn/mtcp.c b/main/openvpn/src/openvpn/mtcp.c
index dc15f092..dc15f092 100644
--- a/openvpn/src/openvpn/mtcp.c
+++ b/main/openvpn/src/openvpn/mtcp.c
diff --git a/openvpn/src/openvpn/mtcp.h b/main/openvpn/src/openvpn/mtcp.h
index b677b48a..b677b48a 100644
--- a/openvpn/src/openvpn/mtcp.h
+++ b/main/openvpn/src/openvpn/mtcp.h
diff --git a/openvpn/src/openvpn/mtu.c b/main/openvpn/src/openvpn/mtu.c
index 13f3f6c6..13f3f6c6 100644
--- a/openvpn/src/openvpn/mtu.c
+++ b/main/openvpn/src/openvpn/mtu.c
diff --git a/openvpn/src/openvpn/mtu.h b/main/openvpn/src/openvpn/mtu.h
index 29ec21fd..29ec21fd 100644
--- a/openvpn/src/openvpn/mtu.h
+++ b/main/openvpn/src/openvpn/mtu.h
diff --git a/openvpn/src/openvpn/mudp.c b/main/openvpn/src/openvpn/mudp.c
index 3468dab5..3468dab5 100644
--- a/openvpn/src/openvpn/mudp.c
+++ b/main/openvpn/src/openvpn/mudp.c
diff --git a/openvpn/src/openvpn/mudp.h b/main/openvpn/src/openvpn/mudp.h
index 97f961b3..97f961b3 100644
--- a/openvpn/src/openvpn/mudp.h
+++ b/main/openvpn/src/openvpn/mudp.h
diff --git a/openvpn/src/openvpn/multi.c b/main/openvpn/src/openvpn/multi.c
index 2839b30d..2839b30d 100644
--- a/openvpn/src/openvpn/multi.c
+++ b/main/openvpn/src/openvpn/multi.c
diff --git a/openvpn/src/openvpn/multi.h b/main/openvpn/src/openvpn/multi.h
index fc2ffb24..fc2ffb24 100644
--- a/openvpn/src/openvpn/multi.h
+++ b/main/openvpn/src/openvpn/multi.h
diff --git a/openvpn/src/openvpn/ntlm.c b/main/openvpn/src/openvpn/ntlm.c
index 3390bddd..3390bddd 100644
--- a/openvpn/src/openvpn/ntlm.c
+++ b/main/openvpn/src/openvpn/ntlm.c
diff --git a/openvpn/src/openvpn/ntlm.h b/main/openvpn/src/openvpn/ntlm.h
index 77903b08..77903b08 100644
--- a/openvpn/src/openvpn/ntlm.h
+++ b/main/openvpn/src/openvpn/ntlm.h
diff --git a/openvpn/src/openvpn/occ-inline.h b/main/openvpn/src/openvpn/occ-inline.h
index 516eb4d9..516eb4d9 100644
--- a/openvpn/src/openvpn/occ-inline.h
+++ b/main/openvpn/src/openvpn/occ-inline.h
diff --git a/openvpn/src/openvpn/occ.c b/main/openvpn/src/openvpn/occ.c
index ff487069..ff487069 100644
--- a/openvpn/src/openvpn/occ.c
+++ b/main/openvpn/src/openvpn/occ.c
diff --git a/openvpn/src/openvpn/occ.h b/main/openvpn/src/openvpn/occ.h
index 5d88cc9e..5d88cc9e 100644
--- a/openvpn/src/openvpn/occ.h
+++ b/main/openvpn/src/openvpn/occ.h
diff --git a/openvpn/src/openvpn/openvpn.c b/main/openvpn/src/openvpn/openvpn.c
index c0f2a9a2..c0f2a9a2 100644
--- a/openvpn/src/openvpn/openvpn.c
+++ b/main/openvpn/src/openvpn/openvpn.c
diff --git a/openvpn/src/openvpn/openvpn.h b/main/openvpn/src/openvpn/openvpn.h
index 7ad6c55c..7ad6c55c 100644
--- a/openvpn/src/openvpn/openvpn.h
+++ b/main/openvpn/src/openvpn/openvpn.h
diff --git a/openvpn/src/openvpn/openvpn.vcxproj b/main/openvpn/src/openvpn/openvpn.vcxproj
index 452876fc..452876fc 100755
--- a/openvpn/src/openvpn/openvpn.vcxproj
+++ b/main/openvpn/src/openvpn/openvpn.vcxproj
diff --git a/openvpn/src/openvpn/openvpn.vcxproj.filters b/main/openvpn/src/openvpn/openvpn.vcxproj.filters
index ec5e676c..ec5e676c 100644
--- a/openvpn/src/openvpn/openvpn.vcxproj.filters
+++ b/main/openvpn/src/openvpn/openvpn.vcxproj.filters
diff --git a/openvpn/src/openvpn/openvpn_win32_resources.rc b/main/openvpn/src/openvpn/openvpn_win32_resources.rc
index d092e21a..d092e21a 100644
--- a/openvpn/src/openvpn/openvpn_win32_resources.rc
+++ b/main/openvpn/src/openvpn/openvpn_win32_resources.rc
diff --git a/openvpn/src/openvpn/options.c b/main/openvpn/src/openvpn/options.c
index 176087ef..176087ef 100644
--- a/openvpn/src/openvpn/options.c
+++ b/main/openvpn/src/openvpn/options.c
diff --git a/openvpn/src/openvpn/options.h b/main/openvpn/src/openvpn/options.h
index 1992f5a7..1992f5a7 100644
--- a/openvpn/src/openvpn/options.h
+++ b/main/openvpn/src/openvpn/options.h
diff --git a/openvpn/src/openvpn/otime.c b/main/openvpn/src/openvpn/otime.c
index 2c1e5b13..2c1e5b13 100644
--- a/openvpn/src/openvpn/otime.c
+++ b/main/openvpn/src/openvpn/otime.c
diff --git a/openvpn/src/openvpn/otime.h b/main/openvpn/src/openvpn/otime.h
index 4ca10326..4ca10326 100644
--- a/openvpn/src/openvpn/otime.h
+++ b/main/openvpn/src/openvpn/otime.h
diff --git a/openvpn/src/openvpn/packet_id.c b/main/openvpn/src/openvpn/packet_id.c
index baa49664..baa49664 100644
--- a/openvpn/src/openvpn/packet_id.c
+++ b/main/openvpn/src/openvpn/packet_id.c
diff --git a/openvpn/src/openvpn/packet_id.h b/main/openvpn/src/openvpn/packet_id.h
index 3ddaab6a..3ddaab6a 100644
--- a/openvpn/src/openvpn/packet_id.h
+++ b/main/openvpn/src/openvpn/packet_id.h
diff --git a/openvpn/src/openvpn/perf.c b/main/openvpn/src/openvpn/perf.c
index 910d171d..910d171d 100644
--- a/openvpn/src/openvpn/perf.c
+++ b/main/openvpn/src/openvpn/perf.c
diff --git a/openvpn/src/openvpn/perf.h b/main/openvpn/src/openvpn/perf.h
index c531d9c1..c531d9c1 100644
--- a/openvpn/src/openvpn/perf.h
+++ b/main/openvpn/src/openvpn/perf.h
diff --git a/openvpn/src/openvpn/pf-inline.h b/main/openvpn/src/openvpn/pf-inline.h
index 6b5dcb25..6b5dcb25 100644
--- a/openvpn/src/openvpn/pf-inline.h
+++ b/main/openvpn/src/openvpn/pf-inline.h
diff --git a/openvpn/src/openvpn/pf.c b/main/openvpn/src/openvpn/pf.c
index 461beed7..461beed7 100644
--- a/openvpn/src/openvpn/pf.c
+++ b/main/openvpn/src/openvpn/pf.c
diff --git a/openvpn/src/openvpn/pf.h b/main/openvpn/src/openvpn/pf.h
index 04adf0ea..04adf0ea 100644
--- a/openvpn/src/openvpn/pf.h
+++ b/main/openvpn/src/openvpn/pf.h
diff --git a/openvpn/src/openvpn/ping-inline.h b/main/openvpn/src/openvpn/ping-inline.h
index c7249705..c7249705 100644
--- a/openvpn/src/openvpn/ping-inline.h
+++ b/main/openvpn/src/openvpn/ping-inline.h
diff --git a/openvpn/src/openvpn/ping.c b/main/openvpn/src/openvpn/ping.c
index 6dc0b4e5..6dc0b4e5 100644
--- a/openvpn/src/openvpn/ping.c
+++ b/main/openvpn/src/openvpn/ping.c
diff --git a/openvpn/src/openvpn/ping.h b/main/openvpn/src/openvpn/ping.h
index 88f5f3a9..88f5f3a9 100644
--- a/openvpn/src/openvpn/ping.h
+++ b/main/openvpn/src/openvpn/ping.h
diff --git a/openvpn/src/openvpn/pkcs11.c b/main/openvpn/src/openvpn/pkcs11.c
index 3a15ef68..3a15ef68 100644
--- a/openvpn/src/openvpn/pkcs11.c
+++ b/main/openvpn/src/openvpn/pkcs11.c
diff --git a/openvpn/src/openvpn/pkcs11.h b/main/openvpn/src/openvpn/pkcs11.h
index 4261871d..4261871d 100644
--- a/openvpn/src/openvpn/pkcs11.h
+++ b/main/openvpn/src/openvpn/pkcs11.h
diff --git a/openvpn/src/openvpn/pkcs11_backend.h b/main/openvpn/src/openvpn/pkcs11_backend.h
index 7b7ec45b..7b7ec45b 100644
--- a/openvpn/src/openvpn/pkcs11_backend.h
+++ b/main/openvpn/src/openvpn/pkcs11_backend.h
diff --git a/openvpn/src/openvpn/pkcs11_openssl.c b/main/openvpn/src/openvpn/pkcs11_openssl.c
index 87eb166e..87eb166e 100644
--- a/openvpn/src/openvpn/pkcs11_openssl.c
+++ b/main/openvpn/src/openvpn/pkcs11_openssl.c
diff --git a/openvpn/src/openvpn/pkcs11_polarssl.c b/main/openvpn/src/openvpn/pkcs11_polarssl.c
index 03b2bab5..03b2bab5 100644
--- a/openvpn/src/openvpn/pkcs11_polarssl.c
+++ b/main/openvpn/src/openvpn/pkcs11_polarssl.c
diff --git a/openvpn/src/openvpn/platform.c b/main/openvpn/src/openvpn/platform.c
index 16d4daca..16d4daca 100644
--- a/openvpn/src/openvpn/platform.c
+++ b/main/openvpn/src/openvpn/platform.c
diff --git a/openvpn/src/openvpn/platform.h b/main/openvpn/src/openvpn/platform.h
index 7c0a4d72..7c0a4d72 100644
--- a/openvpn/src/openvpn/platform.h
+++ b/main/openvpn/src/openvpn/platform.h
diff --git a/openvpn/src/openvpn/plugin.c b/main/openvpn/src/openvpn/plugin.c
index 0948f238..0948f238 100644
--- a/openvpn/src/openvpn/plugin.c
+++ b/main/openvpn/src/openvpn/plugin.c
diff --git a/openvpn/src/openvpn/plugin.h b/main/openvpn/src/openvpn/plugin.h
index 2f8416b1..2f8416b1 100644
--- a/openvpn/src/openvpn/plugin.h
+++ b/main/openvpn/src/openvpn/plugin.h
diff --git a/openvpn/src/openvpn/pool.c b/main/openvpn/src/openvpn/pool.c
index 28c26b4d..28c26b4d 100644
--- a/openvpn/src/openvpn/pool.c
+++ b/main/openvpn/src/openvpn/pool.c
diff --git a/openvpn/src/openvpn/pool.h b/main/openvpn/src/openvpn/pool.h
index fc9d6ab2..fc9d6ab2 100644
--- a/openvpn/src/openvpn/pool.h
+++ b/main/openvpn/src/openvpn/pool.h
diff --git a/openvpn/src/openvpn/proto.c b/main/openvpn/src/openvpn/proto.c
index b437f1ad..b437f1ad 100644
--- a/openvpn/src/openvpn/proto.c
+++ b/main/openvpn/src/openvpn/proto.c
diff --git a/openvpn/src/openvpn/proto.h b/main/openvpn/src/openvpn/proto.h
index f91e787e..f91e787e 100644
--- a/openvpn/src/openvpn/proto.h
+++ b/main/openvpn/src/openvpn/proto.h
diff --git a/openvpn/src/openvpn/proxy.c b/main/openvpn/src/openvpn/proxy.c
index f7f06487..f7f06487 100644
--- a/openvpn/src/openvpn/proxy.c
+++ b/main/openvpn/src/openvpn/proxy.c
diff --git a/openvpn/src/openvpn/proxy.h b/main/openvpn/src/openvpn/proxy.h
index 0e7a6dfb..0e7a6dfb 100644
--- a/openvpn/src/openvpn/proxy.h
+++ b/main/openvpn/src/openvpn/proxy.h
diff --git a/openvpn/src/openvpn/ps.c b/main/openvpn/src/openvpn/ps.c
index 6807aac0..6807aac0 100644
--- a/openvpn/src/openvpn/ps.c
+++ b/main/openvpn/src/openvpn/ps.c
diff --git a/openvpn/src/openvpn/ps.h b/main/openvpn/src/openvpn/ps.h
index e8919d48..e8919d48 100644
--- a/openvpn/src/openvpn/ps.h
+++ b/main/openvpn/src/openvpn/ps.h
diff --git a/openvpn/src/openvpn/push.c b/main/openvpn/src/openvpn/push.c
index e971357d..e971357d 100644
--- a/openvpn/src/openvpn/push.c
+++ b/main/openvpn/src/openvpn/push.c
diff --git a/openvpn/src/openvpn/push.h b/main/openvpn/src/openvpn/push.h
index 8c3f1575..8c3f1575 100644
--- a/openvpn/src/openvpn/push.h
+++ b/main/openvpn/src/openvpn/push.h
diff --git a/openvpn/src/openvpn/pushlist.h b/main/openvpn/src/openvpn/pushlist.h
index b2526761..b2526761 100644
--- a/openvpn/src/openvpn/pushlist.h
+++ b/main/openvpn/src/openvpn/pushlist.h
diff --git a/openvpn/src/openvpn/reliable.c b/main/openvpn/src/openvpn/reliable.c
index 763169ed..763169ed 100644
--- a/openvpn/src/openvpn/reliable.c
+++ b/main/openvpn/src/openvpn/reliable.c
diff --git a/openvpn/src/openvpn/reliable.h b/main/openvpn/src/openvpn/reliable.h
index 594ab825..594ab825 100644
--- a/openvpn/src/openvpn/reliable.h
+++ b/main/openvpn/src/openvpn/reliable.h
diff --git a/openvpn/src/openvpn/route.c b/main/openvpn/src/openvpn/route.c
index 25eeb77c..25eeb77c 100644
--- a/openvpn/src/openvpn/route.c
+++ b/main/openvpn/src/openvpn/route.c
diff --git a/openvpn/src/openvpn/route.h b/main/openvpn/src/openvpn/route.h
index c5e2c1e4..c5e2c1e4 100644
--- a/openvpn/src/openvpn/route.h
+++ b/main/openvpn/src/openvpn/route.h
diff --git a/openvpn/src/openvpn/schedule.c b/main/openvpn/src/openvpn/schedule.c
index 471330f0..471330f0 100644
--- a/openvpn/src/openvpn/schedule.c
+++ b/main/openvpn/src/openvpn/schedule.c
diff --git a/openvpn/src/openvpn/schedule.h b/main/openvpn/src/openvpn/schedule.h
index 71c6d8ca..71c6d8ca 100644
--- a/openvpn/src/openvpn/schedule.h
+++ b/main/openvpn/src/openvpn/schedule.h
diff --git a/openvpn/src/openvpn/session_id.c b/main/openvpn/src/openvpn/session_id.c
index 2e07b547..2e07b547 100644
--- a/openvpn/src/openvpn/session_id.c
+++ b/main/openvpn/src/openvpn/session_id.c
diff --git a/openvpn/src/openvpn/session_id.h b/main/openvpn/src/openvpn/session_id.h
index 33909dd4..33909dd4 100644
--- a/openvpn/src/openvpn/session_id.h
+++ b/main/openvpn/src/openvpn/session_id.h
diff --git a/openvpn/src/openvpn/shaper.c b/main/openvpn/src/openvpn/shaper.c
index c8a7d38b..c8a7d38b 100644
--- a/openvpn/src/openvpn/shaper.c
+++ b/main/openvpn/src/openvpn/shaper.c
diff --git a/openvpn/src/openvpn/shaper.h b/main/openvpn/src/openvpn/shaper.h
index afeb9c3c..afeb9c3c 100644
--- a/openvpn/src/openvpn/shaper.h
+++ b/main/openvpn/src/openvpn/shaper.h
diff --git a/openvpn/src/openvpn/sig.c b/main/openvpn/src/openvpn/sig.c
index 90e39a42..90e39a42 100644
--- a/openvpn/src/openvpn/sig.c
+++ b/main/openvpn/src/openvpn/sig.c
diff --git a/openvpn/src/openvpn/sig.h b/main/openvpn/src/openvpn/sig.h
index c2c7b54e..c2c7b54e 100644
--- a/openvpn/src/openvpn/sig.h
+++ b/main/openvpn/src/openvpn/sig.h
diff --git a/openvpn/src/openvpn/snappy.c b/main/openvpn/src/openvpn/snappy.c
index 24440bae..24440bae 100644
--- a/openvpn/src/openvpn/snappy.c
+++ b/main/openvpn/src/openvpn/snappy.c
diff --git a/openvpn/src/openvpn/snappy.h b/main/openvpn/src/openvpn/snappy.h
index 361a6317..361a6317 100644
--- a/openvpn/src/openvpn/snappy.h
+++ b/main/openvpn/src/openvpn/snappy.h
diff --git a/openvpn/src/openvpn/socket.c b/main/openvpn/src/openvpn/socket.c
index f024c0a4..f024c0a4 100644
--- a/openvpn/src/openvpn/socket.c
+++ b/main/openvpn/src/openvpn/socket.c
diff --git a/openvpn/src/openvpn/socket.h b/main/openvpn/src/openvpn/socket.h
index 51329534..51329534 100644
--- a/openvpn/src/openvpn/socket.h
+++ b/main/openvpn/src/openvpn/socket.h
diff --git a/openvpn/src/openvpn/socks.c b/main/openvpn/src/openvpn/socks.c
index 1551da84..1551da84 100644
--- a/openvpn/src/openvpn/socks.c
+++ b/main/openvpn/src/openvpn/socks.c
diff --git a/openvpn/src/openvpn/socks.h b/main/openvpn/src/openvpn/socks.h
index 30b957d7..30b957d7 100644
--- a/openvpn/src/openvpn/socks.h
+++ b/main/openvpn/src/openvpn/socks.h
diff --git a/openvpn/src/openvpn/ssl.c b/main/openvpn/src/openvpn/ssl.c
index c61701a7..c61701a7 100644
--- a/openvpn/src/openvpn/ssl.c
+++ b/main/openvpn/src/openvpn/ssl.c
diff --git a/openvpn/src/openvpn/ssl.h b/main/openvpn/src/openvpn/ssl.h
index cd7cae2e..cd7cae2e 100644
--- a/openvpn/src/openvpn/ssl.h
+++ b/main/openvpn/src/openvpn/ssl.h
diff --git a/openvpn/src/openvpn/ssl_backend.h b/main/openvpn/src/openvpn/ssl_backend.h
index a6fc3bdb..a6fc3bdb 100644
--- a/openvpn/src/openvpn/ssl_backend.h
+++ b/main/openvpn/src/openvpn/ssl_backend.h
diff --git a/openvpn/src/openvpn/ssl_common.h b/main/openvpn/src/openvpn/ssl_common.h
index 04ba7892..04ba7892 100644
--- a/openvpn/src/openvpn/ssl_common.h
+++ b/main/openvpn/src/openvpn/ssl_common.h
diff --git a/openvpn/src/openvpn/ssl_openssl.c b/main/openvpn/src/openvpn/ssl_openssl.c
index f0796526..f0796526 100644
--- a/openvpn/src/openvpn/ssl_openssl.c
+++ b/main/openvpn/src/openvpn/ssl_openssl.c
diff --git a/openvpn/src/openvpn/ssl_openssl.h b/main/openvpn/src/openvpn/ssl_openssl.h
index fc2052cb..fc2052cb 100644
--- a/openvpn/src/openvpn/ssl_openssl.h
+++ b/main/openvpn/src/openvpn/ssl_openssl.h
diff --git a/openvpn/src/openvpn/ssl_polarssl.c b/main/openvpn/src/openvpn/ssl_polarssl.c
index 9dc4e879..9dc4e879 100644
--- a/openvpn/src/openvpn/ssl_polarssl.c
+++ b/main/openvpn/src/openvpn/ssl_polarssl.c
diff --git a/openvpn/src/openvpn/ssl_polarssl.h b/main/openvpn/src/openvpn/ssl_polarssl.h
index fc9aa784..fc9aa784 100644
--- a/openvpn/src/openvpn/ssl_polarssl.h
+++ b/main/openvpn/src/openvpn/ssl_polarssl.h
diff --git a/openvpn/src/openvpn/ssl_verify.c b/main/openvpn/src/openvpn/ssl_verify.c
index 4dd3aa2d..4dd3aa2d 100644
--- a/openvpn/src/openvpn/ssl_verify.c
+++ b/main/openvpn/src/openvpn/ssl_verify.c
diff --git a/openvpn/src/openvpn/ssl_verify.h b/main/openvpn/src/openvpn/ssl_verify.h
index e0bcba42..e0bcba42 100644
--- a/openvpn/src/openvpn/ssl_verify.h
+++ b/main/openvpn/src/openvpn/ssl_verify.h
diff --git a/openvpn/src/openvpn/ssl_verify_backend.h b/main/openvpn/src/openvpn/ssl_verify_backend.h
index 1658cc02..1658cc02 100644
--- a/openvpn/src/openvpn/ssl_verify_backend.h
+++ b/main/openvpn/src/openvpn/ssl_verify_backend.h
diff --git a/openvpn/src/openvpn/ssl_verify_openssl.c b/main/openvpn/src/openvpn/ssl_verify_openssl.c
index 658f5f33..658f5f33 100644
--- a/openvpn/src/openvpn/ssl_verify_openssl.c
+++ b/main/openvpn/src/openvpn/ssl_verify_openssl.c
diff --git a/openvpn/src/openvpn/ssl_verify_openssl.h b/main/openvpn/src/openvpn/ssl_verify_openssl.h
index 5a7e0a19..5a7e0a19 100644
--- a/openvpn/src/openvpn/ssl_verify_openssl.h
+++ b/main/openvpn/src/openvpn/ssl_verify_openssl.h
diff --git a/openvpn/src/openvpn/ssl_verify_polarssl.c b/main/openvpn/src/openvpn/ssl_verify_polarssl.c
index e5ccd904..e5ccd904 100644
--- a/openvpn/src/openvpn/ssl_verify_polarssl.c
+++ b/main/openvpn/src/openvpn/ssl_verify_polarssl.c
diff --git a/openvpn/src/openvpn/ssl_verify_polarssl.h b/main/openvpn/src/openvpn/ssl_verify_polarssl.h
index b259081f..b259081f 100644
--- a/openvpn/src/openvpn/ssl_verify_polarssl.h
+++ b/main/openvpn/src/openvpn/ssl_verify_polarssl.h
diff --git a/openvpn/src/openvpn/status.c b/main/openvpn/src/openvpn/status.c
index b7ff4843..b7ff4843 100644
--- a/openvpn/src/openvpn/status.c
+++ b/main/openvpn/src/openvpn/status.c
diff --git a/openvpn/src/openvpn/status.h b/main/openvpn/src/openvpn/status.h
index af16fd2a..af16fd2a 100644
--- a/openvpn/src/openvpn/status.h
+++ b/main/openvpn/src/openvpn/status.h
diff --git a/openvpn/src/openvpn/syshead.h b/main/openvpn/src/openvpn/syshead.h
index 4050d548..4050d548 100644
--- a/openvpn/src/openvpn/syshead.h
+++ b/main/openvpn/src/openvpn/syshead.h
diff --git a/openvpn/src/openvpn/tun.c b/main/openvpn/src/openvpn/tun.c
index 4df271d5..4df271d5 100644
--- a/openvpn/src/openvpn/tun.c
+++ b/main/openvpn/src/openvpn/tun.c
diff --git a/openvpn/src/openvpn/tun.h b/main/openvpn/src/openvpn/tun.h
index 631b53c6..631b53c6 100644
--- a/openvpn/src/openvpn/tun.h
+++ b/main/openvpn/src/openvpn/tun.h
diff --git a/openvpn/src/openvpn/win32.c b/main/openvpn/src/openvpn/win32.c
index 7c89a5a9..7c89a5a9 100644
--- a/openvpn/src/openvpn/win32.c
+++ b/main/openvpn/src/openvpn/win32.c
diff --git a/openvpn/src/openvpn/win32.h b/main/openvpn/src/openvpn/win32.h
index cc18f027..cc18f027 100644
--- a/openvpn/src/openvpn/win32.h
+++ b/main/openvpn/src/openvpn/win32.h
diff --git a/openvpn/src/openvpnserv/Makefile.am b/main/openvpn/src/openvpnserv/Makefile.am
index a989c25c..a989c25c 100644
--- a/openvpn/src/openvpnserv/Makefile.am
+++ b/main/openvpn/src/openvpnserv/Makefile.am
diff --git a/openvpn/src/openvpnserv/openvpnserv.c b/main/openvpn/src/openvpnserv/openvpnserv.c
index 56f5a025..56f5a025 100755
--- a/openvpn/src/openvpnserv/openvpnserv.c
+++ b/main/openvpn/src/openvpnserv/openvpnserv.c
diff --git a/openvpn/src/openvpnserv/openvpnserv.vcxproj b/main/openvpn/src/openvpnserv/openvpnserv.vcxproj
index f2c00718..f2c00718 100644
--- a/openvpn/src/openvpnserv/openvpnserv.vcxproj
+++ b/main/openvpn/src/openvpnserv/openvpnserv.vcxproj
diff --git a/openvpn/src/openvpnserv/openvpnserv.vcxproj.filters b/main/openvpn/src/openvpnserv/openvpnserv.vcxproj.filters
index a6f8ecc6..a6f8ecc6 100644
--- a/openvpn/src/openvpnserv/openvpnserv.vcxproj.filters
+++ b/main/openvpn/src/openvpnserv/openvpnserv.vcxproj.filters
diff --git a/openvpn/src/openvpnserv/openvpnserv_resources.rc b/main/openvpn/src/openvpnserv/openvpnserv_resources.rc
index 7980193b..7980193b 100644
--- a/openvpn/src/openvpnserv/openvpnserv_resources.rc
+++ b/main/openvpn/src/openvpnserv/openvpnserv_resources.rc
diff --git a/openvpn/src/openvpnserv/service.c b/main/openvpn/src/openvpnserv/service.c
index d7562b38..d7562b38 100644
--- a/openvpn/src/openvpnserv/service.c
+++ b/main/openvpn/src/openvpnserv/service.c
diff --git a/openvpn/src/openvpnserv/service.h b/main/openvpn/src/openvpnserv/service.h
index e89a89fb..e89a89fb 100644
--- a/openvpn/src/openvpnserv/service.h
+++ b/main/openvpn/src/openvpnserv/service.h
diff --git a/openvpn/src/plugins/Makefile.am b/main/openvpn/src/plugins/Makefile.am
index 17b72b94..17b72b94 100644
--- a/openvpn/src/plugins/Makefile.am
+++ b/main/openvpn/src/plugins/Makefile.am
diff --git a/openvpn/src/plugins/Makefile.in b/main/openvpn/src/plugins/Makefile.in
index 6a366c4b..6a366c4b 100644
--- a/openvpn/src/plugins/Makefile.in
+++ b/main/openvpn/src/plugins/Makefile.in
diff --git a/openvpn/src/plugins/auth-pam/Makefile.am b/main/openvpn/src/plugins/auth-pam/Makefile.am
index 701a7497..701a7497 100644
--- a/openvpn/src/plugins/auth-pam/Makefile.am
+++ b/main/openvpn/src/plugins/auth-pam/Makefile.am
diff --git a/openvpn/src/plugins/auth-pam/Makefile.in b/main/openvpn/src/plugins/auth-pam/Makefile.in
index 74c23306..74c23306 100644
--- a/openvpn/src/plugins/auth-pam/Makefile.in
+++ b/main/openvpn/src/plugins/auth-pam/Makefile.in
diff --git a/openvpn/src/plugins/auth-pam/README.auth-pam b/main/openvpn/src/plugins/auth-pam/README.auth-pam
index e1236902..e1236902 100644
--- a/openvpn/src/plugins/auth-pam/README.auth-pam
+++ b/main/openvpn/src/plugins/auth-pam/README.auth-pam
diff --git a/openvpn/src/plugins/auth-pam/auth-pam.c b/main/openvpn/src/plugins/auth-pam/auth-pam.c
index bd717927..bd717927 100644
--- a/openvpn/src/plugins/auth-pam/auth-pam.c
+++ b/main/openvpn/src/plugins/auth-pam/auth-pam.c
diff --git a/openvpn/src/plugins/auth-pam/auth-pam.exports b/main/openvpn/src/plugins/auth-pam/auth-pam.exports
index b07937cc..b07937cc 100644
--- a/openvpn/src/plugins/auth-pam/auth-pam.exports
+++ b/main/openvpn/src/plugins/auth-pam/auth-pam.exports
diff --git a/openvpn/src/plugins/auth-pam/pamdl.c b/main/openvpn/src/plugins/auth-pam/pamdl.c
index 26e98215..26e98215 100644
--- a/openvpn/src/plugins/auth-pam/pamdl.c
+++ b/main/openvpn/src/plugins/auth-pam/pamdl.c
diff --git a/openvpn/src/plugins/auth-pam/pamdl.h b/main/openvpn/src/plugins/auth-pam/pamdl.h
index 12ba0684..12ba0684 100644
--- a/openvpn/src/plugins/auth-pam/pamdl.h
+++ b/main/openvpn/src/plugins/auth-pam/pamdl.h
diff --git a/openvpn/src/plugins/down-root/Makefile.am b/main/openvpn/src/plugins/down-root/Makefile.am
index 064aa30c..064aa30c 100644
--- a/openvpn/src/plugins/down-root/Makefile.am
+++ b/main/openvpn/src/plugins/down-root/Makefile.am
diff --git a/openvpn/src/plugins/down-root/Makefile.in b/main/openvpn/src/plugins/down-root/Makefile.in
index fa06a466..fa06a466 100644
--- a/openvpn/src/plugins/down-root/Makefile.in
+++ b/main/openvpn/src/plugins/down-root/Makefile.in
diff --git a/openvpn/src/plugins/down-root/README.down-root b/main/openvpn/src/plugins/down-root/README.down-root
index d337ffe9..d337ffe9 100644
--- a/openvpn/src/plugins/down-root/README.down-root
+++ b/main/openvpn/src/plugins/down-root/README.down-root
diff --git a/openvpn/src/plugins/down-root/down-root.c b/main/openvpn/src/plugins/down-root/down-root.c
index d51d0e55..d51d0e55 100644
--- a/openvpn/src/plugins/down-root/down-root.c
+++ b/main/openvpn/src/plugins/down-root/down-root.c
diff --git a/openvpn/src/plugins/down-root/down-root.exports b/main/openvpn/src/plugins/down-root/down-root.exports
index b07937cc..b07937cc 100644
--- a/openvpn/src/plugins/down-root/down-root.exports
+++ b/main/openvpn/src/plugins/down-root/down-root.exports
diff --git a/openvpn/tests/Makefile.am b/main/openvpn/tests/Makefile.am
index b7980e04..b7980e04 100644
--- a/openvpn/tests/Makefile.am
+++ b/main/openvpn/tests/Makefile.am
diff --git a/openvpn/tests/t_client.rc-sample b/main/openvpn/tests/t_client.rc-sample
index 6e666077..6e666077 100644
--- a/openvpn/tests/t_client.rc-sample
+++ b/main/openvpn/tests/t_client.rc-sample
diff --git a/openvpn/tests/t_client.sh.in b/main/openvpn/tests/t_client.sh.in
index 6c9de6c3..6c9de6c3 100755
--- a/openvpn/tests/t_client.sh.in
+++ b/main/openvpn/tests/t_client.sh.in
diff --git a/openvpn/tests/t_cltsrv-down.sh b/main/openvpn/tests/t_cltsrv-down.sh
index 2ef852aa..2ef852aa 100755
--- a/openvpn/tests/t_cltsrv-down.sh
+++ b/main/openvpn/tests/t_cltsrv-down.sh
diff --git a/openvpn/tests/t_cltsrv.sh b/main/openvpn/tests/t_cltsrv.sh
index 752251e4..752251e4 100755
--- a/openvpn/tests/t_cltsrv.sh
+++ b/main/openvpn/tests/t_cltsrv.sh
diff --git a/openvpn/tests/t_lpback.sh b/main/openvpn/tests/t_lpback.sh
index 40767a1b..40767a1b 100755
--- a/openvpn/tests/t_lpback.sh
+++ b/main/openvpn/tests/t_lpback.sh
diff --git a/openvpn/version.m4 b/main/openvpn/version.m4
index 376661f7..376661f7 100644
--- a/openvpn/version.m4
+++ b/main/openvpn/version.m4
diff --git a/openvpn/version.sh.in b/main/openvpn/version.sh.in
index 2af5a364..2af5a364 100644
--- a/openvpn/version.sh.in
+++ b/main/openvpn/version.sh.in
diff --git a/snappy/Android.mk b/main/snappy/Android.mk
index cdd26003..cdd26003 100644
--- a/snappy/Android.mk
+++ b/main/snappy/Android.mk
diff --git a/snappy/COPYING b/main/snappy/COPYING
index 8d6bd9fe..8d6bd9fe 100644
--- a/snappy/COPYING
+++ b/main/snappy/COPYING
diff --git a/snappy/conf/config.h b/main/snappy/conf/config.h
index e0bf3214..e0bf3214 100644
--- a/snappy/conf/config.h
+++ b/main/snappy/conf/config.h
diff --git a/snappy/snappy-c.cc b/main/snappy/snappy-c.cc
index 473a0b09..473a0b09 100644
--- a/snappy/snappy-c.cc
+++ b/main/snappy/snappy-c.cc
diff --git a/snappy/snappy-c.h b/main/snappy/snappy-c.h
index c6c2a860..c6c2a860 100644
--- a/snappy/snappy-c.h
+++ b/main/snappy/snappy-c.h
diff --git a/snappy/snappy-internal.h b/main/snappy/snappy-internal.h
index c99d3313..c99d3313 100644
--- a/snappy/snappy-internal.h
+++ b/main/snappy/snappy-internal.h
diff --git a/snappy/snappy-sinksource.cc b/main/snappy/snappy-sinksource.cc
index 5844552c..5844552c 100644
--- a/snappy/snappy-sinksource.cc
+++ b/main/snappy/snappy-sinksource.cc
diff --git a/snappy/snappy-sinksource.h b/main/snappy/snappy-sinksource.h
index faabfa1e..faabfa1e 100644
--- a/snappy/snappy-sinksource.h
+++ b/main/snappy/snappy-sinksource.h
diff --git a/snappy/snappy-stubs-internal.cc b/main/snappy/snappy-stubs-internal.cc
index 6ed33437..6ed33437 100644
--- a/snappy/snappy-stubs-internal.cc
+++ b/main/snappy/snappy-stubs-internal.cc
diff --git a/snappy/snappy-stubs-internal.h b/main/snappy/snappy-stubs-internal.h
index 12393b62..12393b62 100644
--- a/snappy/snappy-stubs-internal.h
+++ b/main/snappy/snappy-stubs-internal.h
diff --git a/snappy/snappy-stubs-public.h b/main/snappy/snappy-stubs-public.h
index 96d88650..96d88650 100644
--- a/snappy/snappy-stubs-public.h
+++ b/main/snappy/snappy-stubs-public.h
diff --git a/snappy/snappy-stubs-public.h.in b/main/snappy/snappy-stubs-public.h.in
index f0babcbe..f0babcbe 100644
--- a/snappy/snappy-stubs-public.h.in
+++ b/main/snappy/snappy-stubs-public.h.in
diff --git a/snappy/snappy-test.cc b/main/snappy/snappy-test.cc
index 46194109..46194109 100644
--- a/snappy/snappy-test.cc
+++ b/main/snappy/snappy-test.cc
diff --git a/snappy/snappy-test.h b/main/snappy/snappy-test.h
index f7ba79ed..f7ba79ed 100644
--- a/snappy/snappy-test.h
+++ b/main/snappy/snappy-test.h
diff --git a/snappy/snappy.cc b/main/snappy/snappy.cc
index 1230321f..1230321f 100644
--- a/snappy/snappy.cc
+++ b/main/snappy/snappy.cc
diff --git a/snappy/snappy.h b/main/snappy/snappy.h
index 03ef6ce5..03ef6ce5 100644
--- a/snappy/snappy.h
+++ b/main/snappy/snappy.h
diff --git a/snappy/snappy_unittest.cc b/main/snappy/snappy_unittest.cc
index 59c108f4..59c108f4 100644
--- a/snappy/snappy_unittest.cc
+++ b/main/snappy/snappy_unittest.cc
diff --git a/AndroidManifest.xml b/main/src/main/AndroidManifest.xml
index 7043e94b..7043e94b 100644
--- a/AndroidManifest.xml
+++ b/main/src/main/AndroidManifest.xml
diff --git a/src/com/android/vending/billing/IInAppBillingService.aidl b/main/src/main/aidl/com/android/vending/billing/IInAppBillingService.aidl
index 2a492f78..2a492f78 100644
--- a/src/com/android/vending/billing/IInAppBillingService.aidl
+++ b/main/src/main/aidl/com/android/vending/billing/IInAppBillingService.aidl
diff --git a/src/de/blinkt/openvpn/api/APIVpnProfile.aidl b/main/src/main/aidl/de/blinkt/openvpn/api/APIVpnProfile.aidl
index f6799659..f6799659 100644
--- a/src/de/blinkt/openvpn/api/APIVpnProfile.aidl
+++ b/main/src/main/aidl/de/blinkt/openvpn/api/APIVpnProfile.aidl
diff --git a/src/de/blinkt/openvpn/api/IOpenVPNAPIService.aidl b/main/src/main/aidl/de/blinkt/openvpn/api/IOpenVPNAPIService.aidl
index 794e3aad..794e3aad 100644
--- a/src/de/blinkt/openvpn/api/IOpenVPNAPIService.aidl
+++ b/main/src/main/aidl/de/blinkt/openvpn/api/IOpenVPNAPIService.aidl
diff --git a/src/de/blinkt/openvpn/api/IOpenVPNStatusCallback.aidl b/main/src/main/aidl/de/blinkt/openvpn/api/IOpenVPNStatusCallback.aidl
index 1dfa1381..1dfa1381 100644
--- a/src/de/blinkt/openvpn/api/IOpenVPNStatusCallback.aidl
+++ b/main/src/main/aidl/de/blinkt/openvpn/api/IOpenVPNStatusCallback.aidl
diff --git a/assets/full_licenses.html b/main/src/main/assets/full_licenses.html
index 468c2db9..468c2db9 100644
--- a/assets/full_licenses.html
+++ b/main/src/main/assets/full_licenses.html
diff --git a/src/de/blinkt/openvpn/FileProvider.java b/main/src/main/java/de/blinkt/openvpn/FileProvider.java
index 9ffd6545..9ffd6545 100644
--- a/src/de/blinkt/openvpn/FileProvider.java
+++ b/main/src/main/java/de/blinkt/openvpn/FileProvider.java
diff --git a/src/de/blinkt/openvpn/LaunchVPN.java b/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java
index 7aed4e4a..7aed4e4a 100644
--- a/src/de/blinkt/openvpn/LaunchVPN.java
+++ b/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java
diff --git a/src/de/blinkt/openvpn/OnBootReceiver.java b/main/src/main/java/de/blinkt/openvpn/OnBootReceiver.java
index 32d14b1b..32d14b1b 100644
--- a/src/de/blinkt/openvpn/OnBootReceiver.java
+++ b/main/src/main/java/de/blinkt/openvpn/OnBootReceiver.java
diff --git a/src/de/blinkt/openvpn/VpnProfile.java b/main/src/main/java/de/blinkt/openvpn/VpnProfile.java
index 1ec34b51..1ec34b51 100644
--- a/src/de/blinkt/openvpn/VpnProfile.java
+++ b/main/src/main/java/de/blinkt/openvpn/VpnProfile.java
diff --git a/src/de/blinkt/openvpn/activities/ConfigConverter.java b/main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java
index cc84076d..8e11802c 100644
--- a/src/de/blinkt/openvpn/activities/ConfigConverter.java
+++ b/main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java
@@ -6,6 +6,7 @@ import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;
 import android.app.ListActivity;
 import android.content.ActivityNotFoundException;
+import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.os.Bundle;
@@ -20,6 +21,8 @@ import android.view.*;
 import android.widget.ArrayAdapter;
 import android.widget.CheckBox;
 import android.widget.LinearLayout;
+import android.widget.TextView;
+
 import de.blinkt.openvpn.R;
 import de.blinkt.openvpn.VpnProfile;
 import de.blinkt.openvpn.core.ConfigParser;
@@ -29,6 +32,8 @@ import de.blinkt.openvpn.fragments.Utils;
 import de.blinkt.openvpn.views.FileSelectLayout;
 import junit.framework.Assert;
 
+import org.jetbrains.annotations.Nullable;
+
 import java.io.*;
 import java.util.*;
 
diff --git a/src/de/blinkt/openvpn/activities/CreateShortcuts.java b/main/src/main/java/de/blinkt/openvpn/activities/CreateShortcuts.java
index 53a829ff..53a829ff 100644
--- a/src/de/blinkt/openvpn/activities/CreateShortcuts.java
+++ b/main/src/main/java/de/blinkt/openvpn/activities/CreateShortcuts.java
diff --git a/src/de/blinkt/openvpn/activities/DisconnectVPN.java b/main/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java
index c2d4c599..c2d4c599 100644
--- a/src/de/blinkt/openvpn/activities/DisconnectVPN.java
+++ b/main/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java
diff --git a/src/de/blinkt/openvpn/activities/FileSelect.java b/main/src/main/java/de/blinkt/openvpn/activities/FileSelect.java
index 511dc736..511dc736 100644
--- a/src/de/blinkt/openvpn/activities/FileSelect.java
+++ b/main/src/main/java/de/blinkt/openvpn/activities/FileSelect.java
diff --git a/src/de/blinkt/openvpn/activities/LogWindow.java b/main/src/main/java/de/blinkt/openvpn/activities/LogWindow.java
index 27197035..27197035 100644
--- a/src/de/blinkt/openvpn/activities/LogWindow.java
+++ b/main/src/main/java/de/blinkt/openvpn/activities/LogWindow.java
diff --git a/src/de/blinkt/openvpn/activities/MainActivity.java b/main/src/main/java/de/blinkt/openvpn/activities/MainActivity.java
index b32c80cc..b32c80cc 100644
--- a/src/de/blinkt/openvpn/activities/MainActivity.java
+++ b/main/src/main/java/de/blinkt/openvpn/activities/MainActivity.java
diff --git a/src/de/blinkt/openvpn/activities/VPNPreferences.java b/main/src/main/java/de/blinkt/openvpn/activities/VPNPreferences.java
index 1ebb16b2..1ebb16b2 100644
--- a/src/de/blinkt/openvpn/activities/VPNPreferences.java
+++ b/main/src/main/java/de/blinkt/openvpn/activities/VPNPreferences.java
diff --git a/src/de/blinkt/openvpn/api/APIVpnProfile.java b/main/src/main/java/de/blinkt/openvpn/api/APIVpnProfile.java
index f5591764..f5591764 100644
--- a/src/de/blinkt/openvpn/api/APIVpnProfile.java
+++ b/main/src/main/java/de/blinkt/openvpn/api/APIVpnProfile.java
diff --git a/src/de/blinkt/openvpn/api/ConfirmDialog.java b/main/src/main/java/de/blinkt/openvpn/api/ConfirmDialog.java
index bcab79ed..bcab79ed 100644
--- a/src/de/blinkt/openvpn/api/ConfirmDialog.java
+++ b/main/src/main/java/de/blinkt/openvpn/api/ConfirmDialog.java
diff --git a/src/de/blinkt/openvpn/api/ExternalAppDatabase.java b/main/src/main/java/de/blinkt/openvpn/api/ExternalAppDatabase.java
index 02c369b1..02c369b1 100644
--- a/src/de/blinkt/openvpn/api/ExternalAppDatabase.java
+++ b/main/src/main/java/de/blinkt/openvpn/api/ExternalAppDatabase.java
diff --git a/src/de/blinkt/openvpn/api/ExternalOpenVPNService.java b/main/src/main/java/de/blinkt/openvpn/api/ExternalOpenVPNService.java
index 928a85eb..928a85eb 100644
--- a/src/de/blinkt/openvpn/api/ExternalOpenVPNService.java
+++ b/main/src/main/java/de/blinkt/openvpn/api/ExternalOpenVPNService.java
diff --git a/src/de/blinkt/openvpn/api/GrantPermissionsActivity.java b/main/src/main/java/de/blinkt/openvpn/api/GrantPermissionsActivity.java
index 659ec24b..659ec24b 100644
--- a/src/de/blinkt/openvpn/api/GrantPermissionsActivity.java
+++ b/main/src/main/java/de/blinkt/openvpn/api/GrantPermissionsActivity.java
diff --git a/src/de/blinkt/openvpn/api/SecurityRemoteException.java b/main/src/main/java/de/blinkt/openvpn/api/SecurityRemoteException.java
index e6011aa3..e6011aa3 100644
--- a/src/de/blinkt/openvpn/api/SecurityRemoteException.java
+++ b/main/src/main/java/de/blinkt/openvpn/api/SecurityRemoteException.java
diff --git a/src/de/blinkt/openvpn/core/CIDRIP.java b/main/src/main/java/de/blinkt/openvpn/core/CIDRIP.java
index 960e7d11..960e7d11 100644
--- a/src/de/blinkt/openvpn/core/CIDRIP.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/CIDRIP.java
diff --git a/src/de/blinkt/openvpn/core/ConfigParser.java b/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java
index 22cc5dce..22cc5dce 100644
--- a/src/de/blinkt/openvpn/core/ConfigParser.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java
diff --git a/src/de/blinkt/openvpn/core/DeviceStateReceiver.java b/main/src/main/java/de/blinkt/openvpn/core/DeviceStateReceiver.java
index 250edf42..250edf42 100644
--- a/src/de/blinkt/openvpn/core/DeviceStateReceiver.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/DeviceStateReceiver.java
diff --git a/src/de/blinkt/openvpn/core/GetRestrictionReceiver.java b/main/src/main/java/de/blinkt/openvpn/core/GetRestrictionReceiver.java
index 7f8498d5..7f8498d5 100644
--- a/src/de/blinkt/openvpn/core/GetRestrictionReceiver.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/GetRestrictionReceiver.java
diff --git a/src/de/blinkt/openvpn/core/ICSOpenVPNApplication.java b/main/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java
index 1daa3433..1daa3433 100644
--- a/src/de/blinkt/openvpn/core/ICSOpenVPNApplication.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java
diff --git a/src/de/blinkt/openvpn/core/NativeUtils.java b/main/src/main/java/de/blinkt/openvpn/core/NativeUtils.java
index a2c4796d..a2c4796d 100644
--- a/src/de/blinkt/openvpn/core/NativeUtils.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/NativeUtils.java
diff --git a/src/de/blinkt/openvpn/core/NetworkSpace.java b/main/src/main/java/de/blinkt/openvpn/core/NetworkSpace.java
index c7d09065..c7d09065 100644
--- a/src/de/blinkt/openvpn/core/NetworkSpace.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/NetworkSpace.java
diff --git a/src/de/blinkt/openvpn/core/OpenVPNManagement.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNManagement.java
index ce8d38c2..ce8d38c2 100644
--- a/src/de/blinkt/openvpn/core/OpenVPNManagement.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNManagement.java
diff --git a/src/de/blinkt/openvpn/core/OpenVPNThread.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java
index dacd41c9..dacd41c9 100644
--- a/src/de/blinkt/openvpn/core/OpenVPNThread.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java
diff --git a/src/de/blinkt/openvpn/core/OpenVpnManagementThread.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
index 5fa70cc8..5fa70cc8 100644
--- a/src/de/blinkt/openvpn/core/OpenVpnManagementThread.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
diff --git a/src/de/blinkt/openvpn/core/OpenVpnService.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVpnService.java
index 49f315a3..49f315a3 100644
--- a/src/de/blinkt/openvpn/core/OpenVpnService.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVpnService.java
diff --git a/src/de/blinkt/openvpn/core/PRNGFixes.java b/main/src/main/java/de/blinkt/openvpn/core/PRNGFixes.java
index dd420371..dd420371 100644
--- a/src/de/blinkt/openvpn/core/PRNGFixes.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/PRNGFixes.java
diff --git a/src/de/blinkt/openvpn/core/ProfileManager.java b/main/src/main/java/de/blinkt/openvpn/core/ProfileManager.java
index 4cfbcc8e..4cfbcc8e 100644
--- a/src/de/blinkt/openvpn/core/ProfileManager.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/ProfileManager.java
diff --git a/src/de/blinkt/openvpn/core/ProxyDetection.java b/main/src/main/java/de/blinkt/openvpn/core/ProxyDetection.java
index 4f66c503..4f66c503 100644
--- a/src/de/blinkt/openvpn/core/ProxyDetection.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/ProxyDetection.java
diff --git a/src/de/blinkt/openvpn/core/VPNLaunchHelper.java b/main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java
index 5f1efb5f..5f1efb5f 100644
--- a/src/de/blinkt/openvpn/core/VPNLaunchHelper.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java
diff --git a/src/de/blinkt/openvpn/core/VpnStatus.java b/main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
index d146aef8..d146aef8 100644
--- a/src/de/blinkt/openvpn/core/VpnStatus.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
diff --git a/src/de/blinkt/openvpn/core/X509Utils.java b/main/src/main/java/de/blinkt/openvpn/core/X509Utils.java
index da1e4ed5..da1e4ed5 100644
--- a/src/de/blinkt/openvpn/core/X509Utils.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/X509Utils.java
diff --git a/src/de/blinkt/openvpn/fragments/AboutFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/AboutFragment.java
index 61fcb581..61fcb581 100644
--- a/src/de/blinkt/openvpn/fragments/AboutFragment.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/AboutFragment.java
diff --git a/src/de/blinkt/openvpn/fragments/FaqFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/FaqFragment.java
index 238ad952..238ad952 100644
--- a/src/de/blinkt/openvpn/fragments/FaqFragment.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/FaqFragment.java
diff --git a/src/de/blinkt/openvpn/fragments/FileSelectionFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/FileSelectionFragment.java
index 84e065a5..84e065a5 100644
--- a/src/de/blinkt/openvpn/fragments/FileSelectionFragment.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/FileSelectionFragment.java
diff --git a/src/de/blinkt/openvpn/fragments/GeneralSettings.java b/main/src/main/java/de/blinkt/openvpn/fragments/GeneralSettings.java
index 2e486dfe..2e486dfe 100644
--- a/src/de/blinkt/openvpn/fragments/GeneralSettings.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/GeneralSettings.java
diff --git a/src/de/blinkt/openvpn/fragments/InlineFileTab.java b/main/src/main/java/de/blinkt/openvpn/fragments/InlineFileTab.java
index bea22442..bea22442 100644
--- a/src/de/blinkt/openvpn/fragments/InlineFileTab.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/InlineFileTab.java
diff --git a/src/de/blinkt/openvpn/fragments/LogFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java
index 8530be34..8530be34 100644
--- a/src/de/blinkt/openvpn/fragments/LogFragment.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java
diff --git a/src/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java
index f23a50db..f23a50db 100644
--- a/src/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java
diff --git a/src/de/blinkt/openvpn/fragments/SendDumpFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/SendDumpFragment.java
index d43f6427..d43f6427 100644
--- a/src/de/blinkt/openvpn/fragments/SendDumpFragment.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/SendDumpFragment.java
diff --git a/src/de/blinkt/openvpn/fragments/Settings_Authentication.java b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Authentication.java
index 236d7947..236d7947 100644
--- a/src/de/blinkt/openvpn/fragments/Settings_Authentication.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Authentication.java
diff --git a/src/de/blinkt/openvpn/fragments/Settings_Basic.java b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Basic.java
index 4145c65f..4145c65f 100644
--- a/src/de/blinkt/openvpn/fragments/Settings_Basic.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Basic.java
diff --git a/src/de/blinkt/openvpn/fragments/Settings_IP.java b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_IP.java
index 16e3a5c4..16e3a5c4 100644
--- a/src/de/blinkt/openvpn/fragments/Settings_IP.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_IP.java
diff --git a/src/de/blinkt/openvpn/fragments/Settings_Obscure.java b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Obscure.java
index 0e8f1a02..0e8f1a02 100644
--- a/src/de/blinkt/openvpn/fragments/Settings_Obscure.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Obscure.java
diff --git a/src/de/blinkt/openvpn/fragments/Settings_Routing.java b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Routing.java
index c6f0dcf8..c6f0dcf8 100644
--- a/src/de/blinkt/openvpn/fragments/Settings_Routing.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Routing.java
diff --git a/src/de/blinkt/openvpn/fragments/ShowConfigFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java
index bf673288..bf673288 100644
--- a/src/de/blinkt/openvpn/fragments/ShowConfigFragment.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java
diff --git a/src/de/blinkt/openvpn/fragments/Utils.java b/main/src/main/java/de/blinkt/openvpn/fragments/Utils.java
index 9117f158..9117f158 100644
--- a/src/de/blinkt/openvpn/fragments/Utils.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/Utils.java
diff --git a/src/de/blinkt/openvpn/fragments/VPNProfileList.java b/main/src/main/java/de/blinkt/openvpn/fragments/VPNProfileList.java
index b26f3505..b26f3505 100644
--- a/src/de/blinkt/openvpn/fragments/VPNProfileList.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/VPNProfileList.java
diff --git a/src/de/blinkt/openvpn/views/FileSelectLayout.java b/main/src/main/java/de/blinkt/openvpn/views/FileSelectLayout.java
index 362777e4..362777e4 100644
--- a/src/de/blinkt/openvpn/views/FileSelectLayout.java
+++ b/main/src/main/java/de/blinkt/openvpn/views/FileSelectLayout.java
diff --git a/src/de/blinkt/openvpn/views/RemoteCNPreference.java b/main/src/main/java/de/blinkt/openvpn/views/RemoteCNPreference.java
index 388f892b..388f892b 100644
--- a/src/de/blinkt/openvpn/views/RemoteCNPreference.java
+++ b/main/src/main/java/de/blinkt/openvpn/views/RemoteCNPreference.java
diff --git a/src/de/blinkt/openvpn/views/SeekBarTicks.java b/main/src/main/java/de/blinkt/openvpn/views/SeekBarTicks.java
index 88e8e164..88e8e164 100644
--- a/src/de/blinkt/openvpn/views/SeekBarTicks.java
+++ b/main/src/main/java/de/blinkt/openvpn/views/SeekBarTicks.java
diff --git a/src/org/spongycastle/util/encoders/Base64.java b/main/src/main/java/org/spongycastle/util/encoders/Base64.java
index 87bd80a0..87bd80a0 100644
--- a/src/org/spongycastle/util/encoders/Base64.java
+++ b/main/src/main/java/org/spongycastle/util/encoders/Base64.java
diff --git a/src/org/spongycastle/util/encoders/Base64Encoder.java b/main/src/main/java/org/spongycastle/util/encoders/Base64Encoder.java
index 84060707..84060707 100644
--- a/src/org/spongycastle/util/encoders/Base64Encoder.java
+++ b/main/src/main/java/org/spongycastle/util/encoders/Base64Encoder.java
diff --git a/src/org/spongycastle/util/encoders/Encoder.java b/main/src/main/java/org/spongycastle/util/encoders/Encoder.java
index 106c36b7..106c36b7 100644
--- a/src/org/spongycastle/util/encoders/Encoder.java
+++ b/main/src/main/java/org/spongycastle/util/encoders/Encoder.java
diff --git a/src/org/spongycastle/util/io/pem/PemGenerationException.java b/main/src/main/java/org/spongycastle/util/io/pem/PemGenerationException.java
index 0127ca0c..0127ca0c 100644
--- a/src/org/spongycastle/util/io/pem/PemGenerationException.java
+++ b/main/src/main/java/org/spongycastle/util/io/pem/PemGenerationException.java
diff --git a/src/org/spongycastle/util/io/pem/PemHeader.java b/main/src/main/java/org/spongycastle/util/io/pem/PemHeader.java
index 4adb815e..4adb815e 100644
--- a/src/org/spongycastle/util/io/pem/PemHeader.java
+++ b/main/src/main/java/org/spongycastle/util/io/pem/PemHeader.java
diff --git a/src/org/spongycastle/util/io/pem/PemObject.java b/main/src/main/java/org/spongycastle/util/io/pem/PemObject.java
index 6f7c79c5..6f7c79c5 100644
--- a/src/org/spongycastle/util/io/pem/PemObject.java
+++ b/main/src/main/java/org/spongycastle/util/io/pem/PemObject.java
diff --git a/src/org/spongycastle/util/io/pem/PemObjectGenerator.java b/main/src/main/java/org/spongycastle/util/io/pem/PemObjectGenerator.java
index 1a8cea6d..1a8cea6d 100644
--- a/src/org/spongycastle/util/io/pem/PemObjectGenerator.java
+++ b/main/src/main/java/org/spongycastle/util/io/pem/PemObjectGenerator.java
diff --git a/src/org/spongycastle/util/io/pem/PemReader.java b/main/src/main/java/org/spongycastle/util/io/pem/PemReader.java
index cbbebab9..cbbebab9 100644
--- a/src/org/spongycastle/util/io/pem/PemReader.java
+++ b/main/src/main/java/org/spongycastle/util/io/pem/PemReader.java
diff --git a/src/org/spongycastle/util/io/pem/PemWriter.java b/main/src/main/java/org/spongycastle/util/io/pem/PemWriter.java
index f5a6a363..f5a6a363 100644
--- a/src/org/spongycastle/util/io/pem/PemWriter.java
+++ b/main/src/main/java/org/spongycastle/util/io/pem/PemWriter.java
diff --git a/res/drawable-hdpi/ic_clock.png b/main/src/main/res/drawable-hdpi/ic_clock.png
index 22da1b4c..22da1b4c 100644
--- a/res/drawable-hdpi/ic_clock.png
+++ b/main/src/main/res/drawable-hdpi/ic_clock.png
diff --git a/res/drawable-hdpi/ic_doc_generic_am.png b/main/src/main/res/drawable-hdpi/ic_doc_generic_am.png
index 55b9b7d3..55b9b7d3 100644
--- a/res/drawable-hdpi/ic_doc_generic_am.png
+++ b/main/src/main/res/drawable-hdpi/ic_doc_generic_am.png
diff --git a/res/drawable-hdpi/ic_menu_archive.png b/main/src/main/res/drawable-hdpi/ic_menu_archive.png
index e2d9bc1a..e2d9bc1a 100644
--- a/res/drawable-hdpi/ic_menu_archive.png
+++ b/main/src/main/res/drawable-hdpi/ic_menu_archive.png
diff --git a/res/drawable-hdpi/ic_root_folder_am.png b/main/src/main/res/drawable-hdpi/ic_root_folder_am.png
index 915e1182..915e1182 100644
--- a/res/drawable-hdpi/ic_root_folder_am.png
+++ b/main/src/main/res/drawable-hdpi/ic_root_folder_am.png
diff --git a/res/drawable-hdpi/ic_stat_vpn.png b/main/src/main/res/drawable-hdpi/ic_stat_vpn.png
index 788cbd32..788cbd32 100644
--- a/res/drawable-hdpi/ic_stat_vpn.png
+++ b/main/src/main/res/drawable-hdpi/ic_stat_vpn.png
diff --git a/res/drawable-hdpi/ic_stat_vpn_empty_halo.png b/main/src/main/res/drawable-hdpi/ic_stat_vpn_empty_halo.png
index 7df5b670..7df5b670 100644
--- a/res/drawable-hdpi/ic_stat_vpn_empty_halo.png
+++ b/main/src/main/res/drawable-hdpi/ic_stat_vpn_empty_halo.png
diff --git a/res/drawable-hdpi/ic_stat_vpn_offline.png b/main/src/main/res/drawable-hdpi/ic_stat_vpn_offline.png
index 8aa48803..8aa48803 100644
--- a/res/drawable-hdpi/ic_stat_vpn_offline.png
+++ b/main/src/main/res/drawable-hdpi/ic_stat_vpn_offline.png
diff --git a/res/drawable-hdpi/ic_stat_vpn_outline.png b/main/src/main/res/drawable-hdpi/ic_stat_vpn_outline.png
index b5583d99..b5583d99 100644
--- a/res/drawable-hdpi/ic_stat_vpn_outline.png
+++ b/main/src/main/res/drawable-hdpi/ic_stat_vpn_outline.png
diff --git a/res/drawable-hdpi/ic_sysbar_quicksettings.png b/main/src/main/res/drawable-hdpi/ic_sysbar_quicksettings.png
index 47b4ba23..47b4ba23 100644
--- a/res/drawable-hdpi/ic_sysbar_quicksettings.png
+++ b/main/src/main/res/drawable-hdpi/ic_sysbar_quicksettings.png
diff --git a/res/drawable-hdpi/icon.png b/main/src/main/res/drawable-hdpi/icon.png
index d4d31f52..d4d31f52 100644
--- a/res/drawable-hdpi/icon.png
+++ b/main/src/main/res/drawable-hdpi/icon.png
diff --git a/res/drawable-mdpi/ic_clock.png b/main/src/main/res/drawable-mdpi/ic_clock.png
index 9ad15397..9ad15397 100644
--- a/res/drawable-mdpi/ic_clock.png
+++ b/main/src/main/res/drawable-mdpi/ic_clock.png
diff --git a/res/drawable-mdpi/ic_doc_generic_am.png b/main/src/main/res/drawable-mdpi/ic_doc_generic_am.png
index a1bd14ea..a1bd14ea 100644
--- a/res/drawable-mdpi/ic_doc_generic_am.png
+++ b/main/src/main/res/drawable-mdpi/ic_doc_generic_am.png
diff --git a/res/drawable-mdpi/ic_menu_archive.png b/main/src/main/res/drawable-mdpi/ic_menu_archive.png
index 49ac569d..49ac569d 100644
--- a/res/drawable-mdpi/ic_menu_archive.png
+++ b/main/src/main/res/drawable-mdpi/ic_menu_archive.png
diff --git a/res/drawable-mdpi/ic_root_folder_am.png b/main/src/main/res/drawable-mdpi/ic_root_folder_am.png
index 4352d08d..4352d08d 100644
--- a/res/drawable-mdpi/ic_root_folder_am.png
+++ b/main/src/main/res/drawable-mdpi/ic_root_folder_am.png
diff --git a/res/drawable-mdpi/ic_stat_vpn.png b/main/src/main/res/drawable-mdpi/ic_stat_vpn.png
index e1dbeb33..e1dbeb33 100644
--- a/res/drawable-mdpi/ic_stat_vpn.png
+++ b/main/src/main/res/drawable-mdpi/ic_stat_vpn.png
diff --git a/res/drawable-mdpi/ic_stat_vpn_empty_halo.png b/main/src/main/res/drawable-mdpi/ic_stat_vpn_empty_halo.png
index fc039a82..fc039a82 100644
--- a/res/drawable-mdpi/ic_stat_vpn_empty_halo.png
+++ b/main/src/main/res/drawable-mdpi/ic_stat_vpn_empty_halo.png
diff --git a/res/drawable-mdpi/ic_stat_vpn_offline.png b/main/src/main/res/drawable-mdpi/ic_stat_vpn_offline.png
index f31387a4..f31387a4 100644
--- a/res/drawable-mdpi/ic_stat_vpn_offline.png
+++ b/main/src/main/res/drawable-mdpi/ic_stat_vpn_offline.png
diff --git a/res/drawable-mdpi/ic_stat_vpn_outline.png b/main/src/main/res/drawable-mdpi/ic_stat_vpn_outline.png
index 052aef9d..052aef9d 100644
--- a/res/drawable-mdpi/ic_stat_vpn_outline.png
+++ b/main/src/main/res/drawable-mdpi/ic_stat_vpn_outline.png
diff --git a/res/drawable-mdpi/ic_sysbar_quicksettings.png b/main/src/main/res/drawable-mdpi/ic_sysbar_quicksettings.png
index 79281042..79281042 100644
--- a/res/drawable-mdpi/ic_sysbar_quicksettings.png
+++ b/main/src/main/res/drawable-mdpi/ic_sysbar_quicksettings.png
diff --git a/res/drawable-mdpi/icon.png b/main/src/main/res/drawable-mdpi/icon.png
index 4d58f717..4d58f717 100644
--- a/res/drawable-mdpi/icon.png
+++ b/main/src/main/res/drawable-mdpi/icon.png
diff --git a/res/drawable-xhdpi/ic_clock.png b/main/src/main/res/drawable-xhdpi/ic_clock.png
index a2485f0e..a2485f0e 100644
--- a/res/drawable-xhdpi/ic_clock.png
+++ b/main/src/main/res/drawable-xhdpi/ic_clock.png
diff --git a/res/drawable-xhdpi/ic_doc_generic_am.png b/main/src/main/res/drawable-xhdpi/ic_doc_generic_am.png
index e05c4b48..e05c4b48 100644
--- a/res/drawable-xhdpi/ic_doc_generic_am.png
+++ b/main/src/main/res/drawable-xhdpi/ic_doc_generic_am.png
diff --git a/res/drawable-xhdpi/ic_menu_archive.png b/main/src/main/res/drawable-xhdpi/ic_menu_archive.png
index b1be9d5b..b1be9d5b 100644
--- a/res/drawable-xhdpi/ic_menu_archive.png
+++ b/main/src/main/res/drawable-xhdpi/ic_menu_archive.png
diff --git a/res/drawable-xhdpi/ic_root_folder_am.png b/main/src/main/res/drawable-xhdpi/ic_root_folder_am.png
index c916e0be..c916e0be 100644
--- a/res/drawable-xhdpi/ic_root_folder_am.png
+++ b/main/src/main/res/drawable-xhdpi/ic_root_folder_am.png
diff --git a/res/drawable-xhdpi/ic_stat_vpn.png b/main/src/main/res/drawable-xhdpi/ic_stat_vpn.png
index 605d9936..605d9936 100644
--- a/res/drawable-xhdpi/ic_stat_vpn.png
+++ b/main/src/main/res/drawable-xhdpi/ic_stat_vpn.png
diff --git a/res/drawable-xhdpi/ic_stat_vpn_empty_halo.png b/main/src/main/res/drawable-xhdpi/ic_stat_vpn_empty_halo.png
index 2f61e890..2f61e890 100644
--- a/res/drawable-xhdpi/ic_stat_vpn_empty_halo.png
+++ b/main/src/main/res/drawable-xhdpi/ic_stat_vpn_empty_halo.png
diff --git a/res/drawable-xhdpi/ic_stat_vpn_offline.png b/main/src/main/res/drawable-xhdpi/ic_stat_vpn_offline.png
index e9411518..e9411518 100644
--- a/res/drawable-xhdpi/ic_stat_vpn_offline.png
+++ b/main/src/main/res/drawable-xhdpi/ic_stat_vpn_offline.png
diff --git a/res/drawable-xhdpi/ic_stat_vpn_outline.png b/main/src/main/res/drawable-xhdpi/ic_stat_vpn_outline.png
index 5d27240d..5d27240d 100644
--- a/res/drawable-xhdpi/ic_stat_vpn_outline.png
+++ b/main/src/main/res/drawable-xhdpi/ic_stat_vpn_outline.png
diff --git a/res/drawable-xhdpi/ic_sysbar_quicksettings.png b/main/src/main/res/drawable-xhdpi/ic_sysbar_quicksettings.png
index a057db8b..a057db8b 100644
--- a/res/drawable-xhdpi/ic_sysbar_quicksettings.png
+++ b/main/src/main/res/drawable-xhdpi/ic_sysbar_quicksettings.png
diff --git a/res/drawable-xhdpi/icon.png b/main/src/main/res/drawable-xhdpi/icon.png
index 37612879..37612879 100644
--- a/res/drawable-xhdpi/icon.png
+++ b/main/src/main/res/drawable-xhdpi/icon.png
diff --git a/res/drawable-xxhdpi/ic_doc_generic_am.png b/main/src/main/res/drawable-xxhdpi/ic_doc_generic_am.png
index c0988663..c0988663 100644
--- a/res/drawable-xxhdpi/ic_doc_generic_am.png
+++ b/main/src/main/res/drawable-xxhdpi/ic_doc_generic_am.png
diff --git a/res/drawable-xxhdpi/ic_root_folder_am.png b/main/src/main/res/drawable-xxhdpi/ic_root_folder_am.png
index 077c851c..077c851c 100644
--- a/res/drawable-xxhdpi/ic_root_folder_am.png
+++ b/main/src/main/res/drawable-xxhdpi/ic_root_folder_am.png
diff --git a/res/drawable-xxhdpi/icon.png b/main/src/main/res/drawable-xxhdpi/icon.png
index 0132423d..0132423d 100644
--- a/res/drawable-xxhdpi/icon.png
+++ b/main/src/main/res/drawable-xxhdpi/icon.png
diff --git a/res/layout-sw600dp-port/log_fragment.xml b/main/src/main/res/layout-sw600dp-port/log_fragment.xml
index ddf0506b..ddf0506b 100644
--- a/res/layout-sw600dp-port/log_fragment.xml
+++ b/main/src/main/res/layout-sw600dp-port/log_fragment.xml
diff --git a/res/layout-sw600dp/log_fragment.xml b/main/src/main/res/layout-sw600dp/log_fragment.xml
index c4e1355c..c4e1355c 100644
--- a/res/layout-sw600dp/log_fragment.xml
+++ b/main/src/main/res/layout-sw600dp/log_fragment.xml
diff --git a/res/layout/about.xml b/main/src/main/res/layout/about.xml
index ed11d15b..46a5bec2 100644
--- a/res/layout/about.xml
+++ b/main/src/main/res/layout/about.xml
@@ -8,7 +8,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:orientation="vertical" >
 
         <TextView
@@ -188,4 +188,4 @@
             android:layout_gravity="center_horizontal" />
     </LinearLayout>
 
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/res/layout/api_confirm.xml b/main/src/main/res/layout/api_confirm.xml
index 28624880..28624880 100644
--- a/res/layout/api_confirm.xml
+++ b/main/src/main/res/layout/api_confirm.xml
diff --git a/res/layout/basic_settings.xml b/main/src/main/res/layout/basic_settings.xml
index f8c38e79..f8c38e79 100644
--- a/res/layout/basic_settings.xml
+++ b/main/src/main/res/layout/basic_settings.xml
diff --git a/res/layout/config_converter.xml b/main/src/main/res/layout/config_converter.xml
index f43d463e..f43d463e 100644
--- a/res/layout/config_converter.xml
+++ b/main/src/main/res/layout/config_converter.xml
diff --git a/res/layout/faq.xml b/main/src/main/res/layout/faq.xml
index 8983e203..8983e203 100644
--- a/res/layout/faq.xml
+++ b/main/src/main/res/layout/faq.xml
diff --git a/res/layout/file_dialog.xml b/main/src/main/res/layout/file_dialog.xml
index 12abe497..12abe497 100644
--- a/res/layout/file_dialog.xml
+++ b/main/src/main/res/layout/file_dialog.xml
diff --git a/res/layout/file_dialog_inline.xml b/main/src/main/res/layout/file_dialog_inline.xml
index 61e39134..61e39134 100644
--- a/res/layout/file_dialog_inline.xml
+++ b/main/src/main/res/layout/file_dialog_inline.xml
diff --git a/res/layout/file_dialog_main.xml b/main/src/main/res/layout/file_dialog_main.xml
index b50ef8a6..b50ef8a6 100644
--- a/res/layout/file_dialog_main.xml
+++ b/main/src/main/res/layout/file_dialog_main.xml
diff --git a/res/layout/file_dialog_row.xml b/main/src/main/res/layout/file_dialog_row.xml
index c7a5f652..c7a5f652 100644
--- a/res/layout/file_dialog_row.xml
+++ b/main/src/main/res/layout/file_dialog_row.xml
diff --git a/res/layout/file_select.xml b/main/src/main/res/layout/file_select.xml
index 5e40b3a8..5e40b3a8 100644
--- a/res/layout/file_select.xml
+++ b/main/src/main/res/layout/file_select.xml
diff --git a/res/layout/fragment_senddump.xml b/main/src/main/res/layout/fragment_senddump.xml
index 2f573de5..2f573de5 100644
--- a/res/layout/fragment_senddump.xml
+++ b/main/src/main/res/layout/fragment_senddump.xml
diff --git a/res/layout/keystore_selector.xml b/main/src/main/res/layout/keystore_selector.xml
index 28a51836..28a51836 100644
--- a/res/layout/keystore_selector.xml
+++ b/main/src/main/res/layout/keystore_selector.xml
diff --git a/res/layout/log_fragment.xml b/main/src/main/res/layout/log_fragment.xml
index 0b428070..0b428070 100644
--- a/res/layout/log_fragment.xml
+++ b/main/src/main/res/layout/log_fragment.xml
diff --git a/res/layout/log_silders.xml b/main/src/main/res/layout/log_silders.xml
index 0ecb5daa..0ecb5daa 100644
--- a/res/layout/log_silders.xml
+++ b/main/src/main/res/layout/log_silders.xml
diff --git a/res/layout/log_window.xml b/main/src/main/res/layout/log_window.xml
index 56c3e349..56c3e349 100644
--- a/res/layout/log_window.xml
+++ b/main/src/main/res/layout/log_window.xml
diff --git a/res/layout/tlsremote.xml b/main/src/main/res/layout/tlsremote.xml
index a7bec953..a7bec953 100644
--- a/res/layout/tlsremote.xml
+++ b/main/src/main/res/layout/tlsremote.xml
diff --git a/res/layout/userpass.xml b/main/src/main/res/layout/userpass.xml
index f67f998e..f67f998e 100644
--- a/res/layout/userpass.xml
+++ b/main/src/main/res/layout/userpass.xml
diff --git a/res/layout/viewconfig.xml b/main/src/main/res/layout/viewconfig.xml
index 5ae34ef0..5ae34ef0 100644
--- a/res/layout/viewconfig.xml
+++ b/main/src/main/res/layout/viewconfig.xml
diff --git a/res/layout/vpn_list_item.xml b/main/src/main/res/layout/vpn_list_item.xml
index ae9350fa..ae9350fa 100644
--- a/res/layout/vpn_list_item.xml
+++ b/main/src/main/res/layout/vpn_list_item.xml
diff --git a/res/layout/vpn_profile_list.xml b/main/src/main/res/layout/vpn_profile_list.xml
index c1ce353f..b8caa7c7 100644
--- a/res/layout/vpn_profile_list.xml
+++ b/main/src/main/res/layout/vpn_profile_list.xml
@@ -34,7 +34,7 @@
         <TextView
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="To use this app you need a VPN provider/VPN gateway supporting OpenVPN. Check out http://community.openvpn.net/ for more information on OpenVPN and how to setup your own OpenVPN server."
+            android:text="@string/openvpn_is_no_free_vpn"
             android:autoLink="web"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
diff --git a/res/layout/vpnstatus.xml b/main/src/main/res/layout/vpnstatus.xml
index eb7c53ee..eb7c53ee 100644
--- a/res/layout/vpnstatus.xml
+++ b/main/src/main/res/layout/vpnstatus.xml
diff --git a/res/menu/configmenu.xml b/main/src/main/res/menu/configmenu.xml
index 41130970..41130970 100644
--- a/res/menu/configmenu.xml
+++ b/main/src/main/res/menu/configmenu.xml
diff --git a/res/menu/import_menu.xml b/main/src/main/res/menu/import_menu.xml
index 1bed5a6b..1bed5a6b 100644
--- a/res/menu/import_menu.xml
+++ b/main/src/main/res/menu/import_menu.xml
diff --git a/res/menu/logmenu.xml b/main/src/main/res/menu/logmenu.xml
index 04592a26..04592a26 100644
--- a/res/menu/logmenu.xml
+++ b/main/src/main/res/menu/logmenu.xml
diff --git a/res/menu/vpnpreferences_menu.xml b/main/src/main/res/menu/vpnpreferences_menu.xml
index 71744d3c..71744d3c 100644
--- a/res/menu/vpnpreferences_menu.xml
+++ b/main/src/main/res/menu/vpnpreferences_menu.xml
diff --git a/res/values-ca/arrays.xml b/main/src/main/res/values-ca/arrays.xml
index 8af4e790..8af4e790 100755
--- a/res/values-ca/arrays.xml
+++ b/main/src/main/res/values-ca/arrays.xml
diff --git a/res/values-ca/strings.xml b/main/src/main/res/values-ca/strings.xml
index 0145b0b1..0145b0b1 100755
--- a/res/values-ca/strings.xml
+++ b/main/src/main/res/values-ca/strings.xml
diff --git a/res/values-cs/arrays.xml b/main/src/main/res/values-cs/arrays.xml
index f89d5b4d..f89d5b4d 100755
--- a/res/values-cs/arrays.xml
+++ b/main/src/main/res/values-cs/arrays.xml
diff --git a/res/values-cs/strings.xml b/main/src/main/res/values-cs/strings.xml
index 42e784c3..42e784c3 100755
--- a/res/values-cs/strings.xml
+++ b/main/src/main/res/values-cs/strings.xml
diff --git a/res/values-de/arrays.xml b/main/src/main/res/values-de/arrays.xml
index 930ac58c..930ac58c 100755
--- a/res/values-de/arrays.xml
+++ b/main/src/main/res/values-de/arrays.xml
diff --git a/res/values-de/strings.xml b/main/src/main/res/values-de/strings.xml
index f9a9c2fc..f9a9c2fc 100755
--- a/res/values-de/strings.xml
+++ b/main/src/main/res/values-de/strings.xml
diff --git a/res/values-es/arrays.xml b/main/src/main/res/values-es/arrays.xml
index 4728f401..4728f401 100755
--- a/res/values-es/arrays.xml
+++ b/main/src/main/res/values-es/arrays.xml
diff --git a/res/values-es/strings.xml b/main/src/main/res/values-es/strings.xml
index 87bb1351..87bb1351 100755
--- a/res/values-es/strings.xml
+++ b/main/src/main/res/values-es/strings.xml
diff --git a/res/values-et/arrays.xml b/main/src/main/res/values-et/arrays.xml
index 2b4eab16..2b4eab16 100755
--- a/res/values-et/arrays.xml
+++ b/main/src/main/res/values-et/arrays.xml
diff --git a/res/values-et/strings.xml b/main/src/main/res/values-et/strings.xml
index d4ab4220..d4ab4220 100755
--- a/res/values-et/strings.xml
+++ b/main/src/main/res/values-et/strings.xml
diff --git a/res/values-fr/arrays.xml b/main/src/main/res/values-fr/arrays.xml
index 24bedc52..24bedc52 100755
--- a/res/values-fr/arrays.xml
+++ b/main/src/main/res/values-fr/arrays.xml
diff --git a/res/values-fr/strings.xml b/main/src/main/res/values-fr/strings.xml
index d7d46c2d..d7d46c2d 100755
--- a/res/values-fr/strings.xml
+++ b/main/src/main/res/values-fr/strings.xml
diff --git a/res/values-id/arrays.xml b/main/src/main/res/values-id/arrays.xml
index 908d6d17..908d6d17 100755
--- a/res/values-id/arrays.xml
+++ b/main/src/main/res/values-id/arrays.xml
diff --git a/res/values-id/strings.xml b/main/src/main/res/values-id/strings.xml
index 35b82002..35b82002 100755
--- a/res/values-id/strings.xml
+++ b/main/src/main/res/values-id/strings.xml
diff --git a/res/values-it/arrays.xml b/main/src/main/res/values-it/arrays.xml
index daa3bef3..daa3bef3 100755
--- a/res/values-it/arrays.xml
+++ b/main/src/main/res/values-it/arrays.xml
diff --git a/res/values-it/strings.xml b/main/src/main/res/values-it/strings.xml
index 392f5b48..392f5b48 100755
--- a/res/values-it/strings.xml
+++ b/main/src/main/res/values-it/strings.xml
diff --git a/res/values-ja/arrays.xml b/main/src/main/res/values-ja/arrays.xml
index 57442375..57442375 100755
--- a/res/values-ja/arrays.xml
+++ b/main/src/main/res/values-ja/arrays.xml
diff --git a/res/values-ja/strings.xml b/main/src/main/res/values-ja/strings.xml
index f59e67b1..f59e67b1 100755
--- a/res/values-ja/strings.xml
+++ b/main/src/main/res/values-ja/strings.xml
diff --git a/res/values-ko/arrays.xml b/main/src/main/res/values-ko/arrays.xml
index 00ed3d64..00ed3d64 100755
--- a/res/values-ko/arrays.xml
+++ b/main/src/main/res/values-ko/arrays.xml
diff --git a/res/values-ko/strings.xml b/main/src/main/res/values-ko/strings.xml
index 7f8036ff..7f8036ff 100755
--- a/res/values-ko/strings.xml
+++ b/main/src/main/res/values-ko/strings.xml
diff --git a/res/values-nl/arrays.xml b/main/src/main/res/values-nl/arrays.xml
index 06074301..06074301 100755
--- a/res/values-nl/arrays.xml
+++ b/main/src/main/res/values-nl/arrays.xml
diff --git a/res/values-nl/strings.xml b/main/src/main/res/values-nl/strings.xml
index 3d3c4279..3d3c4279 100755
--- a/res/values-nl/strings.xml
+++ b/main/src/main/res/values-nl/strings.xml
diff --git a/res/values-no/arrays.xml b/main/src/main/res/values-no/arrays.xml
index 317abbc8..317abbc8 100755
--- a/res/values-no/arrays.xml
+++ b/main/src/main/res/values-no/arrays.xml
diff --git a/res/values-no/strings.xml b/main/src/main/res/values-no/strings.xml
index 66e78d28..66e78d28 100755
--- a/res/values-no/strings.xml
+++ b/main/src/main/res/values-no/strings.xml
diff --git a/res/values-pl/arrays.xml b/main/src/main/res/values-pl/arrays.xml
index b5044975..b5044975 100755
--- a/res/values-pl/arrays.xml
+++ b/main/src/main/res/values-pl/arrays.xml
diff --git a/res/values-pl/strings.xml b/main/src/main/res/values-pl/strings.xml
index b0af3ddf..b0af3ddf 100755
--- a/res/values-pl/strings.xml
+++ b/main/src/main/res/values-pl/strings.xml
diff --git a/res/values-ro/arrays.xml b/main/src/main/res/values-ro/arrays.xml
index 0a7215c9..0a7215c9 100755
--- a/res/values-ro/arrays.xml
+++ b/main/src/main/res/values-ro/arrays.xml
diff --git a/res/values-ro/strings.xml b/main/src/main/res/values-ro/strings.xml
index ffc49216..ffc49216 100755
--- a/res/values-ro/strings.xml
+++ b/main/src/main/res/values-ro/strings.xml
diff --git a/res/values-ru/arrays.xml b/main/src/main/res/values-ru/arrays.xml
index ea6527ce..ea6527ce 100755
--- a/res/values-ru/arrays.xml
+++ b/main/src/main/res/values-ru/arrays.xml
diff --git a/res/values-ru/strings.xml b/main/src/main/res/values-ru/strings.xml
index dd2d2b2c..dd2d2b2c 100755
--- a/res/values-ru/strings.xml
+++ b/main/src/main/res/values-ru/strings.xml
diff --git a/res/values-sv/arrays.xml b/main/src/main/res/values-sv/arrays.xml
index 8a451629..8a451629 100755
--- a/res/values-sv/arrays.xml
+++ b/main/src/main/res/values-sv/arrays.xml
diff --git a/res/values-sv/strings.xml b/main/src/main/res/values-sv/strings.xml
index 5c5e4abf..5c5e4abf 100755
--- a/res/values-sv/strings.xml
+++ b/main/src/main/res/values-sv/strings.xml
diff --git a/res/values-sw600dp/dimens.xml b/main/src/main/res/values-sw600dp/dimens.xml
index b83bb856..b83bb856 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/main/src/main/res/values-sw600dp/dimens.xml
diff --git a/res/values-sw600dp/styles.xml b/main/src/main/res/values-sw600dp/styles.xml
index de0bb55d..de0bb55d 100644
--- a/res/values-sw600dp/styles.xml
+++ b/main/src/main/res/values-sw600dp/styles.xml
diff --git a/res/values-tr/arrays.xml b/main/src/main/res/values-tr/arrays.xml
index bf5c3e66..bf5c3e66 100755
--- a/res/values-tr/arrays.xml
+++ b/main/src/main/res/values-tr/arrays.xml
diff --git a/res/values-tr/strings.xml b/main/src/main/res/values-tr/strings.xml
index a878dd04..a878dd04 100755
--- a/res/values-tr/strings.xml
+++ b/main/src/main/res/values-tr/strings.xml
diff --git a/res/values-uk/arrays.xml b/main/src/main/res/values-uk/arrays.xml
index 1727e2b2..1727e2b2 100755
--- a/res/values-uk/arrays.xml
+++ b/main/src/main/res/values-uk/arrays.xml
diff --git a/res/values-uk/strings.xml b/main/src/main/res/values-uk/strings.xml
index eab6a5dc..eab6a5dc 100755
--- a/res/values-uk/strings.xml
+++ b/main/src/main/res/values-uk/strings.xml
diff --git a/res/values-zh-rCN/arrays.xml b/main/src/main/res/values-zh-rCN/arrays.xml
index 04b40210..04b40210 100755
--- a/res/values-zh-rCN/arrays.xml
+++ b/main/src/main/res/values-zh-rCN/arrays.xml
diff --git a/res/values-zh-rCN/strings.xml b/main/src/main/res/values-zh-rCN/strings.xml
index a2fb95ce..a2fb95ce 100755
--- a/res/values-zh-rCN/strings.xml
+++ b/main/src/main/res/values-zh-rCN/strings.xml
diff --git a/res/values-zh-rTW/arrays.xml b/main/src/main/res/values-zh-rTW/arrays.xml
index 5cf6a8bd..5cf6a8bd 100755
--- a/res/values-zh-rTW/arrays.xml
+++ b/main/src/main/res/values-zh-rTW/arrays.xml
diff --git a/res/values-zh-rTW/strings.xml b/main/src/main/res/values-zh-rTW/strings.xml
index 75f72ecb..75f72ecb 100755
--- a/res/values-zh-rTW/strings.xml
+++ b/main/src/main/res/values-zh-rTW/strings.xml
diff --git a/res/values/arrays.xml b/main/src/main/res/values/arrays.xml
index 5f829971..5f829971 100644
--- a/res/values/arrays.xml
+++ b/main/src/main/res/values/arrays.xml
diff --git a/res/values/attrs.xml b/main/src/main/res/values/attrs.xml
index 527664f8..527664f8 100644
--- a/res/values/attrs.xml
+++ b/main/src/main/res/values/attrs.xml
diff --git a/res/values/dimens.xml b/main/src/main/res/values/dimens.xml
index 4f325078..4f325078 100644
--- a/res/values/dimens.xml
+++ b/main/src/main/res/values/dimens.xml
diff --git a/res/values/strings.xml b/main/src/main/res/values/strings.xml
index deeb096c..32839feb 100755
--- a/res/values/strings.xml
+++ b/main/src/main/res/values/strings.xml
@@ -316,4 +316,5 @@
     <string name="userpw_file">Username/Password file</string>
     <string name="imported_from_file">[Imported from: %s]</string>
     <string name="files_missing_hint">Some files could not be found. Please select the files to import the profile:</string>
+    <string name="openvpn_is_no_free_vpn">To use this app you need a VPN provider/VPN gateway supporting OpenVPN (often provided by your employer .Check out http://community.openvpn.net/ for more information on OpenVPN and how to setup your own OpenVPN server.</string>
 </resources>
diff --git a/res/values/styles.xml b/main/src/main/res/values/styles.xml
index 95e709b3..95e709b3 100644
--- a/res/values/styles.xml
+++ b/main/src/main/res/values/styles.xml
diff --git a/res/values/untranslatable.xml b/main/src/main/res/values/untranslatable.xml
index 7458bc33..7458bc33 100644
--- a/res/values/untranslatable.xml
+++ b/main/src/main/res/values/untranslatable.xml
diff --git a/res/xml/general_settings.xml b/main/src/main/res/xml/general_settings.xml
index d43ab6a3..d43ab6a3 100644
--- a/res/xml/general_settings.xml
+++ b/main/src/main/res/xml/general_settings.xml
diff --git a/res/xml/vpn_authentification.xml b/main/src/main/res/xml/vpn_authentification.xml
index 15a260c2..15a260c2 100644
--- a/res/xml/vpn_authentification.xml
+++ b/main/src/main/res/xml/vpn_authentification.xml
diff --git a/res/xml/vpn_headers.xml b/main/src/main/res/xml/vpn_headers.xml
index 7f2a97d9..7f2a97d9 100644
--- a/res/xml/vpn_headers.xml
+++ b/main/src/main/res/xml/vpn_headers.xml
diff --git a/res/xml/vpn_ipsettings.xml b/main/src/main/res/xml/vpn_ipsettings.xml
index d559c89b..d559c89b 100644
--- a/res/xml/vpn_ipsettings.xml
+++ b/main/src/main/res/xml/vpn_ipsettings.xml
diff --git a/res/xml/vpn_obscure.xml b/main/src/main/res/xml/vpn_obscure.xml
index 6172dacb..6172dacb 100644
--- a/res/xml/vpn_obscure.xml
+++ b/main/src/main/res/xml/vpn_obscure.xml
diff --git a/res/xml/vpn_routing.xml b/main/src/main/res/xml/vpn_routing.xml
index 0f006431..0f006431 100644
--- a/res/xml/vpn_routing.xml
+++ b/main/src/main/res/xml/vpn_routing.xml
diff --git a/openssl/apps/#Android.mk# b/openssl/apps/#Android.mk#
deleted file mode 100644
index 1ad078de..00000000
--- a/openssl/apps/#Android.mk#
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2006 The Android Open Source Project
-
-LOCAL_PATH:= $(call my-dir)
-
-local_src_files:= \
-	app_rand.c \
-	apps.c \
-	asn1pars.c \
-	ca.c \
-	ciphers.c \
-	crl.c \
-	crl2p7.c \
-	dgst.c \
-	dh.c \
-	dhparam.c \
-	dsa.c \
-	dsaparam.c \
-	ecparam.c \
-	ec.c \
-	enc.c \
-	engine.c \
-	errstr.c \
-	gendh.c \
-	gendsa.c \
-	genpkey.c \
-	genrsa.c \
-	nseq.c \
-	ocsp.c \
-	openssl.c \
-	passwd.c \
-	pkcs12.c \
-	pkcs7.c \
-	pkcs8.c \
-	pkey.c \
-	pkeyparam.c \
-	pkeyutl.c \
-	prime.c \
-	rand.c \
-	req.c \
-	rsa.c \
-	rsautl.c \
-	s_cb.c \
-	s_client.c \
-	s_server.c \
-	s_socket.c \
-	s_time.c \
-	sess_id.c \
-	smime.c \
-	speed.c \
-	spkac.c \
-	verify.c \
-	version.c \
-	x509.c
-
-local_shared_libraries := \
-	libssl \
-	libcrypto
-
-local_c_includes := \
-	openssl \
-	openssl/include
-
-local_cflags := -DMONOLITH
-
-# These flags omit whole features from the commandline "openssl".
-# However, portions of these features are actually turned on.
-local_cflags += -DOPENSSL_NO_DTLS1
-
-include $(CLEAR_VARS)
-LOCAL_MODULE:= openssl
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(local_src_files)
-LOCAL_SHARED_LIBRARIES := $(local_shared_libraries)
-LOCAL_C_INCLUDES := $(local_c_includes)
-LOCAL_CFLAGS := $(local_cflags)
-include $(LOCAL_PATH)/../android-config.mk
-include $(BUILD_EXECUTABLE)
-
diff --git a/project.properties b/project.properties
deleted file mode 100644
index a5578ba0..00000000
--- a/project.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-19
diff --git a/remoteExample/src/main/AndroidManifest.xml b/remoteExample/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..4e922e56
--- /dev/null
+++ b/remoteExample/src/main/AndroidManifest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="de.blinkt.openvpn.remote" >
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher2"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+        <activity
+            android:name="de.blinkt.openvpn.remote.MainActivity"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
diff --git a/remoteExample/src/main/ic_launcher2-web.png b/remoteExample/src/main/ic_launcher2-web.png
new file mode 100644
index 00000000..5c63bc5e
--- /dev/null
+++ b/remoteExample/src/main/ic_launcher2-web.png
diff --git a/remoteExample/src/main/java/de/blinkt/openvpn/remote/MainActivity.java b/remoteExample/src/main/java/de/blinkt/openvpn/remote/MainActivity.java
new file mode 100644
index 00000000..900383a2
--- /dev/null
+++ b/remoteExample/src/main/java/de/blinkt/openvpn/remote/MainActivity.java
@@ -0,0 +1,51 @@
+package de.blinkt.openvpn.remote;
+
+import android.app.Activity;
+import android.app.ActionBar;
+import android.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.os.Build;
+
+public class MainActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        if (savedInstanceState == null) {
+            getFragmentManager().beginTransaction()
+                    .add(R.id.container, new MainFragment())
+                    .commit();
+        }
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        
+        // Inflate the menu; this adds items to the action bar if it is present.
+        getMenuInflater().inflate(R.menu.main, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle action bar item clicks here. The action bar will
+        // automatically handle clicks on the Home/Up button, so long
+        // as you specify a parent activity in AndroidManifest.xml.
+        int id = item.getItemId();
+        if (id == R.id.action_settings) {
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+
+
+}
diff --git a/remoteExample/src/main/java/de/blinkt/openvpn/remote/MainFragment.java b/remoteExample/src/main/java/de/blinkt/openvpn/remote/MainFragment.java
new file mode 100644
index 00000000..e14d7d3c
--- /dev/null
+++ b/remoteExample/src/main/java/de/blinkt/openvpn/remote/MainFragment.java
@@ -0,0 +1,17 @@
+package de.blinkt.openvpn.remote;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.os.Bundle;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+public class MainFragment extends Fragment {
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_main,container,false);
+
+    }
+}
\ No newline at end of file
diff --git a/remoteExample/src/main/res/drawable-hdpi/ic_launcher2.png b/remoteExample/src/main/res/drawable-hdpi/ic_launcher2.png
new file mode 100644
index 00000000..55621cc1
--- /dev/null
+++ b/remoteExample/src/main/res/drawable-hdpi/ic_launcher2.png
diff --git a/remoteExample/src/main/res/drawable-mdpi/ic_launcher2.png b/remoteExample/src/main/res/drawable-mdpi/ic_launcher2.png
new file mode 100644
index 00000000..11ec2068
--- /dev/null
+++ b/remoteExample/src/main/res/drawable-mdpi/ic_launcher2.png
diff --git a/remoteExample/src/main/res/drawable-xhdpi/ic_launcher2.png b/remoteExample/src/main/res/drawable-xhdpi/ic_launcher2.png
new file mode 100644
index 00000000..7c02b784
--- /dev/null
+++ b/remoteExample/src/main/res/drawable-xhdpi/ic_launcher2.png
diff --git a/remoteExample/src/main/res/drawable-xxhdpi/ic_launcher2.png b/remoteExample/src/main/res/drawable-xxhdpi/ic_launcher2.png
new file mode 100644
index 00000000..915d9144
--- /dev/null
+++ b/remoteExample/src/main/res/drawable-xxhdpi/ic_launcher2.png
diff --git a/remoteExample/src/main/res/layout/activity_main.xml b/remoteExample/src/main/res/layout/activity_main.xml
new file mode 100644
index 00000000..42dd4dfb
--- /dev/null
+++ b/remoteExample/src/main/res/layout/activity_main.xml
@@ -0,0 +1,7 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="de.blinkt.openvpn.remote.MainActivity"
+    tools:ignore="MergeRootFrame" />
diff --git a/remoteExample/src/main/res/layout/fragment_main.xml b/remoteExample/src/main/res/layout/fragment_main.xml
new file mode 100644
index 00000000..fef7793f
--- /dev/null
+++ b/remoteExample/src/main/res/layout/fragment_main.xml
@@ -0,0 +1,16 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    tools:context="de.blinkt.openvpn.remote.MainActivity$PlaceholderFragment">
+
+    <TextView
+        android:text="@string/hello_world"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</RelativeLayout>
diff --git a/remoteExample/src/main/res/menu/main.xml b/remoteExample/src/main/res/menu/main.xml
new file mode 100644
index 00000000..f732c1b4
--- /dev/null
+++ b/remoteExample/src/main/res/menu/main.xml
@@ -0,0 +1,9 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="de.blinkt.openvpn.remote.MainActivity" >
+    
+    <item android:id="@+id/action_settings"
+        android:title="@string/action_settings"
+        android:orderInCategory="100"
+        android:showAsAction="never" />
+</menu>
diff --git a/remoteExample/src/main/res/values-w820dp/dimens.xml b/remoteExample/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 00000000..63fc8164
--- /dev/null
+++ b/remoteExample/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/remoteExample/src/main/res/values/dimens.xml b/remoteExample/src/main/res/values/dimens.xml
new file mode 100644
index 00000000..a0171a70
--- /dev/null
+++ b/remoteExample/src/main/res/values/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+
+    </resources>
diff --git a/remoteExample/src/main/res/values/strings.xml b/remoteExample/src/main/res/values/strings.xml
new file mode 100644
index 00000000..c1da58ca
--- /dev/null
+++ b/remoteExample/src/main/res/values/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">My Module</string>
+    <string name="hello_world">Hello world!</string>
+    <string name="action_settings">Settings</string>
+
+</resources>
diff --git a/remoteExample/src/main/res/values/styles.xml b/remoteExample/src/main/res/values/styles.xml
new file mode 100644
index 00000000..ff6c9d2c
--- /dev/null
+++ b/remoteExample/src/main/res/values/styles.xml
@@ -0,0 +1,8 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+    </style>
+
+</resources>
diff --git a/settings.gradle b/settings.gradle
index f4d094c9..98ca4d1f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,3 @@
-//include ':vpndialogxposed'
+include ':main'
+include ':vpndialogxposed'
+include ':remoteExample'