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

OpenVPN Adapter/Vendors/openvpn/javacli/Client.java

@@ -4,18 +4,18 @@
 //               packet encryption, packet authentication, and
 //               packet compression.
 //
-//    Copyright (C) 2012-2017 OpenVPN Technologies, Inc.
+//    Copyright (C) 2012-2017 OpenVPN Inc.
 //
 //    This program is free software: you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License Version 3
+//    it under the terms of the GNU Affero General Public License Version 3
 //    as published by the Free Software Foundation.
 //
 //    This program is distributed in the hope that it will be useful,
 //    but WITHOUT ANY WARRANTY; without even the implied warranty of
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
+//    GNU Affero General Public License for more details.
 //
-//    You should have received a copy of the GNU General Public License
+//    You should have received a copy of the GNU Affero General Public License
 //    along with this program in the COPYING file.
 //    If not, see <http://www.gnu.org/licenses/>.
 

OpenVPN Adapter/Vendors/openvpn/javacli/Main.java

@@ -4,18 +4,18 @@
 //               packet encryption, packet authentication, and
 //               packet compression.
 //
-//    Copyright (C) 2012-2017 OpenVPN Technologies, Inc.
+//    Copyright (C) 2012-2017 OpenVPN Inc.
 //
 //    This program is free software: you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License Version 3
+//    it under the terms of the GNU Affero General Public License Version 3
 //    as published by the Free Software Foundation.
 //
 //    This program is distributed in the hope that it will be useful,
 //    but WITHOUT ANY WARRANTY; without even the implied warranty of
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
+//    GNU Affero General Public License for more details.
 //
-//    You should have received a copy of the GNU General Public License
+//    You should have received a copy of the GNU Affero General Public License
 //    along with this program in the COPYING file.
 //    If not, see <http://www.gnu.org/licenses/>.
 

OpenVPN Adapter/Vendors/openvpn/javacli/OpenVPNClientThread.java

@@ -4,18 +4,18 @@
 //               packet encryption, packet authentication, and
 //               packet compression.
 //
-//    Copyright (C) 2012-2017 OpenVPN Technologies, Inc.
+//    Copyright (C) 2012-2017 OpenVPN Inc.
 //
 //    This program is free software: you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License Version 3
+//    it under the terms of the GNU Affero General Public License Version 3
 //    as published by the Free Software Foundation.
 //
 //    This program is distributed in the hope that it will be useful,
 //    but WITHOUT ANY WARRANTY; without even the implied warranty of
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
+//    GNU Affero General Public License for more details.
 //
-//    You should have received a copy of the GNU General Public License
+//    You should have received a copy of the GNU Affero General Public License
 //    along with this program in the COPYING file.
 //    If not, see <http://www.gnu.org/licenses/>.
 

OpenVPN Adapter/Vendors/openvpn/javacli/android/cpu.cpp

@@ -4,18 +4,18 @@
 //               packet encryption, packet authentication, and
 //               packet compression.
 //
-//    Copyright (C) 2012-2017 OpenVPN Technologies, Inc.
+//    Copyright (C) 2012-2017 OpenVPN Inc.
 //
 //    This program is free software: you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License Version 3
+//    it under the terms of the GNU Affero General Public License Version 3
 //    as published by the Free Software Foundation.
 //
 //    This program is distributed in the hope that it will be useful,
 //    but WITHOUT ANY WARRANTY; without even the implied warranty of
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
+//    GNU Affero General Public License for more details.
 //
-//    You should have received a copy of the GNU General Public License
+//    You should have received a copy of the GNU Affero General Public License
 //    along with this program in the COPYING file.
 //    If not, see <http://www.gnu.org/licenses/>.
 

OpenVPN Adapter/Vendors/openvpn/javacli/android/jellybean_hack.cpp

@@ -4,18 +4,18 @@
 //               packet encryption, packet authentication, and
 //               packet compression.
 //
-//    Copyright (C) 2012-2017 OpenVPN Technologies, Inc.
+//    Copyright (C) 2012-2017 OpenVPN Inc.
 //
 //    This program is free software: you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License Version 3
+//    it under the terms of the GNU Affero General Public License Version 3
 //    as published by the Free Software Foundation.
 //
 //    This program is distributed in the hope that it will be useful,
 //    but WITHOUT ANY WARRANTY; without even the implied warranty of
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
+//    GNU Affero General Public License for more details.
 //
-//    You should have received a copy of the GNU General Public License
+//    You should have received a copy of the GNU Affero General Public License
 //    along with this program in the COPYING file.
 //    If not, see <http://www.gnu.org/licenses/>.
 

OpenVPN Adapter/Vendors/openvpn/javacli/build-android

@@ -31,8 +31,9 @@ fi
 echo SWIG
 swig -c++ -java -package $pkg -I$O3/core/client -I$O3/core ovpncli.i
 
-# fixme: removed "android" from TARGET list due to compile failures in Asio
-for TARGET in android-a8a android-a7a ; do
+TARGETS=${TARGETS:-android-a7a android-a8a android-x86}
+
+for TARGET in $TARGETS; do
 
 if [ "$DEBUG_BUILD" = "1" ]; then
     . ../vars/vars-${TARGET}-dbg
@@ -58,10 +59,13 @@ else
     ssl_libdir="-L$DEP_DIR/mbedtls/mbedtls-$PLATFORM/library"
 fi
 
+[ -z "$GPP_CMD" ] && GPP_CMD=g++
+
 echo CORE $ABI
-g++ \
+$GPP_CMD \
     $CXX_COMPILER_FLAGS \
     $PLATFORM_FLAGS \
+    $OTHER_COMPILER_FLAGS \
     $LIB_OPT_LEVEL $LIB_FPIC \
     -Wall -Wno-sign-compare -Wno-unused-parameter \
     -Wno-unused-local-typedefs \
@@ -71,6 +75,7 @@ g++ \
     -DASIO_STANDALONE \
     -DASIO_NO_DEPRECATED \
     -DHAVE_LZ4 \
+    -DOPENVPN_USE_TLS_MD5 \
     -I$O3/core/client \
     -I$O3/core \
     $common \
@@ -80,9 +85,10 @@ g++ \
     -c $O3/core/client/ovpncli.cpp
 
 echo WRAP $ABI
-g++ \
+$GPP_CMD \
     $CXX_COMPILER_FLAGS \
     $PLATFORM_FLAGS \
+    $OTHER_COMPILER_FLAGS \
     $opt2 $LIB_FPIC \
     -fno-strict-aliasing \
     -Wall \
@@ -112,5 +118,8 @@ mv libovpncli.so build/libs/$ABI/
 rm ovpncli.o
 done
 
-mv ovpncli.java ovpncliJNI.java SWIGTYPE_*.java ClientAPI_*.java build/
+mv ovpncli_wrap.cxx ovpncli_wrap.h ovpncli.java ovpncliJNI.java SWIGTYPE_*.java ClientAPI_*.java build/
 git clean -q -fX .
+
+tar -czf android-core-build.tgz build
+mv android-core-build.tgz $O3/

OpenVPN Adapter/Vendors/openvpn/javacli/build-linux

@@ -54,7 +54,7 @@ g++ \
     $CXX_COMPILER_FLAGS \
     $PLATFORM_FLAGS \
     $LIB_OPT_LEVEL $LIB_FPIC \
-    -Wall -Wno-sign-compare -Wno-unused-parameter \
+    -Wall -Werror -Wno-sign-compare -Wno-unused-parameter \
     -Wno-unused-local-typedefs \
     $vis1 \
     $ssl_def \
@@ -75,7 +75,7 @@ g++ \
     $PLATFORM_FLAGS \
     $opt2 $LIB_FPIC \
     -fno-strict-aliasing \
-    -Wall \
+    -Wall -Werror \
     $vis1 $vis2 \
     -I$O3/core/client \
     -I$O3/core \

OpenVPN Adapter/Vendors/openvpn/javacli/ovpncli.i

@@ -15,6 +15,7 @@
 // ignore these ClientAPI::OpenVPNClient bases
 %ignore openvpn::ClientAPI::LogReceiver;
 %ignore openvpn::ExternalTun::Factory;
+%ignore openvpn::ExternalTransport::Factory;
 
 // modify exported C++ class names to incorporate their enclosing namespace
 %rename(ClientAPI_OpenVPNClient) OpenVPNClient;
@@ -49,4 +50,5 @@ namespace std {
 %include "openvpn/pki/epkibase.hpp"
 %include "openvpn/tun/builder/base.hpp"
 %import  "openvpn/tun/extern/fw.hpp"     // ignored
+%import  "openvpn/transport/client/extern/fw.hpp"     // ignored
 %include "ovpncli.hpp"