* 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, 11 insertions, 3 deletions

diff --git a/sshd.c b/sshd.c
index b58dd8f37..d351094d4 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.375 2010/04/16 01:47:26 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.381 2011/01/11 06:13:10 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -738,6 +738,7 @@ list_hostkey_types(void)
                 switch (key->type) {
                 case KEY_RSA:
                 case KEY_DSA:
+                case KEY_ECDSA:
                         if (buffer_len(&b) > 0)
                                 buffer_append(&b, ",", 1);
                         p = key_ssh_name(key);
@@ -753,6 +754,7 @@ list_hostkey_types(void)
                 case KEY_DSA_CERT_V00:
                 case KEY_RSA_CERT:
                 case KEY_DSA_CERT:
+                case KEY_ECDSA_CERT:
                         if (buffer_len(&b) > 0)
                                 buffer_append(&b, ",", 1);
                         p = key_ssh_name(key);
@@ -779,6 +781,7 @@ get_hostkey_by_type(int type, int need_private)
                 case KEY_DSA_CERT_V00:
                 case KEY_RSA_CERT:
                 case KEY_DSA_CERT:
+                case KEY_ECDSA_CERT:
                         key = sensitive_data.host_certificates[i];
                         break;
                 default:
@@ -1469,7 +1472,7 @@ main(int ac, char **av)
         else
                 closefrom(REEXEC_DEVCRYPTO_RESERVED_FD);
 
-        SSLeay_add_all_algorithms();
+        OpenSSL_add_all_algorithms();
 
         /*
          * Force logging to stderr until we have loaded the private host
@@ -1586,6 +1589,7 @@ main(int ac, char **av)
                         break;
                 case KEY_RSA:
                 case KEY_DSA:
+                case KEY_ECDSA:
                         sensitive_data.have_ssh2_key = 1;
                         break;
                 }
@@ -2090,7 +2094,8 @@ main(int ac, char **av)
         /* The connection has been terminated. */
         packet_get_state(MODE_IN, NULL, NULL, NULL, &ibytes);
         packet_get_state(MODE_OUT, NULL, NULL, NULL, &obytes);
-        verbose("Transferred: sent %llu, received %llu bytes", obytes, ibytes);
+        verbose("Transferred: sent %llu, received %llu bytes",
+            (unsigned long long)obytes, (unsigned long long)ibytes);
 
         verbose("Closing connection to %.500s port %d", remote_ip, remote_port);
 
@@ -2360,6 +2365,8 @@ do_ssh2_kex(void)
                 myproposal[PROPOSAL_COMP_ALGS_CTOS] =
                 myproposal[PROPOSAL_COMP_ALGS_STOC] = "none,zlib@openssh.com";
         }
+        if (options.kex_algorithms != NULL)
+                myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms;
 
         myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = list_hostkey_types();
 
@@ -2411,6 +2418,7 @@ do_ssh2_kex(void)
         kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server;
         kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;
         kex->kex[KEX_DH_GEX_SHA256] = kexgex_server;
+        kex->kex[KEX_ECDH_SHA2] = kexecdh_server;
 #ifdef GSSAPI
         if (options.gss_keyex) {
                 kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server;