diff options
author | Colin Watson <cjwatson@debian.org> | 2011-01-24 12:43:25 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2011-01-24 12:43:25 +0000 |
commit | 626f1d986ff72aa514da63e34744e1de9cf21b9a (patch) | |
tree | d215a5280bc2e57251e4a9e08bfd3674ad824a94 /readconf.h | |
parent | 6ed622cb6fe8f71bbe0d998cdd12280410bfb420 (diff) | |
parent | 0970072c89b079b022538e3c366fbfa2c53fc821 (diff) |
* New upstream release (http://www.openssh.org/txt/release-5.7):
- Implement Elliptic Curve Cryptography modes for key exchange (ECDH)
and host/user keys (ECDSA) as specified by RFC5656. ECDH and ECDSA
offer better performance than plain DH and DSA at the same equivalent
symmetric key length, as well as much shorter keys.
- sftp(1)/sftp-server(8): add a protocol extension to support a hard
link operation. It is available through the "ln" command in the
client. The old "ln" behaviour of creating a symlink is available
using its "-s" option or through the preexisting "symlink" command.
- scp(1): Add a new -3 option to scp: Copies between two remote hosts
are transferred through the local host (closes: #508613).
- ssh(1): "atomically" create the listening mux socket by binding it on
a temporary name and then linking it into position after listen() has
succeeded. This allows the mux clients to determine that the server
socket is either ready or stale without races (closes: #454784).
Stale server sockets are now automatically removed (closes: #523250).
- ssh(1): install a SIGCHLD handler to reap expired child process
(closes: #594687).
- ssh(1)/ssh-agent(1): honour $TMPDIR for client xauth and ssh-agent
temporary directories (closes: #357469, although only if you arrange
for ssh-agent to actually see $TMPDIR since the setgid bit will cause
it to be stripped off).
Diffstat (limited to 'readconf.h')
-rw-r--r-- | readconf.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/readconf.h b/readconf.h index cc341c9ba..c4391abe4 100644 --- a/readconf.h +++ b/readconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.h,v 1.86 2010/07/19 09:15:12 djm Exp $ */ | 1 | /* $OpenBSD: readconf.h,v 1.88 2010/11/13 23:27:50 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -51,6 +51,7 @@ typedef struct { | |||
51 | int gss_trust_dns; /* Trust DNS for GSS canonicalization */ | 51 | int gss_trust_dns; /* Trust DNS for GSS canonicalization */ |
52 | int gss_renewal_rekey; /* Credential renewal forces rekey */ | 52 | int gss_renewal_rekey; /* Credential renewal forces rekey */ |
53 | char *gss_client_identity; /* Principal to initiate GSSAPI with */ | 53 | char *gss_client_identity; /* Principal to initiate GSSAPI with */ |
54 | char *gss_server_identity; /* GSSAPI target principal */ | ||
54 | int password_authentication; /* Try password | 55 | int password_authentication; /* Try password |
55 | * authentication. */ | 56 | * authentication. */ |
56 | int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ | 57 | int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ |
@@ -64,6 +65,8 @@ typedef struct { | |||
64 | int compression_level; /* Compression level 1 (fast) to 9 | 65 | int compression_level; /* Compression level 1 (fast) to 9 |
65 | * (best). */ | 66 | * (best). */ |
66 | int tcp_keep_alive; /* Set SO_KEEPALIVE. */ | 67 | int tcp_keep_alive; /* Set SO_KEEPALIVE. */ |
68 | int ip_qos_interactive; /* IP ToS/DSCP/class for interactive */ | ||
69 | int ip_qos_bulk; /* IP ToS/DSCP/class for bulk traffic */ | ||
67 | LogLevel log_level; /* Level for logging. */ | 70 | LogLevel log_level; /* Level for logging. */ |
68 | 71 | ||
69 | int port; /* Port to connect. */ | 72 | int port; /* Port to connect. */ |
@@ -78,6 +81,7 @@ typedef struct { | |||
78 | char *ciphers; /* SSH2 ciphers in order of preference. */ | 81 | char *ciphers; /* SSH2 ciphers in order of preference. */ |
79 | char *macs; /* SSH2 macs in order of preference. */ | 82 | char *macs; /* SSH2 macs in order of preference. */ |
80 | char *hostkeyalgorithms; /* SSH2 server key types in order of preference. */ | 83 | char *hostkeyalgorithms; /* SSH2 server key types in order of preference. */ |
84 | char *kex_algorithms; /* SSH2 kex methods in order of preference. */ | ||
81 | int protocol; /* Protocol in order of preference. */ | 85 | int protocol; /* Protocol in order of preference. */ |
82 | char *hostname; /* Real host to connect. */ | 86 | char *hostname; /* Real host to connect. */ |
83 | char *host_key_alias; /* hostname alias for .ssh/known_hosts */ | 87 | char *host_key_alias; /* hostname alias for .ssh/known_hosts */ |