mirror of
https://github.com/deneraraujo/OpenVPNAdapter.git
synced 2026-04-24 00:00:05 +08:00
84ad2a289f
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
91 lines
3.3 KiB
Python
91 lines
3.3 KiB
Python
#!/c/python27/python
|
|
|
|
import os
|
|
|
|
from utils import *
|
|
|
|
def cli_cpp(parms):
|
|
return os.path.join(parms['OVPN3'], "core", "test", "ovpncli", "cli.cpp")
|
|
|
|
def src_fn(parms, srcfile):
|
|
# Get source file name
|
|
if srcfile:
|
|
if '.' not in os.path.basename(srcfile):
|
|
srcfile += ".cpp"
|
|
else:
|
|
srcfile = cli_cpp(parms)
|
|
return srcfile
|
|
|
|
def is_unit_test(argv):
|
|
unit_test = False
|
|
if len(argv) >= 2:
|
|
unit_test = argv[1] == "unittest"
|
|
return unit_test
|
|
|
|
def src_fn_argv(parms, argv):
|
|
srcfile = None
|
|
if len(argv) >= 1:
|
|
srcfile = argv[0]
|
|
return src_fn(parms, srcfile)
|
|
|
|
def build(parms, srcfile, unit_test=False):
|
|
# Debug?
|
|
if parms['DEBUG']:
|
|
dbg_rel_flags = "/Zi"
|
|
else:
|
|
dbg_rel_flags = "/O2"
|
|
|
|
# Dictionary we will use to substitute parameters
|
|
# onto VC command line.
|
|
options = {
|
|
"ovpn3" : parms['OVPN3'],
|
|
"tap" : os.path.join(build_dir(parms), "tap-windows", "src"),
|
|
"tap_component_id" : parms['TAP_WIN_COMPONENT_ID'],
|
|
"asio" : os.path.join(build_dir(parms), "asio"),
|
|
"mbedtls" : os.path.join(build_dir(parms), "mbedtls"),
|
|
"lz4" : os.path.join(build_dir(parms), "lz4", "lib"),
|
|
"srcfile" : srcfile,
|
|
"extra_defs" : parms['CPP_EXTRA'],
|
|
"extra_inc" : "",
|
|
"extra_lib_path" : "",
|
|
"extra_lib" : "",
|
|
}
|
|
|
|
vc_parms(parms, options)
|
|
|
|
# Do we need to support XP and Win 2003?
|
|
arch = os.environ.get("ARCH", parms['ARCH'])
|
|
if arch == "x86_xp":
|
|
options['extra_defs'] += " /D_WIN32_WINNT=0x0501" # pre-Vista
|
|
else:
|
|
options['extra_defs'] += " /D_WIN32_WINNT=0x0600" # Vista and later
|
|
options['extra_lib'] += " fwpuclnt.lib"
|
|
|
|
# Add jsoncpp (optional)
|
|
if parms.get('USE_JSONCPP'):
|
|
options["jsoncpp"] = os.path.join(build_dir(parms), "jsoncpp")
|
|
options['extra_inc'] += " /DHAVE_JSONCPP /I %(jsoncpp)s/dist" % options
|
|
options['extra_lib_path'] += " /LIBPATH:%(jsoncpp)s/dist" % options
|
|
options['extra_lib'] += " jsoncpp.lib"
|
|
|
|
if unit_test:
|
|
options['extra_lib'] += " gtest.lib"
|
|
options['extra_inc'] += " /I %s" % os.path.join(parms["GTEST_ROOT"], "googletest", "include")
|
|
options['extra_lib_path'] += " /LIBPATH:%s" % os.path.join(parms["GTEST_ROOT"], "googlemock", "gtest", "Debug")
|
|
|
|
# Build OpenVPN Connect
|
|
if parms.get("CONNECT"):
|
|
options['extra_inc'] += " /I " + os.path.join(parms['OVPN3'], "common")
|
|
|
|
# build it
|
|
vc_cmd(parms, r"cl %(extra_defs)s /DNOMINMAX /D_CRT_SECURE_NO_WARNINGS /DUSE_ASIO /DASIO_STANDALONE /DASIO_NO_DEPRECATED /I %(asio)s\asio\include /DUSE_MBEDTLS /I %(mbedtls)s\include /DHAVE_LZ4 /I %(lz4)s%(extra_inc)s -DTAP_WIN_COMPONENT_ID=%(tap_component_id)s /I %(tap)s /I %(ovpn3)s\core /EHsc %(link_static_dynamic_flags)s /W0 %(dbg_rel_flags)s /nologo %(srcfile)s /link /LIBPATH:%(mbedtls)s\library /LIBPATH:%(lz4)s%(extra_lib_path)s mbedtls.lib lz4.lib%(extra_lib)s ws2_32.lib crypt32.lib iphlpapi.lib winmm.lib user32.lib gdi32.lib advapi32.lib wininet.lib shell32.lib ole32.lib rpcrt4.lib" % options, arch=os.environ.get("ARCH"))
|
|
|
|
if __name__ == "__main__":
|
|
import sys
|
|
|
|
params = read_params()
|
|
|
|
src = src_fn_argv(params, sys.argv[1:])
|
|
unit_test = is_unit_test(sys.argv[1:])
|
|
build(params, src, unit_test)
|