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 /sshconnect.c | |
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 'sshconnect.c')
-rw-r--r-- | sshconnect.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sshconnect.c b/sshconnect.c index 0e3001201..e7354486b 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect.c,v 1.211 2008/07/01 07:24:22 dtucker Exp $ */ | 1 | /* $OpenBSD: sshconnect.c,v 1.212 2008/10/14 18:11:33 stevesk Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -70,10 +70,6 @@ extern uid_t original_real_uid; | |||
70 | extern uid_t original_effective_uid; | 70 | extern uid_t original_effective_uid; |
71 | extern pid_t proxy_command_pid; | 71 | extern pid_t proxy_command_pid; |
72 | 72 | ||
73 | #ifndef INET6_ADDRSTRLEN /* for non IPv6 machines */ | ||
74 | #define INET6_ADDRSTRLEN 46 | ||
75 | #endif | ||
76 | |||
77 | static int show_other_keys(const char *, Key *); | 73 | static int show_other_keys(const char *, Key *); |
78 | static void warn_changed_key(Key *); | 74 | static void warn_changed_key(Key *); |
79 | 75 | ||
@@ -741,8 +737,8 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port, | |||
741 | if (options.host_key_alias == NULL && port != 0 && | 737 | if (options.host_key_alias == NULL && port != 0 && |
742 | port != SSH_DEFAULT_PORT) { | 738 | port != SSH_DEFAULT_PORT) { |
743 | debug("checking without port identifier"); | 739 | debug("checking without port identifier"); |
744 | if (check_host_key(hostname, hostaddr, 0, host_key, 2, | 740 | if (check_host_key(hostname, hostaddr, 0, host_key, |
745 | user_hostfile, system_hostfile) == 0) { | 741 | ROQUIET, user_hostfile, system_hostfile) == 0) { |
746 | debug("found matching key w/out port"); | 742 | debug("found matching key w/out port"); |
747 | break; | 743 | break; |
748 | } | 744 | } |