From: Guus Sliepen Date: Wed, 7 May 2003 11:21:58 +0000 (+0000) Subject: Small fixes. X-Git-Tag: release-1.0~90 X-Git-Url: https://tinc-vpn.org/git/browse?a=commitdiff_plain;h=249933350bda2c3fa09c7ce8eb36bf84ee30a1cb;p=tinc Small fixes. --- diff --git a/src/net.h b/src/net.h index 6d2677bf..ae384024 100644 --- a/src/net.h +++ b/src/net.h @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: net.h,v 1.9.4.57 2003/05/06 21:13:17 guus Exp $ + $Id: net.h,v 1.9.4.58 2003/05/07 11:21:58 guus Exp $ */ #ifndef __TINC_NET_H__ @@ -41,7 +41,7 @@ #define MTU 1514 /* 1500 bytes payload + 14 bytes ethernet header */ #endif -#define MAXSIZE (MTU + 4 + 8 + 64 + MTU/64 + 20) /* MTU + seqno + padding + HMAC + compressor overhead */ +#define MAXSIZE (MTU + 4 + EVP_MAX_BLOCK_LENGTH + EVP_MAX_MD_SIZE + MTU/64 + 20) /* MTU + seqno + padding + HMAC + compressor overhead */ #define MAXBUFSIZE ((MAXSIZE > 2048 ? MAXSIZE : 2048) + 128) /* Enough room for a request with a MAXSIZEd packet or a 8192 bits RSA key */ #define MAXSOCKETS 128 /* Overkill... */ diff --git a/src/net_packet.c b/src/net_packet.c index f9fdf926..fff877bc 100644 --- a/src/net_packet.c +++ b/src/net_packet.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: net_packet.c,v 1.1.2.29 2003/05/06 23:14:45 guus Exp $ + $Id: net_packet.c,v 1.1.2.30 2003/05/07 11:21:58 guus Exp $ */ #include "config.h" @@ -90,7 +90,7 @@ char lzo_wrkmem[LZO1X_999_MEM_COMPRESS > LZO1X_1_MEM_COMPRESS ? LZO1X_999_MEM_CO length_t compress_packet(uint8_t *dest, const uint8_t *source, length_t len, int level) { if(level == 10) { - lzo_uint lzolen = sizeof(lzo_wrkmem); + lzo_uint lzolen = MAXSIZE; lzo1x_1_compress(source, len, dest, &lzolen, lzo_wrkmem); return lzolen; } else if(level < 10) { @@ -100,7 +100,7 @@ length_t compress_packet(uint8_t *dest, const uint8_t *source, length_t len, int else return -1; } else { - lzo_uint lzolen = sizeof(lzo_wrkmem); + lzo_uint lzolen = MAXSIZE; lzo1x_999_compress(source, len, dest, &lzolen, lzo_wrkmem); return lzolen; } @@ -111,7 +111,7 @@ length_t compress_packet(uint8_t *dest, const uint8_t *source, length_t len, int length_t uncompress_packet(uint8_t *dest, const uint8_t *source, length_t len, int level) { if(level > 9) { - lzo_uint lzolen = sizeof(lzo_wrkmem); + lzo_uint lzolen = MAXSIZE; if(lzo1x_decompress_safe(source, len, dest, &lzolen, NULL) == LZO_E_OK) return lzolen; else