aboutsummaryrefslogtreecommitdiff
path: root/crypto/openssh/sftp-client.c
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2006-03-22 19:46:12 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2006-03-22 19:46:12 +0000
commit021d409f5beb1827f72d24f171e3c3ed233ed62a (patch)
tree42b3633dec62ddc0b702c6e83df5d64683b1c6c3 /crypto/openssh/sftp-client.c
parent043840df5be0cf8490b48a08fe6d9c316f473f58 (diff)
downloadsrc-021d409f5beb1827f72d24f171e3c3ed233ed62a.tar.gz
src-021d409f5beb1827f72d24f171e3c3ed233ed62a.zip
Vendor import of OpenSSH 4.3p1.
Notes
Notes: svn path=/vendor-crypto/openssh/dist/; revision=157016
Diffstat (limited to 'crypto/openssh/sftp-client.c')
-rw-r--r--crypto/openssh/sftp-client.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/crypto/openssh/sftp-client.c b/crypto/openssh/sftp-client.c
index afbd1e6f3784..05bce3368ea8 100644
--- a/crypto/openssh/sftp-client.c
+++ b/crypto/openssh/sftp-client.c
@@ -20,7 +20,7 @@
/* XXX: copy between two remote sites */
#include "includes.h"
-RCSID("$OpenBSD: sftp-client.c,v 1.57 2005/07/27 10:39:03 dtucker Exp $");
+RCSID("$OpenBSD: sftp-client.c,v 1.58 2006/01/02 01:20:31 djm Exp $");
#include "openbsd-compat/sys-queue.h"
@@ -42,9 +42,6 @@ extern int showprogress;
/* Minimum amount of data to read at at time */
#define MIN_READ_SIZE 512
-/* Maximum packet size */
-#define MAX_MSG_LENGTH (256 * 1024)
-
struct sftp_conn {
int fd_in;
int fd_out;
@@ -59,7 +56,7 @@ send_msg(int fd, Buffer *m)
{
u_char mlen[4];
- if (buffer_len(m) > MAX_MSG_LENGTH)
+ if (buffer_len(m) > SFTP_MAX_MSG_LENGTH)
fatal("Outbound message too long %u", buffer_len(m));
/* Send length first */
@@ -87,7 +84,7 @@ get_msg(int fd, Buffer *m)
}
msg_len = buffer_get_int(m);
- if (msg_len > MAX_MSG_LENGTH)
+ if (msg_len > SFTP_MAX_MSG_LENGTH)
fatal("Received message too long %u", msg_len);
buffer_append_space(m, msg_len);