Merge commit '82fea30fcce1d169de7ec42be84d079e0899519c' into feature/update-dependenies

OpenVPN Adapter/Vendors/openvpn/deps/asio/build-asio

@@ -5,11 +5,29 @@ if [ -z "$O3" ]; then
     echo O3 var must point to ovpn3 tree
     exit 1
 fi
-
-[ -z "$DL" ] && DL=~/Downloads
+if [ -z "$DEP_DIR" ]; then
+    echo DEP_DIR var must point to dependency build folder
+    exit 1
+fi
+if [ -z "$DL" ]; then
+    echo DL var must point to the download folder
+    exit 1
+fi
 
 . $O3/core/deps/lib-versions
 
+# source helper functions
+. $O3/core/deps/functions.sh
+
+PACKAGE=${ASIO_VERSION}
+FNAME=${ASIO_VERSION}.tar.gz
+PV=${ASIO_VERSION#*-}
+URL=https://github.com/chriskohlhoff/asio/archive/${PV}.tar.gz
+CSUM=${ASIO_CSUM}
+
+download
+
+cd $DEP_DIR
 rm -rf asio*
 tar xf $DL/$ASIO_VERSION.tar.gz
 cp -a $ASIO_VERSION asio

OpenVPN Adapter/Vendors/openvpn/deps/functions.sh

@@ -0,0 +1,30 @@
+function check_download()
+{
+  if [ -f $DL/$FNAME ]; then
+    CHECK=$(sha256sum $DL/$FNAME |awk '{printf $1};')
+    if [ "$CHECK" == "$CSUM" ]; then
+      return 0
+    else
+      echo "Checksum mismatch for $FNAME. Was $CHECK, expected $CSUM"
+    fi
+  else
+    echo "$FNAME not found."
+  fi
+
+  return -1
+}
+
+function download()
+{
+  check_download && return 0
+
+  rm -f $DL/$FNAME
+  if [ -n "$URL" ]; then
+    wget $URL -O $DL/$FNAME
+  else
+    echo URL must be specified
+    exit 1
+  fi
+
+  check_download || return -1
+}

OpenVPN Adapter/Vendors/openvpn/deps/lib-versions

@@ -1,4 +1,10 @@
-export ASIO_VERSION=asio-20170301
-export LZ4_VERSION=lz4-1.7.5
-export MBEDTLS_VERSION=mbedtls-2.4.0
+export ASIO_VERSION=asio-862aed305dcf91387535519c9549c17630339a12
+export ASIO_CSUM=65eb4e0997795e4c7c76325387311c3b9d211754615c275bfe5ca6e186dc322b
+
+export LZ4_VERSION=lz4-1.8.0
+export LZ4_CSUM=2ca482ea7a9bb103603108b5a7510b7592b90158c151ff50a28f1ca8389fccf6
+
+export MBEDTLS_VERSION=mbedtls-2.6.0
+export MBEDTLS_CSUM=99bc9d4212d3d885eeb96273bcde8ecc649a481404b8d7ea7bb26397c9909687
+
 export OPENSSL_VERSION=openssl-1.0.2h

OpenVPN Adapter/Vendors/openvpn/deps/lz4/build-lz4

@@ -5,17 +5,33 @@ if [ -z "$O3" ]; then
     echo O3 var must point to ovpn3 tree
     exit 1
 fi
+if [ -z "$DEP_DIR" ]; then
+    echo DEP_DIR var must point to dependency build folder
+    exit 1
+fi
+if [ -z "$DL" ]; then
+    echo DL var must point to the download folder
+    exit 1
+fi
+
 if [ -z "$TARGET" ]; then
     echo TARGET var must be defined
     exit 1
 fi
 
-[ -z "$DL" ] && DL=~/Downloads
-
 # source vars
 . $O3/core/vars/vars-${TARGET}
 . $O3/core/deps/lib-versions
 
+# source helper functions
+. $O3/core/deps/functions.sh
+
+FNAME=${LZ4_VERSION}.tar.gz
+PN=${LZ4_VERSION#*-}
+URL=https://github.com/lz4/lz4/archive/v${PN}.tar.gz
+CSUM=${LZ4_CSUM}
+
+download
 
 CC=cc
 LD=ld

OpenVPN Adapter/Vendors/openvpn/deps/mbedtls/build-mbedtls

@@ -5,6 +5,15 @@ if [ -z "$O3" ]; then
     echo O3 var must point to ovpn3 tree
     exit 1
 fi
+if [ -z "$DEP_DIR" ]; then
+    echo DEP_DIR var must point to dependency build folder
+    exit 1
+fi
+if [ -z "$DL" ]; then
+    echo DL var must point to the download folder
+    exit 1
+fi
+
 if [ -z "$TARGET" ]; then
     echo TARGET var must be defined
     exit 1
@@ -14,6 +23,16 @@ fi
 . $O3/core/vars/vars-${TARGET}
 . $O3/core/deps/lib-versions
 
+# source helper functions
+. $O3/core/deps/functions.sh
+
+FNAME=${MBEDTLS_VERSION}-apache.tgz
+PN=${MBEDTLS_VERSION#*-}
+URL=https://tls.mbed.org/download/$MBEDTLS_VERSION-apache.tgz
+CSUM=${MBEDTLS_CSUM}
+
+download
+
 # put build targets here
 DIST=$(pwd)/mbedtls/mbedtls-$PLATFORM
 rm -rf $DIST
@@ -31,6 +50,11 @@ else
 
     # enable MD4 (needed for NTLM auth)
     perl -pi -e 's/^\/\/// if /#define MBEDTLS_MD4_C/' include/mbedtls/config.h
+
+    # apply pre-generated patches
+    for file in $O3/core/deps/mbedtls/patches/*.patch; do
+        patch -p1 <$file
+    done
 fi
 
 # compiler vars
@@ -48,7 +72,8 @@ SRC=$(pwd)
 cd library
 rm -f *.o
 for c in *.c ; do
-    CMD="$CC -I../include $PLATFORM_FLAGS $OTHER_COMPILER_FLAGS $LIB_OPT_LEVEL $LIB_FPIC -c $c"
+    CMD="$CC -I../include -DMBEDTLS_RELAXED_X509_DATE \
+         $PLATFORM_FLAGS $OTHER_COMPILER_FLAGS $LIB_OPT_LEVEL $LIB_FPIC -c $c"
     echo $CMD
     $CMD
 done

OpenVPN Adapter/Vendors/openvpn/deps/mbedtls/patches/0001-mbedtls-relaxed-x509-date-format.patch

@@ -0,0 +1,41 @@
+diff -urw mbedtls-2.6.0.orig/library/x509.c mbedtls-2.6.0/library/x509.c
+--- mbedtls-2.6.0.orig/library/x509.c	2017-11-03 11:46:21.403848065 +0800
++++ mbedtls-2.6.0/library/x509.c	2017-11-03 11:58:46.259817520 +0800
+@@ -559,13 +559,20 @@
+     /*
+      * Parse seconds if present
+      */
+-    if ( len >= 2 )
++    if ( len >= 2 && **p >= '0' && **p <= '9' )
+     {
+         CHECK( x509_parse_int( p, 2, &tm->sec ) );
+         len -= 2;
+     }
+     else
++    {
++#if defined(MBEDTLS_RELAXED_X509_DATE)
++	/* if relaxed mode, allow seconds to be absent */
++	tm->sec = 0;
++#else
+         return ( MBEDTLS_ERR_X509_INVALID_DATE );
++#endif
++    }
+ 
+     /*
+      * Parse trailing 'Z' if present
+@@ -575,6 +582,15 @@
+         (*p)++;
+         len--;
+     }
++#if defined(MBEDTLS_RELAXED_X509_DATE)
++    else if ( len == 5 && **p == '+' )
++    {
++	int tz; /* throwaway timezone */
++	(*p)++;
++	CHECK( x509_parse_int( p, 4, &tz ) );
++	return 0;
++    }
++#endif
+ 
+     /*
+      * We should have parsed all characters at this point