From 1079962e4c06f88a54e50d997c1b7e84303d30b4 Mon Sep 17 00:00:00 2001 From: Bernhard Schmidt Date: Sat, 15 Aug 2020 21:29:50 +0200 Subject: New upstream version 2.5~beta1 --- src/openvpn/comp-lz4.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/openvpn/comp-lz4.c') diff --git a/src/openvpn/comp-lz4.c b/src/openvpn/comp-lz4.c index f2916bd..30e6da9 100644 --- a/src/openvpn/comp-lz4.c +++ b/src/openvpn/comp-lz4.c @@ -35,7 +35,7 @@ #if defined(NEED_COMPAT_LZ4) #include "compat-lz4.h" #else -#include "lz4.h" +#include #endif #include "comp.h" @@ -70,8 +70,9 @@ do_lz4_compress(struct buffer *buf, { /* * In order to attempt compression, length must be at least COMPRESS_THRESHOLD. + * and asymmetric compression must be disabled */ - if (buf->len >= COMPRESS_THRESHOLD) + if (buf->len >= COMPRESS_THRESHOLD && (compctx->flags & COMP_F_ALLOW_COMPRESS)) { const size_t ps = PAYLOAD_SIZE(frame); int zlen_max = ps + COMP_EXTRA_BUFFER(ps); -- cgit v1.2.3 From f2b3dda12a731c2e0971cb7889728edaf23f6cb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 29 Nov 2021 20:46:00 +0100 Subject: New upstream version 2.5.4 --- src/openvpn/comp-lz4.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/openvpn/comp-lz4.c') diff --git a/src/openvpn/comp-lz4.c b/src/openvpn/comp-lz4.c index 30e6da9..3cb427e 100644 --- a/src/openvpn/comp-lz4.c +++ b/src/openvpn/comp-lz4.c @@ -5,8 +5,8 @@ * packet encryption, packet authentication, and * packet compression. * - * Copyright (C) 2002-2018 OpenVPN Inc - * Copyright (C) 2013-2018 Gert Doering + * Copyright (C) 2002-2021 OpenVPN Inc + * Copyright (C) 2013-2021 Gert Doering * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 -- cgit v1.2.3