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 /readconf.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 'readconf.h')
-rw-r--r-- | readconf.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/readconf.h b/readconf.h index 42bfdf662..c3b2f96ee 100644 --- a/readconf.h +++ b/readconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.h,v 1.74 2008/06/26 11:46:31 grunk Exp $ */ | 1 | /* $OpenBSD: readconf.h,v 1.78 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> |
@@ -20,9 +20,9 @@ | |||
20 | 20 | ||
21 | typedef struct { | 21 | typedef struct { |
22 | char *listen_host; /* Host (address) to listen on. */ | 22 | char *listen_host; /* Host (address) to listen on. */ |
23 | u_short listen_port; /* Port to forward. */ | 23 | int listen_port; /* Port to forward. */ |
24 | char *connect_host; /* Host to connect. */ | 24 | char *connect_host; /* Host to connect. */ |
25 | u_short connect_port; /* Port to connect on connect_host. */ | 25 | int connect_port; /* Port to connect on connect_host. */ |
26 | } Forward; | 26 | } Forward; |
27 | /* Data structure for representing option data. */ | 27 | /* Data structure for representing option data. */ |
28 | 28 | ||
@@ -44,13 +44,16 @@ typedef struct { | |||
44 | int challenge_response_authentication; | 44 | int challenge_response_authentication; |
45 | /* Try S/Key or TIS, authentication. */ | 45 | /* Try S/Key or TIS, authentication. */ |
46 | int gss_authentication; /* Try GSS authentication */ | 46 | int gss_authentication; /* Try GSS authentication */ |
47 | int gss_keyex; /* Try GSS key exchange */ | 47 | int gss_keyex; /* Try GSS key exchange */ |
48 | int gss_deleg_creds; /* Delegate GSS credentials */ | 48 | int gss_deleg_creds; /* Delegate GSS credentials */ |
49 | int gss_trust_dns; /* Trust DNS for GSS canonicalization */ | 49 | int gss_trust_dns; /* Trust DNS for GSS canonicalization */ |
50 | int gss_renewal_rekey; /* Credential renewal forces rekey */ | ||
51 | char *gss_client_identity; /* Principal to initiate GSSAPI with */ | ||
50 | int password_authentication; /* Try password | 52 | int password_authentication; /* Try password |
51 | * authentication. */ | 53 | * authentication. */ |
52 | int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ | 54 | int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ |
53 | char *kbd_interactive_devices; /* Keyboard-interactive auth devices. */ | 55 | char *kbd_interactive_devices; /* Keyboard-interactive auth devices. */ |
56 | int zero_knowledge_password_authentication; /* Try jpake */ | ||
54 | int use_blacklisted_keys; /* If true, send */ | 57 | int use_blacklisted_keys; /* If true, send */ |
55 | int batch_mode; /* Batch mode: do not ask for passwords. */ | 58 | int batch_mode; /* Batch mode: do not ask for passwords. */ |
56 | int check_host_ip; /* Also keep track of keys for IP address */ | 59 | int check_host_ip; /* Also keep track of keys for IP address */ |
@@ -136,7 +139,7 @@ typedef struct { | |||
136 | void initialize_options(Options *); | 139 | void initialize_options(Options *); |
137 | void fill_default_options(Options *); | 140 | void fill_default_options(Options *); |
138 | int read_config_file(const char *, const char *, Options *, int); | 141 | int read_config_file(const char *, const char *, Options *, int); |
139 | int parse_forward(Forward *, const char *); | 142 | int parse_forward(Forward *, const char *, int, int); |
140 | 143 | ||
141 | int | 144 | int |
142 | process_config_line(Options *, const char *, char *, const char *, int, int *); | 145 | process_config_line(Options *, const char *, char *, const char *, int, int *); |