From 58256dbc0b6f4c1875289274a95f4bd335be07e5 Mon Sep 17 00:00:00 2001 From: des Date: Sun, 24 Jan 2016 15:44:57 +0000 Subject: MFH (r263234, r263691, r266465, r290671, r290672, r290673, r290674, r294320, r294322, r294324, r294330, r294469, r294494, r294466) Reduce diffs to head in preparation for removing HPN and None. --- crypto/openssh/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crypto/openssh/buffer.c') diff --git a/crypto/openssh/buffer.c b/crypto/openssh/buffer.c index 95bbf0c..f20d558 100644 --- a/crypto/openssh/buffer.c +++ b/crypto/openssh/buffer.c @@ -1,5 +1,4 @@ /* $OpenBSD: buffer.c,v 1.35 2014/02/02 03:44:31 djm Exp $ */ -/* $FreeBSD$ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -14,6 +13,7 @@ */ #include "includes.h" +__RCSID("$FreeBSD$"); #include -- cgit v1.1 From fb40ebd67a2ae7631091b91a90bb80648527fc71 Mon Sep 17 00:00:00 2001 From: des Date: Sun, 24 Jan 2016 22:28:18 +0000 Subject: MFH (r291198, r291260, r291261, r291375, r294325, r294335, r294563) Remove the HPN and None cipher patches. --- crypto/openssh/buffer.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'crypto/openssh/buffer.c') diff --git a/crypto/openssh/buffer.c b/crypto/openssh/buffer.c index f20d558..d240f67 100644 --- a/crypto/openssh/buffer.c +++ b/crypto/openssh/buffer.c @@ -13,7 +13,6 @@ */ #include "includes.h" -__RCSID("$FreeBSD$"); #include @@ -27,7 +26,7 @@ __RCSID("$FreeBSD$"); #include "log.h" #define BUFFER_MAX_CHUNK 0x100000 -#define BUFFER_MAX_LEN 0x4000000 /* 64MB */ +#define BUFFER_MAX_LEN 0xa00000 #define BUFFER_ALLOCSZ 0x008000 /* Initializes the buffer structure. */ @@ -167,13 +166,6 @@ buffer_len(const Buffer *buffer) return buffer->end - buffer->offset; } -/* Returns the maximum number of bytes of data that may be in the buffer. */ -u_int -buffer_get_max_len(void) -{ - return (BUFFER_MAX_LEN); -} - /* Gets data from the beginning of the buffer. */ int -- cgit v1.1