mirror of
https://github.com/deneraraujo/OpenVPNAdapter.git
synced 2026-02-22 00:00:06 +08:00
3e002c8 remove unused Jenkinsfile 16b1055 [OVPN3-140] Update company names in copyrights 6caca2c [OVPN3-140] Relicense back to AGPLv3 4f9ae74 cliproto: react to tls_warnings 546547b Proto: export tls_warnings attribute from SSL session 7cbaa26 SSLAPI: add tls_warning attribute 7ed93a3 clievent: add Warn event class 7a71ba1 win: get 'arch' param value from environment 61bb21b win: make parameter optional 15d66c4 [OVPN3-141] win: disable WPO 97d9c28 [OU-15] mbedtls: remove duplicated code 95aec32 [OU-15] mbedtls: refactor X509Cert to allow reuse der2pem 946753e [OVPN3-135] Win: remove unneeded default route d7f8c47 nrpt: create separate policy per dns suffix 577b5ca cli.cpp: fix typ0 in define fc8f89d [OVPN3-129] android: ensure all SWIG files are archived and saved e143bc0 [OVPN3-129] android: improve build system in order to perform full build 06d23ec [OVPN3-129] build-system: let scripts download dependencies 76bb99c fix usage of to_string() in Android 44c183a time: mute type conversion warnings for UWP client 7d7490c transport: enable socket protect call for UWP 1c003ac transport: pass protocol type to external factory c0de92c transport: add stop_requeueing method e2c60c8 android: build core library with MD5 support 3928069 [OVPN3-119] mbedTLS: create INSECURE profile including MD5 4f99310 remove function accidentally duplicated by last merge b91d841 self-test: add missing includes 19e33c4 [OA-14] mbedTLS: relax x509 date/time format check f3cf645 [OVPN3-116] disable SSL_CBC_RECORD_SPLITTING fca9ed2 [OVPN3-105] ParseClientConfig: avoid crash when not all key material is provided 7299fef [OC-42] Android: specify API level on command line d3da3df android: build client lib for x86 (for emulator) 8e501c5 Update version for mbedTLS and lz4 e57676e ParseClientConfig: export config to json format 9aa715f ParseClientConfig: export configuration to ovpn file format 1eab4cb ParseClientConfig: add helper constructor 71a59e4 ParseClientConfig: store the entire ovpn profile e0bb85a Transport: convert from transport protocol to config string 2fe56c3 Compress: convert from ctx type to config string 174ee25 OpenSSL: implement stub methods for new private_key_type/length() SSLAPIs 3d57708 mbedTLS: implement private_key_type/length() API a3210f0 SSLAPI: add private_key_type/length() getter methods 8ffe888 OpenSSL: implement stub methods for new extract_* SSLAPIs 16e9160 mbedTLS: implement extended API for key material extraction fe3d519 SSLAPI: extend API with methods to extract key material 2b4c850 Debugging: added header and build flag for valgrind run-time extensions. b948cde ManClientInstance::Factory: added virtual stop() method. 121e975 client API: added portOverride 106981c JSON: allow alternative JSON library implementations f206ae2 logging: added logdatetime.hpp which prepends date/time to log lines 49e933d Time: added to_double, delta_float, and delta_str methods 569b1da daemon.hpp: added class WritePid for managing pid files 63e9e04 ClientProto: reset CoarseTime object when AsioTimer is canceled f64b501 Cleanup: allow functor to be passed by value. ebe2560 RunContext: add configurable exit via EXIT_IN env var for debugging 1fbff4f tls-crypt: revised server-side validate_initial_packet() methods to use a BufferAllocated rather than a Buffer. 0090c51 SSLConst: added new ssl_flags() method which filters out non-ssl flags from given argument. 8379b0a CryptoDCInstance: added new RekeyType PRIMARY_SECONDARY_SWAP and use it in ProtoContext::promote_secondary_to_primary() since it more accurately reflects the underlying implementation. 18f45c2 ManClientInstance::Send: added AuthStatus::Type parameter to disconnect_user() method. 4bba803 Listen::List: added expand_ports() method. 5122e7d Listen::List: in port_offset(), set n_threads to 0 since number-of-threads data for port_offset items isn't really relevant. 4e11a6c StaticKey: added render_to_base64() and init_from_rng() methods. 190ece9 CryptoAlgs: added mode() method. 76e65cf CryptoAlgs: added AEAD_NONCE_TAIL_SIZE constant (set to 8 bytes) to represent the size in bytes of AEAD "nonce tail" normally taken from the HMAC key material. 2738718 compress: added method_to_string() method, i.e. the inverse of parse_method(). 7b47f99 compress: since parse_method() performs a linear search on method, reorder so that more frequently used methods appear at the top of the list. b428f74 library: added integer is_pow2() and log2() methods based on efficient __builtin_ffs and __builtin_clz intrinsics. 4926011 Android: adapt toolchain scripts to new SDK and move to API 26 ad4e995 mbedTLS: use mbedtls API to initialize cert object 908c611 transport: use socket_protect to communicate socket handle on UWP 92a6216 build win: read certain params from env 8166ea8 common: define uwp platform macro 0186bf6 common: report platform name as "uwp" 3f291b0 netconf: disable getting hwaddr for UWP 6365d26 transport: external factory 2ffa0c9 transport: synchronous DNS lookup 2c09c7c cliconnect.hpp: support for AsioWork always on 4f5a04d rand.hpp: allow external entropy source b19c5da time.hpp: use GetTickCount64 on Vista and newer 712ccfc android: export DEP_DIR via vars files only if not already defined 1b5a784 asio: make sure to switch to DEP_DIR before building 4302651 changes to support android building 6f56b2b Merge pull request #21 from OpenVPN/make_test_proto_deterministic 3a5ef2b travis-ci: make testing binary deterministic b76882d mbedtls: fix typ0 in exception message 40065a6 avoid "uninitialized variable warning" f33e7c2 [OVPN3-5] tls-crypt: add tls-crypt support in proto.hpp test unit 74c5f4f [OVPN3-5] tls-crypt: introduce tls-crypt support 389353c proto.cpp: uninit process at the end of the execution 56a831f [OVPN3-5] crypto/ssl: add support for AES-256-CTR 7cbf539 [OVPN3-5] build script: allow user to specify its own mbedTLS folder and LDFLAGS 8ae2a3f Integrate Google Test framework 68ae101 Add swig build to jenkins pipeline d496311 ovpncli.hpp: inline LogInfo constructor for clarity 96e0d89 Revert "Merged in OVPN3-21-prepend-log-record-with-unique- (pull request #7)" 7db95cc Make build fail on compilation errors 860129a TunBuilderCapture: make (to|from)_json methods public 2486494 random: added helper class Rand2 containing a crypto and non-crypto RNG 04175c2 appversion.hpp: Stringize VERSION -> MY_VERSION 81cb887 build script: added DPROF=1 flag a3dd47f timestr.hpp: moved milliseconds_since_epoch() to time/epoch.hpp 59b9492 sslchoose.hpp: added SSL_LIB_NAME 8fcb797 ProtoContext::KeyContext::raw_recv() : fix state transition e49e993 ProtoContext: comment edit 1d941aa VPNServerNetblock::Netblock refactor 7190495 Server-side renamings to break up long class names using namespaces. 3f74ec1 Listen::List: minor changes 79c789b RandomAPI: comment edit 5b5af36 Added SSLConst::SERVER_TO_SERVER flag fe00df4 OpenSSLContext::Config::set_rng: call assert_crypto() 3ae0076 In sslchoose.hpp, move OPENVPN_LOG_SSL macro to new file ssllog.hpp 1502cf6 URL::Parse: made is_valid_uri_char() standalone and moved to validate_uri.hpp 2dcb189 Added HTTP::Status::SwitchingProtocols constant 2f57024 HTTP::HeaderList: added get_value_trim_lower() method bee94d2 HTTP::HeaderList: get_value() and get_value_trim() should return std::string instead of const std::string 5debab1 Frame::Context: #define OPENVPN_NO_IO to allow building without i/o layer faf8f8f StaticKey: added parse_from_base64() method d11f250 HashString: added final_base64() method c373bf8 CompressContext: use C++11 member initialization and remove explicit attribute on constructor bd75cd7 RCPtr: added operator==() and operator!=() methods 7be33c5 PThreadBarrier: fixed incorrect comment 6f5f77b Link: use move semantics 17a5d89 inotify.hpp: no longer used 8ce39fc added render_hex() and render_hex_sep() methods that accept void* data ddc8e8a Function: use std::forward 76ee587 write_binary_atomic(): added tmpdir (temporary directory) parameter f366d55 base64: encode() now accepts void* data 462fe90 BufferType: added read(), write(), and prepend() variants that accept void* data 9ad1be4 IP::RouteType: added host_bits() method 3ebc8c7 IPv[46]::Addr::to_sockaddr() now accepts optional port number ce0977b Support Cityhash. fdbb0b9 IP::Addr: added validate_prefix_len() 25146d8 IP::Addr::from_ipv[4|6](): use move semantics a264f99 Merge pull request #20 from OpenVPN/fix_travis_ci_coverity 966e212 travis: don't mess up the SSL libs for wget/curl 2b8f09d Merge pull request #19 from OpenVPN/antonio/travis-ci-to-coverity 127cbb0 travis.yml: send build to Coverity SCAN when building master 2bca49b Merge pull request #15 from OpenVPN/antonio/travis-ci a5ce566 add basic support for Travis CI f9b14e9 macOS: add basic logging support 2b9188d Remotelist: pass meaningful port value to resolve::async_resolve() 4ebdbd0 Merged in OVPN3-38-improve-jenkins-pipeline-script (pull request #8) 832cf7f Report build status to Bitbucket 62423c9 Merged in OVPN3-21-prepend-log-record-with-unique- (pull request #7) cce2455 Prepend log string with unique reference. f26b08b Merged in OVPN3-25-pipeline-build (pull request #4) dc5ff1f Add OpenSSL version building. c77e1d6 Add pipeline script for multiplatform build. 4fab9b0 Merged in OVPN3-18-vs-project (pull request #2) 8eb0d6c Add Visual Studio project info to README 67c4989 Visual Studio 2015 solution and project files 52bfcd3 Merged in OVPN3-17 (pull request #1) 5f648ce Document Windows build process 3213c48 Support for local build settings b3ec01b Support for gpl version of mbedtls 903abc8 Support for zipballs 4029579 AsioPolySock: support bind to local address. 1e85566 Use openvpn::strerror_str() instead of std::strerror(). 3ba37fc OpenVPN 3 client: added OPENVPN_OVPNCLI_ASYNC_SETUP flag. git-subtree-dir: OpenVPN Adapter/Vendors/openvpn git-subtree-split: 3e002c83ce2e9f9f40ddcee750d3cfa664238abe
378 lines
9.8 KiB
C++
378 lines
9.8 KiB
C++
// OpenVPN -- An application to securely tunnel IP networks
|
|
// over a single port, with support for SSL/TLS-based
|
|
// session authentication and key exchange,
|
|
// packet encryption, packet authentication, and
|
|
// packet compression.
|
|
//
|
|
// 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 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 Affero General Public License for more details.
|
|
//
|
|
// 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/>.
|
|
|
|
// These are our fundamental Time and Time Duration classes.
|
|
// We normally deal with time in units of 1/1024 of a second.
|
|
// This allows us to use 32-bit values to represent most time
|
|
// and time duration values, but still gives us reasonable
|
|
// accuracy. Using units of 1/1024 of a second vs. straight
|
|
// milliseconds gives us an advantage of not needing to do
|
|
// very much integer multiplication and division which can
|
|
// help us on platforms such as ARM that lack integer division
|
|
// instructions. Note that the data type used to store the time
|
|
// is an oulong, so it will automatically expand to 64 bits on
|
|
// 64-bit machines (see olong.hpp). Using a 32-bit
|
|
// data type for time durations is normally fine for clients,
|
|
// but imposes a wraparound limit of ~ 48 days. Servers
|
|
// should always use a 64-bit data type to avoid this
|
|
// limitation.
|
|
|
|
#ifndef OPENVPN_TIME_TIME_H
|
|
#define OPENVPN_TIME_TIME_H
|
|
|
|
#include <limits>
|
|
#include <cstdint> // for std::uint32_t, uint64_t
|
|
|
|
#include <openvpn/common/platform.hpp>
|
|
#include <openvpn/common/exception.hpp>
|
|
#include <openvpn/common/olong.hpp>
|
|
#include <openvpn/common/to_string.hpp>
|
|
|
|
#ifdef OPENVPN_PLATFORM_WIN
|
|
#include <time.h> // for ::time() on Windows
|
|
#include <windows.h> // for GetTickCount
|
|
#else
|
|
#include <sys/time.h> // for ::time() and ::gettimeofday()
|
|
#endif
|
|
|
|
namespace openvpn {
|
|
OPENVPN_SIMPLE_EXCEPTION(get_time_error);
|
|
|
|
template <typename T>
|
|
class TimeType
|
|
{
|
|
public:
|
|
enum { prec=1024 };
|
|
typedef ::time_t base_type;
|
|
typedef T type;
|
|
|
|
class Duration
|
|
{
|
|
friend class TimeType;
|
|
|
|
public:
|
|
static Duration seconds(const T v) { return Duration(v * prec); }
|
|
static Duration binary_ms(const T v) { return Duration(v); }
|
|
static Duration infinite() { return Duration(std::numeric_limits<T>::max()); }
|
|
|
|
static Duration milliseconds(const T v)
|
|
{
|
|
// NOTE: assumes that prec == 1024
|
|
// Also note that this might wrap if v is larger than 1/3 of max size of T
|
|
return Duration(v + (v * T(3) / T(128)));
|
|
}
|
|
|
|
Duration() noexcept : duration_(T(0)) {}
|
|
|
|
bool defined() const { return duration_ != T(0); }
|
|
bool operator!() const { return duration_ == T(0); }
|
|
bool is_infinite() const { return duration_ == std::numeric_limits<T>::max(); }
|
|
bool enabled() const { return defined() && !is_infinite(); }
|
|
void set_infinite() { duration_ = std::numeric_limits<T>::max(); }
|
|
void set_zero() { duration_ = T(0); }
|
|
|
|
Duration operator+(const Duration& d) const
|
|
{
|
|
if (is_infinite() || d.is_infinite())
|
|
return infinite();
|
|
else
|
|
return Duration(duration_ + d.duration_);
|
|
}
|
|
|
|
Duration operator+(const int delta) const
|
|
{
|
|
T duration = duration_;
|
|
if (delta >= 0)
|
|
duration += delta;
|
|
else
|
|
{
|
|
const unsigned int ndelta = -delta;
|
|
if (duration_ >= ndelta)
|
|
duration -= ndelta;
|
|
else
|
|
duration = 0;
|
|
}
|
|
return Duration(duration);
|
|
}
|
|
|
|
Duration operator*(const unsigned int mult) const
|
|
{
|
|
return Duration(duration_ * mult);
|
|
}
|
|
|
|
Duration& operator+=(const Duration& d)
|
|
{
|
|
if (is_infinite() || d.is_infinite())
|
|
set_infinite();
|
|
else
|
|
duration_ += d.duration_;
|
|
return *this;
|
|
}
|
|
|
|
void min(const Duration& d)
|
|
{
|
|
if (d.duration_ < duration_)
|
|
duration_ = d.duration_;
|
|
}
|
|
|
|
void max(const Duration& d)
|
|
{
|
|
if (d.duration_ > duration_)
|
|
duration_ = d.duration_;
|
|
}
|
|
|
|
Duration operator-(const Duration& d) const
|
|
{
|
|
if (d.duration_ >= duration_)
|
|
return Duration(0);
|
|
else if (is_infinite())
|
|
return Duration::infinite();
|
|
else
|
|
return Duration(duration_ - d.duration_);
|
|
}
|
|
|
|
Duration& operator-=(const Duration& d)
|
|
{
|
|
if (d.duration_ >= duration_)
|
|
set_zero();
|
|
else if (!is_infinite())
|
|
duration_ -= d.duration_;
|
|
return *this;
|
|
}
|
|
|
|
T to_seconds() const { return duration_ / prec; }
|
|
T to_binary_ms() const { return duration_; }
|
|
|
|
T to_milliseconds() const
|
|
{
|
|
// NOTE: assumes that prec == 1024
|
|
// Also note that this might wrap if duration_ is larger than 1/3 of max size of T
|
|
return duration_ - (duration_ * T(3) / T(128));
|
|
}
|
|
|
|
double to_double() const
|
|
{
|
|
return double(duration_) / double(prec);
|
|
}
|
|
|
|
T raw() const { return duration_; }
|
|
|
|
# define OPENVPN_DURATION_REL(OP) bool operator OP(const Duration& d) const { return duration_ OP d.duration_; }
|
|
OPENVPN_DURATION_REL(==)
|
|
OPENVPN_DURATION_REL(!=)
|
|
OPENVPN_DURATION_REL(>)
|
|
OPENVPN_DURATION_REL(<)
|
|
OPENVPN_DURATION_REL(>=)
|
|
OPENVPN_DURATION_REL(<=)
|
|
# undef OPENVPN_DURATION_REL
|
|
|
|
private:
|
|
explicit Duration(const T duration) : duration_(duration) {}
|
|
|
|
T duration_;
|
|
};
|
|
|
|
TimeType() noexcept : time_(T(0)) {}
|
|
|
|
static TimeType zero() { return TimeType(T(0)); }
|
|
static TimeType infinite() { return TimeType(std::numeric_limits<T>::max()); }
|
|
|
|
bool is_infinite() const { return time_ == std::numeric_limits<T>::max(); }
|
|
|
|
void reset() { time_ = 0; }
|
|
void set_infinite() { time_ = std::numeric_limits<T>::max(); }
|
|
|
|
bool defined() const { return time_ != 0; }
|
|
bool operator!() const { return time_ == 0; }
|
|
|
|
base_type seconds_since_epoch() const { return base_ + time_ / prec; }
|
|
T fractional_binary_ms() const { return time_ % prec; }
|
|
|
|
static TimeType now() { return TimeType(now_()); }
|
|
|
|
void update() { time_ = now_(); }
|
|
|
|
TimeType operator+(const Duration& d) const
|
|
{
|
|
if (is_infinite() || d.is_infinite())
|
|
return infinite();
|
|
else
|
|
return TimeType(time_ + d.duration_);
|
|
}
|
|
|
|
TimeType& operator+=(const Duration& d)
|
|
{
|
|
if (is_infinite() || d.is_infinite())
|
|
set_infinite();
|
|
else
|
|
time_ += d.duration_;
|
|
return *this;
|
|
}
|
|
|
|
Duration operator-(const TimeType& t) const
|
|
{
|
|
if (t.time_ >= time_)
|
|
return Duration(0);
|
|
else if (is_infinite())
|
|
return Duration::infinite();
|
|
else
|
|
return Duration(time_ - t.time_);
|
|
}
|
|
|
|
void min(const TimeType& t)
|
|
{
|
|
if (t.time_ < time_)
|
|
time_ = t.time_;
|
|
}
|
|
|
|
void max(const TimeType& t)
|
|
{
|
|
if (t.time_ > time_)
|
|
time_ = t.time_;
|
|
}
|
|
|
|
long delta_prec(const TimeType& t) const
|
|
{
|
|
return long(time_) - long(t.time_);
|
|
}
|
|
|
|
long delta(const TimeType& t) const
|
|
{
|
|
return delta_prec(t) / long(prec);
|
|
}
|
|
|
|
double delta_float(const TimeType& t) const
|
|
{
|
|
return (double(time_) - double(t.time_)) / double(prec);
|
|
}
|
|
|
|
std::string delta_str(const TimeType& t) const
|
|
{
|
|
if (!defined())
|
|
return "UNDEF-TIME";
|
|
const double df = delta_float(t);
|
|
std::string ret;
|
|
if (df >= 0.0)
|
|
ret += '+';
|
|
ret += openvpn::to_string(df);
|
|
return ret;
|
|
}
|
|
|
|
# define OPENVPN_TIME_REL(OP) bool operator OP(const TimeType& t) const { return time_ OP t.time_; }
|
|
OPENVPN_TIME_REL(==)
|
|
OPENVPN_TIME_REL(!=)
|
|
OPENVPN_TIME_REL(>)
|
|
OPENVPN_TIME_REL(<)
|
|
OPENVPN_TIME_REL(>=)
|
|
OPENVPN_TIME_REL(<=)
|
|
# undef OPENVPN_TIME_REL
|
|
|
|
T raw() const { return time_; }
|
|
|
|
static void reset_base_conditional()
|
|
{
|
|
// on 32-bit systems, reset time base after 30 days
|
|
if (sizeof(T) == 4)
|
|
{
|
|
const base_type newbase = ::time(0);
|
|
if (newbase - base_ >= (60*60*24*30))
|
|
reset_base();
|
|
}
|
|
}
|
|
|
|
static void reset_base()
|
|
{
|
|
base_ = ::time(0);
|
|
#ifdef OPENVPN_PLATFORM_WIN
|
|
#if (_WIN32_WINNT >= 0x0600)
|
|
win_recalibrate((DWORD)::GetTickCount64());
|
|
#else
|
|
win_recalibrate(::GetTickCount());
|
|
#endif
|
|
#endif
|
|
}
|
|
|
|
// number of tenths of a microsecond since January 1, 1601.
|
|
static uint64_t win_time()
|
|
{
|
|
// NOTE: assumes that prec == 1024
|
|
return ((11644473600ULL * uint64_t(prec)) + (uint64_t(base_) * uint64_t(prec)) + uint64_t(now_())) * 78125ULL / 8ULL;
|
|
}
|
|
|
|
private:
|
|
explicit TimeType(const T time) : time_(time) {}
|
|
|
|
#ifdef OPENVPN_PLATFORM_WIN
|
|
|
|
static void win_recalibrate(const DWORD gtc)
|
|
{
|
|
gtc_last = gtc;
|
|
gtc_base = ::time(0) - gtc_last/1000;
|
|
}
|
|
|
|
static T now_()
|
|
{
|
|
#if (_WIN32_WINNT >= 0x0600)
|
|
const DWORD gtc = (DWORD)::GetTickCount64();
|
|
#else
|
|
const DWORD gtc = ::GetTickCount();
|
|
#endif
|
|
if (gtc < gtc_last)
|
|
win_recalibrate(gtc);
|
|
const time_t sec = gtc_base + gtc / 1000;
|
|
const unsigned int msec = gtc % 1000;
|
|
return T((sec - base_) * prec + msec * prec / 1000);
|
|
}
|
|
|
|
static DWORD gtc_last;
|
|
static time_t gtc_base;
|
|
|
|
#else
|
|
|
|
static T now_()
|
|
{
|
|
::timeval tv;
|
|
if (::gettimeofday(&tv, nullptr) != 0)
|
|
throw get_time_error();
|
|
return T((tv.tv_sec - base_) * prec + tv.tv_usec * prec / 1000000);
|
|
}
|
|
|
|
#endif
|
|
|
|
static base_type base_;
|
|
T time_;
|
|
};
|
|
|
|
#ifdef OPENVPN_PLATFORM_WIN
|
|
template <typename T> DWORD TimeType<T>::gtc_last;
|
|
template <typename T> time_t TimeType<T>::gtc_base;
|
|
#endif
|
|
|
|
template <typename T> typename TimeType<T>::base_type TimeType<T>::base_;
|
|
|
|
typedef TimeType<oulong> Time;
|
|
|
|
typedef Time* TimePtr;
|
|
|
|
} // namespace openvpn
|
|
|
|
#endif // OPENVPN_TIME_TIME_H
|