mirror of
https://github.com/deneraraujo/OpenVPNAdapter.git
synced 2026-02-11 00:00:08 +08:00
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
146 lines
4.2 KiB
C++
146 lines
4.2 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/>.
|
|
|
|
#ifndef OPENVPN_BUFFER_ZLIB_H
|
|
#define OPENVPN_BUFFER_ZLIB_H
|
|
|
|
#ifdef HAVE_ZLIB
|
|
|
|
#include <cstring> // for std::memset
|
|
|
|
#include <zlib.h>
|
|
|
|
#include <openvpn/common/exception.hpp>
|
|
#include <openvpn/buffer/buffer.hpp>
|
|
#include <openvpn/buffer/buflist.hpp>
|
|
|
|
namespace openvpn {
|
|
namespace ZLib {
|
|
OPENVPN_EXCEPTION(zlib_error);
|
|
|
|
class ZStreamBase // used internally by compress_gzip/decompress_gzip
|
|
{
|
|
public:
|
|
z_stream s;
|
|
protected:
|
|
ZStreamBase() { std::memset(&s, 0, sizeof(s)); }
|
|
private:
|
|
ZStreamBase(const ZStreamBase&) = delete;
|
|
ZStreamBase& operator=(const ZStreamBase&) = delete;
|
|
};
|
|
|
|
inline BufferPtr compress_gzip(BufferPtr src,
|
|
const size_t headroom,
|
|
const size_t tailroom,
|
|
const int level,
|
|
const int window_bits=15,
|
|
const int mem_level=8)
|
|
{
|
|
constexpr int GZIP_ENCODING = 16;
|
|
|
|
struct ZStream : public ZStreamBase {
|
|
~ZStream() { ::deflateEnd(&s); }
|
|
};
|
|
|
|
if (src)
|
|
{
|
|
int status;
|
|
ZStream zs;
|
|
zs.s.next_in = src->data();
|
|
zs.s.avail_in = src->size();
|
|
status = ::deflateInit2(&zs.s,
|
|
level,
|
|
Z_DEFLATED,
|
|
GZIP_ENCODING + window_bits,
|
|
mem_level,
|
|
Z_DEFAULT_STRATEGY);
|
|
if (status != Z_OK)
|
|
OPENVPN_THROW(zlib_error, "zlib deflateinit2 failed, error=" << status);
|
|
const uLong outcap = ::deflateBound(&zs.s, src->size());
|
|
BufferPtr b = new BufferAllocated(outcap + headroom + tailroom, 0);
|
|
b->init_headroom(headroom);
|
|
zs.s.next_out = b->data();
|
|
zs.s.avail_out = outcap;
|
|
status = ::deflate(&zs.s, Z_FINISH);
|
|
if (status != Z_STREAM_END)
|
|
OPENVPN_THROW(zlib_error, "zlib deflate failed, error=" << status);
|
|
b->set_size(zs.s.total_out);
|
|
return b;
|
|
}
|
|
else
|
|
return BufferPtr();
|
|
}
|
|
|
|
inline BufferPtr decompress_gzip(BufferPtr src,
|
|
const size_t headroom,
|
|
const size_t tailroom,
|
|
const size_t max_size,
|
|
const size_t block_size=4096,
|
|
const int window_bits=15)
|
|
{
|
|
constexpr int GZIP_ENCODING = 16;
|
|
|
|
struct ZStream : public ZStreamBase {
|
|
~ZStream() { ::inflateEnd(&s); }
|
|
};
|
|
|
|
if (src)
|
|
{
|
|
int status;
|
|
ZStream zs;
|
|
zs.s.next_in = src->data();
|
|
zs.s.avail_in = src->size();
|
|
status = ::inflateInit2(&zs.s, GZIP_ENCODING + window_bits);
|
|
if (status != Z_OK)
|
|
OPENVPN_THROW(zlib_error, "zlib inflateinit2 failed, error=" << status);
|
|
|
|
BufferList blist;
|
|
size_t hr = headroom;
|
|
size_t tr = tailroom;
|
|
do {
|
|
// use headroom/tailroom on first block to take advantage
|
|
// of BufferList::join() optimization for one-block lists
|
|
BufferPtr b = new BufferAllocated(block_size + hr + tr, 0);
|
|
b->init_headroom(hr);
|
|
const size_t avail = b->remaining(tr);
|
|
zs.s.next_out = b->data();
|
|
zs.s.avail_out = avail;
|
|
status = ::inflate(&zs.s, Z_SYNC_FLUSH);
|
|
if (status != Z_OK && status != Z_STREAM_END)
|
|
OPENVPN_THROW(zlib_error, "zlib inflate failed, error=" << status);
|
|
b->set_size(avail - zs.s.avail_out);
|
|
blist.push_back(std::move(b));
|
|
if (max_size && zs.s.total_out > max_size)
|
|
OPENVPN_THROW(zlib_error, "zlib inflate max_size " << max_size << " exceeded");
|
|
hr = tr = 0;
|
|
} while (status == Z_OK);
|
|
return blist.join(headroom, tailroom, true);
|
|
}
|
|
else
|
|
return BufferPtr();
|
|
}
|
|
|
|
}
|
|
}
|
|
|
|
#endif
|
|
#endif
|