Squashed 'OpenVPN Adapter/Vendors/openvpn/' changes from 098fd412a..e6d68831a

e6d68831a deps: update mbedTLS to 2.7.0
59de63fa6 cli.cpp: added OPENVPN_REMOTE_OVERRIDE
caf9cf6c1 RedirectPipe: added additional flags for flexibility
68595de4d ClientAPI::RemoteOverride: added error status
37d848ca2 Log lines from C++ exceptions should contain the text "exception"
f05802cf9 Increase server validation of password size to 16KB to support bundling SAML messages.
52e4d4a5f Increase client validation of password/response size to 16KB to support bundling SAML messages.
a0416ed92 [OVPN3-209] win: add dependencies checksum verification
f6eadbc4d [OVPN3-206] Refactor Windows build system
7b30c2f12 [OVPN3-220] proto.hpp: send initial options set on rekeying
33dd2f29e mbedtls: backport fixes for CVE-2018-0487
0912a9b62 [OVPN3-213] build system: mbedtls timing tests
98fa55576 deps: update asio to 1.12.0
620531101 [OVPN3-215] asio: apply external patches
f4a73bde5 [OVPN3-215] asio: rebase external patches on top of our current commit ID
a61cac928 mbedtls: Patches from 2.7 to fix timing test failures
c892f41fb win: tune dependencies build
8a394a37d [OVPN3-213] build system: mbedtls timing tests
0a3dd67da [OVPN3-190] tun linux: add to/from_json methods
44c6cdfdc [OVPN3-206] readme: update Windows build instructions
0edec4a09 [OVPN3-206] win: update directories in VS projects
3d6fd62cb mac build: improve unittest stability
758ae98c6 [OVPN3-209] win: add dependencies checksum verification
a7642ee82 [OVPN3-205] win: apply mbedTLS patches
ac94b6eb7 [OVPN3-206] Refactor Windows build system
c5bc3859e mbedTLS: don't set endpoint twice in conf object
3d5dd9ee3 [OVPN3-199] mac build: do not overwrite DEP_DIR
b713762ba mbedtls: Patches from 2.7 to fix timing test failures
37ab79fa6 tun linux: apply changes from 362acf0
6a7aee2c9 [OVPN3-190] tun: implement persistence
1d2ebb07f [OVPN3-190] tun: move tun creation to separate class
53e33d634 [OVPN3-190] tun: move content of tun to tuncli
85d3377c2 [OVPN3-190] tun: move tun setup methods to separate file
735b985eb i/o layer:  wrap raw pointers embedded in closures
322ae24b5 OptionList: support variadic template parameter pack in constructors
8a012b454 lz4: added namespace and improved error handling
34998e94a zlib: removed verbose parameter
846ed217d OpenSSL: set SSL_MODE_RELEASE_BUFFERS to conserve memory by releasing unneeded buffers
32e3ea117 OptionList: added show_unused_options() method
fe38233a8 Buffer: added typedefs for thread-safe refcounts
b34b6271e compression: added compress_lz4() and decompress_lz4()
755e1a181 linux/core.hpp: added exclude_from_core() function
a7f6fe64f ManClientInstance::Send: added userprop_local_update() virtual method
94526ac19 BufferAllocated: fixed regression in buffer copy
33c16812e [OVPN3-144] mbedTLS: fix support for 4096bit encrypted keys
f249ab4bd [OVPN3-144] build-mbedtls: run make check before compiling
5040aef4c [OVPN3-144] build-mbedtls: apply patches using git-apply instead of patch
8a5e838ab [OVPN3-144] mbedTLS: fix incompatibility with PKI created by OpenSSL 1.1
e7badefd7 proto.hpp/tls-crypt: fix access to ACK IDs during packet validation
73fa974db proto.hpp: print buffer exception in case of packet access error
79ad5eded Estblishing a stable branch
1c5f20ab0 Hide the @ sign in logs if username is empty
01ee1f5a4 Added ClientAPI::Config::retryOnAuthFailed parameter
05880b136 Added ProfileParseLimits::MAX_SERVER_LIST_SIZE and raise limit to 4096
eedee4fa6 cli.cpp: allow -s server override to reference a friendly name
6e350e9f9 Linux tun setup: use LinuxGW46 to obtain gateway info
3e044c6c7 top-level .gitignore was missing a trailing newline
a27355ac7 Use C++11 push_back(std::move(...))) for pushing objects onto vectors
8c3af2704 HostPort::split_host_port: support unix socket filename as an alternative kind of host
14b588c86 asio: added asio_resolver_results_to_string()
fd6e8e9bf AsioPolySock: minor changes to remote_endpoint_str()
06f5e4d71 AsioBoundSocket::Socket: added to_string() method
8fd968532 RemoteList: minor cleanup in set_endpoint_range()
f9fc2f54e BufferAllocated: improve movability
8cb8d52cd string: added first_line() method
a26b1646b AsioPolySock: extend AltRouting support
ef3a40c27 Listen::Item: added AltRouting mode
02e786bc9 write_binary_atomic: support ConstBuffer
6745799c9 fileunix: added read_binary_unix_fast()
5689c2d9c write_binary_unix(): added ConstBuffer variant
2b0e76453 enum_dir: refactor to allow enumeration via lambda
116a5bd5e bufstr: added const_buf_from_string() method
f8ec81413 Buffer: added const_buffer_ref() variant accepting a const argument
ae98aa8b6 AsioPolySock: support AltRouting
8f81479f1 AsioBoundSocket::Socket: support inheritance
9598918e9 ServerProto: added schedule_disconnect() method.
4516cf67b ServerProto: reset CoarseTime object when AsioTimer is canceled
0ffc76a0b Route: implement operator< so Route objects can be used as map/set keys.
c4af9f68b event_loop_wait_barrier: raise default timeout to 30 seconds
d7fe87540 appversion.hpp: rename VERSION -> BUILD_VERSION

git-subtree-dir: OpenVPN Adapter/Vendors/openvpn
git-subtree-split: e6d68831a71131b7d92fbea93d3b9cbe10ba2068

deps/asio/build-asio

@@ -21,13 +21,28 @@ fi
 
 PACKAGE=${ASIO_VERSION}
 FNAME=${ASIO_VERSION}.tar.gz
-PV=${ASIO_VERSION#*-}
-URL=https://github.com/chriskohlhoff/asio/archive/${PV}.tar.gz
+URL=https://github.com/chriskohlhoff/asio/archive/${ASIO_VERSION}.tar.gz
 CSUM=${ASIO_CSUM}
+DIST=asio
 
 download
 
-cd $DEP_DIR
-rm -rf asio*
-tar xf $DL/$ASIO_VERSION.tar.gz
-cp -a $ASIO_VERSION asio
+if [ "$NO_WIPE" = "1" ]; then
+    echo RETAIN existing source
+else
+    echo WIPE and reunzip source
+    cd $DEP_DIR
+    rm -rf $DIST asio-$ASIO_VERSION
+    tar xfz $DL/$FNAME
+    cd asio-$ASIO_VERSION
+
+    # apply pre-generated patches
+    for file in $O3/core/deps/asio/patches/*.patch; do
+        echo Applying patch: $file
+        git apply $file
+    done
+
+    cd ..
+
+    cp -a asio-$ASIO_VERSION $DIST
+fi

deps/asio/patch/0001-Android-appears-to-not-support-pthread_condattr_setc.patch

@@ -1,25 +0,0 @@
-From 48f2e874280f0d93d1a3df2e48aacc9e13b8eef5 Mon Sep 17 00:00:00 2001
-From: James Yonan <james@openvpn.net>
-Date: Wed, 1 Mar 2017 13:45:38 -0700
-Subject: Android appears to not support pthread_condattr_setclock
-
----
- asio/include/asio/detail/impl/posix_event.ipp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/asio/include/asio/detail/impl/posix_event.ipp b/asio/include/asio/detail/impl/posix_event.ipp
-index a62c434..c4b7982 100644
---- a/asio/include/asio/detail/impl/posix_event.ipp
-+++ b/asio/include/asio/detail/impl/posix_event.ipp
-@@ -31,7 +31,7 @@ namespace detail {
- posix_event::posix_event()
-   : state_(0)
- {
--#if (defined(__MACH__) && defined(__APPLE__))
-+#if (defined(__MACH__) && defined(__APPLE__)) || defined(__ANDROID__)
-   int error = ::pthread_cond_init(&cond_, 0);
- #else // (defined(__MACH__) && defined(__APPLE__))
-   ::pthread_condattr_t attr;
--- 
-2.7.4
-

deps/asio/patches/0001-Added-Apple-NAT64-support-when-both-ASIO_HAS_GETADDR.patch

@@ -1,8 +1,8 @@
-From 430862dee0dd960be1f702cc5ae0e7c0525d48a4 Mon Sep 17 00:00:00 2001
+From 28cdfe3f923affa87420a47f8ac71e791c77bcde Mon Sep 17 00:00:00 2001
 From: James Yonan <james@openvpn.net>
-Date: Wed, 3 Aug 2016 11:42:38 -0600
-Subject: =?UTF-8?q?Added=20Apple=20NAT64=20support=20when=20both=20ASIO=5F?=
- =?UTF-8?q?HAS=5FGETADDRINFO=0Aand=20ASIO=5FAPPLE=5FNAT64=20are=20defined.?=
+Date: Mon, 19 Mar 2018 11:24:10 +0800
+Subject: [PATCH] Added Apple NAT64 support when both ASIO_HAS_GETADDRINFO and
+ ASIO_APPLE_NAT64 ar defined
 
 * When calling getaddrinfo(), Apple recommends to set
   AI_DEFAULT flags in hint.
@@ -16,13 +16,14 @@ Subject: =?UTF-8?q?Added=20Apple=20NAT64=20support=20when=20both=20ASIO=5F?=
  1 file changed, 17 insertions(+)
 
 diff --git a/asio/include/asio/detail/impl/socket_ops.ipp b/asio/include/asio/detail/impl/socket_ops.ipp
-index d72afec..4f66c77 100644
+index b3b1a0cf..e1a07e06 100644
 --- a/asio/include/asio/detail/impl/socket_ops.ipp
 +++ b/asio/include/asio/detail/impl/socket_ops.ipp
-@@ -3276,6 +3276,23 @@ asio::error_code getaddrinfo(const char* host,
+@@ -3338,6 +3338,23 @@ asio::error_code getaddrinfo(const char* host,
+ # endif
  #elif !defined(ASIO_HAS_GETADDRINFO)
    int error = getaddrinfo_emulation(host, service, &hints, result);
-   return ec = translate_addrinfo_error(error);
++  return ec = translate_addrinfo_error(error);
 +#elif defined(ASIO_HAS_GETADDRINFO) && defined(ASIO_APPLE_NAT64)
 +  // For NAT64 compatibility, Apple recommends to set AI_DEFAULT flags
 +  addrinfo_type new_hints = hints;
@@ -33,16 +34,15 @@ index d72afec..4f66c77 100644
 +  // for non-link-local addresses.  Workaround by forcing scope ID to 0 for
 +  // non-link-local addresses.
 +  if (!error && (*result)->ai_family == AF_INET6)
-+    {
-+      sockaddr_in6* a6 = (sockaddr_in6*)(*result)->ai_addr;
-+      if (a6->sin6_scope_id && !(IN6_IS_ADDR_LINKLOCAL(&a6->sin6_addr) || IN6_IS_ADDR_MC_NODELOCAL(&a6->sin6_addr) || IN6_IS_ADDR_MC_LINKLOCAL(&a6->sin6_addr)))
-+	a6->sin6_scope_id = 0;
-+    }
++  {
++    sockaddr_in6* a6 = (sockaddr_in6*)(*result)->ai_addr;
++    if (a6->sin6_scope_id && !(IN6_IS_ADDR_LINKLOCAL(&a6->sin6_addr) || IN6_IS_ADDR_MC_NODELOCAL(&a6->sin6_addr) || IN6_IS_ADDR_MC_LINKLOCAL(&a6->sin6_addr)))
++      a6->sin6_scope_id = 0;
++  }
 +
-+  return ec = translate_addrinfo_error(error);
+   return ec = translate_addrinfo_error(error);
  #else
    int error = ::getaddrinfo(host, service, &hints, result);
-   return ec = translate_addrinfo_error(error);
 -- 
-1.8.5.2 (Apple Git-48)
+2.16.2
 

deps/asio/patches/0002-Added-randomize-method-to-asio-ip-tcp-resolver-resul.patch

@@ -1,14 +1,15 @@
-From d1758fee525c6adde63ff13df1ce00c63a9b7671 Mon Sep 17 00:00:00 2001
+From c6cb856ac923472e56d8dd631585b4ca58e71c31 Mon Sep 17 00:00:00 2001
 From: James Yonan <james@openvpn.net>
 Date: Wed, 2 Sep 2015 12:18:48 -0700
-Subject: Added randomize() method to asio::ip::tcp::resolver::results_type.
+Subject: [PATCH] Added randomize() method to
+ asio::ip::tcp::resolver::results_type.
 
 ---
  asio/include/asio/ip/basic_resolver_results.hpp | 7 +++++++
  1 file changed, 7 insertions(+)
 
 diff --git a/asio/include/asio/ip/basic_resolver_results.hpp b/asio/include/asio/ip/basic_resolver_results.hpp
-index dec2c7e..ae36906 100644
+index 4146a46b..f0ae258c 100644
 --- a/asio/include/asio/ip/basic_resolver_results.hpp
 +++ b/asio/include/asio/ip/basic_resolver_results.hpp
 @@ -18,6 +18,7 @@
@@ -33,5 +34,5 @@ index dec2c7e..ae36906 100644
    typedef std::vector<basic_resolver_entry<InternetProtocol> > values_type;
  };
 -- 
-1.8.5.2 (Apple Git-48)
+2.16.2
 

deps/asio/patches/0003-Added-user-code-hook-async_connect_post_open-to-be-c.patch

@@ -1,19 +1,18 @@
-From 630edbebfc2f77ad29480d884e20d0b767883ac2 Mon Sep 17 00:00:00 2001
+From 69a6d6aec54b41f4ceac3ac2ba14465a36bf1984 Mon Sep 17 00:00:00 2001
 From: James Yonan <james@openvpn.net>
 Date: Mon, 27 Feb 2017 13:01:26 -0700
-Subject: =?UTF-8?q?Added=20user=20code=20hook=20async=5Fconnect=5Fpost=5Fo?=
- =?UTF-8?q?pen()=20to=20be=20called=0Aimmediately=20after=20socket=20open?=
- =?UTF-8?q?=20in=20async=5Fconnect.?=
+Subject: [PATCH] Added user code hook async_connect_post_open() to be called
+ immediately after socket open in async_connect.
 
 ---
  asio/include/asio/basic_socket.hpp | 7 +++++++
  1 file changed, 7 insertions(+)
 
 diff --git a/asio/include/asio/basic_socket.hpp b/asio/include/asio/basic_socket.hpp
-index cbd9b35..dbc9297 100644
+index 43430161..0d1b0d28 100644
 --- a/asio/include/asio/basic_socket.hpp
 +++ b/asio/include/asio/basic_socket.hpp
-@@ -866,6 +866,8 @@ public:
+@@ -865,6 +865,8 @@ public:
        asio::error_code ec;
        const protocol_type protocol = peer_endpoint.protocol();
        this->get_service().open(this->get_implementation(), protocol, ec);
@@ -22,7 +21,7 @@ index cbd9b35..dbc9297 100644
        if (ec)
        {
          async_completion<ConnectHandler,
-@@ -1742,6 +1744,11 @@ protected:
+@@ -1741,6 +1743,11 @@ protected:
    }
  
  private:
@@ -35,5 +34,5 @@ index cbd9b35..dbc9297 100644
    basic_socket(const basic_socket&) ASIO_DELETED;
    basic_socket& operator=(const basic_socket&) ASIO_DELETED;
 -- 
-1.8.5.2 (Apple Git-48)
+2.16.2