Merge changes applied to coming Core release

deps/lib-versions

@@ -19,6 +19,6 @@ export CITYHASH_CSUM=f70368facd15735dffc77fe2b27ab505bfdd05be5e9166d94149a8744c2
 export LZO_VERSION=lzo-2.10
 export LZO_CSUM=c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072
 
-export OPENSSL_VERSION=openssl-1.0.2s
-export OPENSSL_CSUM=cabd5c9492825ce5bd23f3c3aeed6a97f8142f606d893df216411f07d1abab96
+export OPENSSL_VERSION=openssl-1.1.1d
+export OPENSSL_CSUM=1e3a91bc1f9dfce01af26026f856e064eab4c8ee0a8f457b5ae30b40b8b711f2
 

deps/openssl/build-openssl

@@ -30,6 +30,20 @@ fi
 . $O3/core/vars/vars-$TARGET
 . $O3/core/deps/lib-versions
 
+
+# source vars
+. $O3/core/vars/vars-${TARGET}
+. $O3/core/deps/lib-versions
+
+# source helper functions
+. $O3/core/deps/functions.sh
+
+FNAME=openssl-${OPNESSL_VERSION}.tar.gz
+URL=https://www.openssl.org/source/${OPENSSL_VERSION}.tar.gz
+CSUM=${OPENSSL_CSUM}
+
+download
+
 AR=ar
 RANLIB=ranlib
 [ "$AR_CMD" ] && AR=$AR_CMD
@@ -44,7 +58,7 @@ DIST=$(pwd)/openssl/openssl-$PLATFORM
 [ "$ARCH" ] && DIST=$DIST/$ARCH
 rm -rf $OPENSSL $DIST
 mkdir -p $DIST
-tar xfz $DL/$OPENSSL.tar.gz
+tar xfz $DL/$FNAME
 pushd $OPENSSL
 CMD="./Configure $OPENSSL_TARGET $LINK_MODE threads no-idea no-mdc2 no-rc5 --prefix=$DIST"
 echo $CMD

openvpn/mbedtls/ssl/sslctx.hpp

@@ -567,7 +567,7 @@ namespace openvpn {
 	}
       }
 
-#ifdef HAVE_JSON
+#ifdef OPENVPN_JSON_INTERNAL
       virtual SSLConfigAPI::Ptr json_override(const Json::Value& root, const bool load_cert_key) const
       {
 	throw MbedTLSException("json_override not implemented");

openvpn/ssl/sslapi.hpp

@@ -176,7 +176,7 @@ namespace openvpn {
     virtual void set_rng(const RandomAPI::Ptr& rng_arg) = 0;
     virtual void load(const OptionList& opt, const unsigned int lflags) = 0;
 
-#ifdef HAVE_JSON
+#ifdef OPENVPN_JSON_INTERNAL
     virtual SSLConfigAPI::Ptr json_override(const Json::Value& root, const bool load_cert_key) const = 0;
 #endif
 

scripts/mac/build-all

@@ -6,11 +6,28 @@ if [ -z "$O3" ]; then
 fi
 cd $DEP_DIR
 rm -rf asio* boost* lz4* lzo* minicrypto openssl* polarssl* mbedtls* snappy*
+
 echo "******* ASIO"
 $O3/core/deps/asio/build-asio
-echo "******* MBEDTLS"
-# consider OSX_SERVER=0
-$O3/core/scripts/mac/build-mbedtls
+if [ $MTLS = 0 ] ; then
+    echo "******* MBEDTLS (skipped)"
+else
+    echo "******* MBEDTLS"
+
+    # consider OSX_SERVER=0
+    $O3/core/scripts/mac/build-mbedtls
+fi
+# 
+
+$O3/core/deps/asio/build-asio
+if [ $OSSL = 1 ] ; then
+    echo "******* OPENSSL"
+    $O3/core/scripts/mac/build-openssl
+else
+    echo "******* OPENSSL  (skipped)"
+fi
+
+
 echo "******* LZ4"
 $O3/core/scripts/mac/build-lz4
 echo "******* CITYHASH"

scripts/mac/build-openssl

@@ -14,19 +14,26 @@ cd $DEP_DIR
 rm -rf openssl
 mkdir openssl
 
-for target in osx ; do
-    echo '***************' OpenSSL-32 $target
-    TARGET=$target OPENSSL_TARGET=darwin-i386-cc ARCH=i386 $O3/core/deps/openssl/build-openssl
+for target in ios osx; do
     echo '***************' OpenSSL-64 $target
-    TARGET=$target OPENSSL_TARGET=darwin64-x86_64-cc ARCH=x86_64 $O3/core/deps/openssl/build-openssl
-    cd openssl/openssl-$target
-    cp -a x86_64/include .
-    rm include/openssl/opensslconf.h # contains 32/64-bit specific references
-    for l in libcrypto.a libssl.a ; do
-	lipo -create */lib/$l -output $l
-    done
-    mkdir lib
-    mv *.a lib
-    cd ../..
+
+    if [ "$target" = "osx" ]; then
+        TARGET=$target OPENSSL_TARGET=darwin64-x86_64-cc $O3/core/deps/openssl/build-openssl
+    else
+        ARCH=arm64 CROSS_TOP=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer \
+                 CROSS_SDK=iPhoneOS.sdk TARGET=$target OPENSSL_TARGET="ios64-cross no-dso no-engine" \
+                 $O3/core/deps/openssl/build-openssl
+
+        ARCH=armv7 CROSS_TOP=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer \
+                 CROSS_SDK=iPhoneOS.sdk TARGET=$target OPENSSL_TARGET="ios-cross no-dso no-engine" \
+                 $O3/core/deps/openssl/build-openssl
+    fi
 done
+
+cd openssl/openssl-ios
+mkdir -p fat/lib
+for l in libcrypto.a libssl.a ; do
+    lipo -create arm64/lib/$l armv7/lib/$l -output fat/lib/$l
+done
+
 exit 0

vars/vars-ios

@@ -3,7 +3,7 @@ export APPLE_FAMILY=1
 export GPP_CMD=clang++
 export GCC_CMD=clang
 export IOS_SDK="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk"
-export PLATFORM_FLAGS="-arch armv7 -arch armv7s -arch arm64 -mthumb -miphoneos-version-min=5.1.1 -isysroot $IOS_SDK"
+export PLATFORM_FLAGS="-arch armv7 -arch armv7s -arch arm64 -mthumb -miphoneos-version-min=9.0 -isysroot $IOS_SDK"
 export OTHER_COMPILER_FLAGS="-fvisibility=hidden -fvisibility-inlines-hidden"
 export CXX_COMPILER_FLAGS="-std=c++11 -stdlib=libc++"
 export LIB_OPT_LEVEL="-O3"

vars/vars-ios-dbg

@@ -4,7 +4,7 @@ export DEBUG_BUILD=1
 export GPP_CMD=clang++
 export GCC_CMD=clang
 export IOS_SDK="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk"
-export PLATFORM_FLAGS="-arch armv7 -arch armv7s -arch arm64 -mthumb -miphoneos-version-min=5.1.1 -isysroot $IOS_SDK"
+export PLATFORM_FLAGS="-arch armv7 -arch armv7s -arch arm64 -mthumb -miphoneos-version-min=9.0 -isysroot $IOS_SDK"
 export OTHER_COMPILER_FLAGS="-g"
 export CXX_COMPILER_FLAGS="-std=c++11 -stdlib=libc++"
 export LIB_OPT_LEVEL="-O0"