diff options
author | Colin Watson <cjwatson@debian.org> | 2010-01-01 23:53:30 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-01-01 23:53:30 +0000 |
commit | df03186a4f9e0c2ece398b5c0571cb6263d7a752 (patch) | |
tree | 1aab079441dff9615274769b19f2d734ddf508dd /channels.h | |
parent | 6ad6994c288662fca6949f42bf91fec2aff00bca (diff) | |
parent | 99b402ea4c8457b0a3cafff37f5b3410a8dc6476 (diff) |
* New upstream release (closes: #536182). Yes, I know 5.3p1 has been out
for a while, but there's no GSSAPI patch available for it yet.
- Change the default cipher order to prefer the AES CTR modes and the
revised "arcfour256" mode to CBC mode ciphers that are susceptible to
CPNI-957037 "Plaintext Recovery Attack Against SSH".
- Add countermeasures to mitigate CPNI-957037-style attacks against the
SSH protocol's use of CBC-mode ciphers. Upon detection of an invalid
packet length or Message Authentication Code, ssh/sshd will continue
reading up to the maximum supported packet length rather than
immediately terminating the connection. This eliminates most of the
known differences in behaviour that leaked information about the
plaintext of injected data which formed the basis of this attack
(closes: #506115, LP: #379329).
- ForceCommand directive now accepts commandline arguments for the
internal-sftp server (closes: #524423, LP: #362511).
- Add AllowAgentForwarding to available Match keywords list (closes:
#540623).
- Make ssh(1) send the correct channel number for
SSH2_MSG_CHANNEL_SUCCESS and SSH2_MSG_CHANNEL_FAILURE messages to
avoid triggering 'Non-public channel' error messages on sshd(8) in
openssh-5.1.
- Avoid printing 'Non-public channel' warnings in sshd(8), since the
ssh(1) has sent incorrect channel numbers since ~2004 (this reverts a
behaviour introduced in openssh-5.1; closes: #496017).
* Update to GSSAPI patch from
http://www.sxw.org.uk/computing/patches/openssh-5.2p1-gsskex-all-20090726.patch,
including cascading credentials support (LP: #416958).
Diffstat (limited to 'channels.h')
-rw-r--r-- | channels.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/channels.h b/channels.h index 108b36068..1488ed7e5 100644 --- a/channels.h +++ b/channels.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.h,v 1.96 2008/06/15 20:06:26 djm Exp $ */ | 1 | /* $OpenBSD: channels.h,v 1.98 2009/02/12 03:00:56 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -55,8 +55,6 @@ | |||
55 | #define SSH_CHANNEL_ZOMBIE 14 /* Almost dead. */ | 55 | #define SSH_CHANNEL_ZOMBIE 14 /* Almost dead. */ |
56 | #define SSH_CHANNEL_MAX_TYPE 15 | 56 | #define SSH_CHANNEL_MAX_TYPE 15 |
57 | 57 | ||
58 | #define SSH_CHANNEL_PATH_LEN 256 | ||
59 | |||
60 | struct Channel; | 58 | struct Channel; |
61 | typedef struct Channel Channel; | 59 | typedef struct Channel Channel; |
62 | 60 | ||
@@ -105,7 +103,7 @@ struct Channel { | |||
105 | Buffer output; /* data received over encrypted connection for | 103 | Buffer output; /* data received over encrypted connection for |
106 | * send on socket */ | 104 | * send on socket */ |
107 | Buffer extended; | 105 | Buffer extended; |
108 | char path[SSH_CHANNEL_PATH_LEN]; | 106 | char *path; |
109 | /* path for unix domain sockets, or host name for forwards */ | 107 | /* path for unix domain sockets, or host name for forwards */ |
110 | int listening_port; /* port being listened for forwards */ | 108 | int listening_port; /* port being listened for forwards */ |
111 | int host_port; /* remote port to connect for forwards */ | 109 | int host_port; /* remote port to connect for forwards */ |
@@ -247,7 +245,7 @@ int channel_request_remote_forwarding(const char *, u_short, | |||
247 | int channel_setup_local_fwd_listener(const char *, u_short, | 245 | int channel_setup_local_fwd_listener(const char *, u_short, |
248 | const char *, u_short, int); | 246 | const char *, u_short, int); |
249 | void channel_request_rforward_cancel(const char *host, u_short port); | 247 | void channel_request_rforward_cancel(const char *host, u_short port); |
250 | int channel_setup_remote_fwd_listener(const char *, u_short, int); | 248 | int channel_setup_remote_fwd_listener(const char *, u_short, int *, int); |
251 | int channel_cancel_rport_listener(const char *, u_short); | 249 | int channel_cancel_rport_listener(const char *, u_short); |
252 | 250 | ||
253 | /* x11 forwarding */ | 251 | /* x11 forwarding */ |