diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:34:25 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:34:25 +0000 |
commit | fa585019a79ebcb4e0202b1c33f87ff1c5c9ce1c (patch) | |
tree | 28fc9a13eaab935e4de055b561b333d67387a934 /sftp-client.c | |
parent | 04942aa41fa94ec6f2c3ce1d348f600f31bb7c78 (diff) | |
parent | 3e2e0ac10674d77618c4c7339e18b83ced247492 (diff) |
import openssh-4.3p2-gsskex-20060223.patch
Diffstat (limited to 'sftp-client.c')
-rw-r--r-- | sftp-client.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sftp-client.c b/sftp-client.c index afbd1e6f3..05bce3368 100644 --- a/sftp-client.c +++ b/sftp-client.c | |||
@@ -20,7 +20,7 @@ | |||
20 | /* XXX: copy between two remote sites */ | 20 | /* XXX: copy between two remote sites */ |
21 | 21 | ||
22 | #include "includes.h" | 22 | #include "includes.h" |
23 | RCSID("$OpenBSD: sftp-client.c,v 1.57 2005/07/27 10:39:03 dtucker Exp $"); | 23 | RCSID("$OpenBSD: sftp-client.c,v 1.58 2006/01/02 01:20:31 djm Exp $"); |
24 | 24 | ||
25 | #include "openbsd-compat/sys-queue.h" | 25 | #include "openbsd-compat/sys-queue.h" |
26 | 26 | ||
@@ -42,9 +42,6 @@ extern int showprogress; | |||
42 | /* Minimum amount of data to read at at time */ | 42 | /* Minimum amount of data to read at at time */ |
43 | #define MIN_READ_SIZE 512 | 43 | #define MIN_READ_SIZE 512 |
44 | 44 | ||
45 | /* Maximum packet size */ | ||
46 | #define MAX_MSG_LENGTH (256 * 1024) | ||
47 | |||
48 | struct sftp_conn { | 45 | struct sftp_conn { |
49 | int fd_in; | 46 | int fd_in; |
50 | int fd_out; | 47 | int fd_out; |
@@ -59,7 +56,7 @@ send_msg(int fd, Buffer *m) | |||
59 | { | 56 | { |
60 | u_char mlen[4]; | 57 | u_char mlen[4]; |
61 | 58 | ||
62 | if (buffer_len(m) > MAX_MSG_LENGTH) | 59 | if (buffer_len(m) > SFTP_MAX_MSG_LENGTH) |
63 | fatal("Outbound message too long %u", buffer_len(m)); | 60 | fatal("Outbound message too long %u", buffer_len(m)); |
64 | 61 | ||
65 | /* Send length first */ | 62 | /* Send length first */ |
@@ -87,7 +84,7 @@ get_msg(int fd, Buffer *m) | |||
87 | } | 84 | } |
88 | 85 | ||
89 | msg_len = buffer_get_int(m); | 86 | msg_len = buffer_get_int(m); |
90 | if (msg_len > MAX_MSG_LENGTH) | 87 | if (msg_len > SFTP_MAX_MSG_LENGTH) |
91 | fatal("Received message too long %u", msg_len); | 88 | fatal("Received message too long %u", msg_len); |
92 | 89 | ||
93 | buffer_append_space(m, msg_len); | 90 | buffer_append_space(m, msg_len); |