* 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).

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 @@
-/* $OpenBSD: readconf.h,v 1.86 2010/07/19 09:15:12 djm Exp $ */
+/* $OpenBSD: readconf.h,v 1.88 2010/11/13 23:27:50 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -51,6 +51,7 @@ typedef struct {
         int     gss_trust_dns;          /* Trust DNS for GSS canonicalization */
         int     gss_renewal_rekey;      /* Credential renewal forces rekey */
         char    *gss_client_identity;   /* Principal to initiate GSSAPI with */
+        char    *gss_server_identity;   /* GSSAPI target principal */
         int     password_authentication;        /* Try password
                                                  * authentication. */
         int     kbd_interactive_authentication; /* Try keyboard-interactive auth. */
@@ -64,6 +65,8 @@ typedef struct {
         int     compression_level;      /* Compression level 1 (fast) to 9
                                          * (best). */
         int     tcp_keep_alive; /* Set SO_KEEPALIVE. */
+        int     ip_qos_interactive;     /* IP ToS/DSCP/class for interactive */
+        int     ip_qos_bulk;            /* IP ToS/DSCP/class for bulk traffic */
         LogLevel log_level;     /* Level for logging. */
 
         int     port;           /* Port to connect. */
@@ -78,6 +81,7 @@ typedef struct {
         char   *ciphers;        /* SSH2 ciphers in order of preference. */
         char   *macs;           /* SSH2 macs in order of preference. */
         char   *hostkeyalgorithms;      /* SSH2 server key types in order of preference. */
+        char   *kex_algorithms; /* SSH2 kex methods in order of preference. */
         int     protocol;       /* Protocol in order of preference. */
         char   *hostname;       /* Real host to connect. */
         char   *host_key_alias; /* hostname alias for .ssh/known_hosts */