* 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, 33 insertions, 18 deletions

diff --git a/Makefile.in b/Makefile.in
index 35f3e5e35..f51b86a27 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.310 2010/05/12 06:51:39 dtucker Exp $
+# $Id: Makefile.in,v 1.320 2011/01/17 10:15:29 dtucker Exp $
 
 # uncomment if you run a non bourne compatable shell. Ie. csh
 #SHELL = @SH@
@@ -60,6 +60,7 @@ ENT=@ENT@
 XAUTH_PATH=@XAUTH_PATH@
 LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@
 EXEEXT=@EXEEXT@
+MANFMT=@MANFMT@
 
 INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@
 INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@
@@ -73,26 +74,27 @@ LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \
         log.o match.o md-sha256.o moduli.o nchan.o packet.o \
         readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \
         atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \
-        monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \
-        kexgex.o kexdhc.o kexgexc.o msg.o progressmeter.o dns.o \
-        entropy.o gss-genr.o umac.o jpake.o schnorr.o \
-        ssh-pkcs11.o kexgssc.o
+        monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \
+        kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \
+        msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o jpake.o \
+        schnorr.o kexgssc.o ssh-pkcs11.o
 
 SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
         sshconnect.o sshconnect1.o sshconnect2.o mux.o \
         roaming_common.o roaming_client.o
 
 SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
+        audit.o audit-bsm.o audit-linux.o platform.o \
         sshpty.o sshlogin.o servconf.o serverloop.o \
         auth.o auth1.o auth2.o auth-options.o session.o \
         auth-chall.o auth2-chall.o groupaccess.o \
         auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \
         auth2-none.o auth2-passwd.o auth2-pubkey.o auth2-jpake.o \
-        monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o \
+        monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o kexecdhs.o \
         auth-krb5.o \
         auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o\
         loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \
-        audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o \
+        sftp-server.o sftp-common.o \
         roaming_common.o roaming_serv.o
 
 MANPAGES        = moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out ssh-pkcs11-helper.8.out ssh-vulnkey.1.out sshd_config.5.out ssh_config.5.out
@@ -110,6 +112,7 @@ PATHSUBS	= \
         -e 's|/usr/libexec|$(libexecdir)|g' \
         -e 's|/etc/shosts.equiv|$(sysconfdir)/shosts.equiv|g' \
         -e 's|/etc/ssh/ssh_host_key|$(sysconfdir)/ssh_host_key|g' \
+        -e 's|/etc/ssh/ssh_host_ecdsa_key|$(sysconfdir)/ssh_host_ecdsa_key|g' \
         -e 's|/etc/ssh/ssh_host_dsa_key|$(sysconfdir)/ssh_host_dsa_key|g' \
         -e 's|/etc/ssh/ssh_host_rsa_key|$(sysconfdir)/ssh_host_rsa_key|g' \
         -e 's|/var/run/sshd.pid|$(piddir)/sshd.pid|g' \
@@ -235,7 +238,7 @@ catman-do:
         @for f in $(MANPAGES_IN) ; do \
                 base=`echo $$f | sed 's/\..*$$//'` ; \
                 echo "$$f -> $$base.0" ; \
-                nroff -mandoc $$f | cat -v | sed -e 's/.\^H//g' \
+                $(MANFMT) $$f | cat -v | sed -e 's/.\^H//g' \
                         >$$base.0 ; \
         done
 
@@ -332,20 +335,27 @@ install-sysconf:
 
 host-key: ssh-keygen$(EXEEXT)
         @if [ -z "$(DESTDIR)" ] ; then \
-                if [ -f "$(DESTDIR)$(sysconfdir)/ssh_host_key" ] ; then \
-                        echo "$(DESTDIR)$(sysconfdir)/ssh_host_key already exists, skipping." ; \
+                if [ -f "$(sysconfdir)/ssh_host_key" ] ; then \
+                        echo "$(sysconfdir)/ssh_host_key already exists, skipping." ; \
                 else \
-                        ./ssh-keygen -t rsa1 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N "" ; \
+                        ./ssh-keygen -t rsa1 -f $(sysconfdir)/ssh_host_key -N "" ; \
                 fi ; \
-                if [ -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key ] ; then \
-                        echo "$(DESTDIR)$(sysconfdir)/ssh_host_dsa_key already exists, skipping." ; \
+                if [ -f $(sysconfdir)/ssh_host_dsa_key ] ; then \
+                        echo "$(sysconfdir)/ssh_host_dsa_key already exists, skipping." ; \
                 else \
-                        ./ssh-keygen -t dsa -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" ; \
+                        ./ssh-keygen -t dsa -f $(sysconfdir)/ssh_host_dsa_key -N "" ; \
                 fi ; \
-                if [ -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key ] ; then \
-                        echo "$(DESTDIR)$(sysconfdir)/ssh_host_rsa_key already exists, skipping." ; \
+                if [ -f $(sysconfdir)/ssh_host_rsa_key ] ; then \
+                        echo "$(sysconfdir)/ssh_host_rsa_key already exists, skipping." ; \
                 else \
-                        ./ssh-keygen -t rsa -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key -N "" ; \
+                        ./ssh-keygen -t rsa -f $(sysconfdir)/ssh_host_rsa_key -N "" ; \
+                fi ; \
+                if [ -z "@COMMENT_OUT_ECC@" ] ; then \
+                    if [ -f $(sysconfdir)/ssh_host_ecdsa_key ] ; then \
+                        echo "$(sysconfdir)/ssh_host_ecdsa_key already exists, skipping." ; \
+                    else \
+                        ./ssh-keygen -t ecdsa -f $(sysconfdir)/ssh_host_ecdsa_key -N "" ; \
+                    fi ; \
                 fi ; \
         fi ;
 
@@ -353,6 +363,7 @@ host-key-force: ssh-keygen$(EXEEXT)
         ./ssh-keygen -t rsa1 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N ""
         ./ssh-keygen -t dsa -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N ""
         ./ssh-keygen -t rsa -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key -N ""
+        test -z "@COMMENT_OUT_ECC@" && ./ssh-keygen -t ecdsa -f $(DESTDIR)$(sysconfdir)/ssh_host_ecdsa_key -N ""
 
 uninstallall:   uninstall
         -rm -f $(DESTDIR)$(sysconfdir)/ssh_config
@@ -415,6 +426,8 @@ tests interop-tests:	$(TARGETS)
         TEST_SSH_PUTTYGEN="puttygen"; \
         TEST_SSH_CONCH="conch"; \
         TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \
+        TEST_SSH_ECC="@TEST_SSH_ECC@" ; \
+        TEST_SSH_SHA256="@TEST_SSH_SHA256@" ; \
         cd $(srcdir)/regress || exit $$?; \
         $(MAKE) \
                 .OBJDIR="$${BUILDDIR}/regress" \
@@ -435,7 +448,9 @@ tests interop-tests:	$(TARGETS)
                 TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \
                 TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \
                 TEST_SSH_CONCH="$${TEST_SSH_CONCH}" \
-                TEST_SSH_IPV6="@TEST_SSH_IPV6@" \
+                TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \
+                TEST_SSH_ECC="$${TEST_SSH_ECC}" \
+                TEST_SSH_SHA256="$${TEST_SSH_SHA256}" \
                 EXEEXT="$(EXEEXT)" \
                 $@ && echo all tests passed