1 files changed, 25 insertions, 8 deletions

diff --git a/Makefile.in b/Makefile.in
index 095f4ff32..b7de26f2e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.340 2013/06/11 01:26:10 dtucker Exp $
+# $Id: Makefile.in,v 1.352 2014/01/27 06:35:04 dtucker Exp $
 
 # uncomment if you run a non bourne compatable shell. Ie. csh
 #SHELL = @SH@
@@ -74,7 +74,10 @@ LIBSSH_OBJS=authfd.o authfile.o bufaux.o bufbn.o buffer.o \
         kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \
         kexgssc.o \
         msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \
-        jpake.o schnorr.o ssh-pkcs11.o krl.o
+        jpake.o schnorr.o ssh-pkcs11.o krl.o smult_curve25519_ref.o \
+        kexc25519.o kexc25519c.o poly1305.o chacha.o cipher-chachapoly.o \
+        ssh-ed25519.o digest.o \
+        sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o blocks.o
 
 SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
         sshconnect.o sshconnect1.o sshconnect2.o mux.o \
@@ -88,13 +91,13 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.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 kexecdhs.o \
-        auth-krb5.o \
-        auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o\
+        kexc25519s.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 \
         sftp-server.o sftp-common.o \
         roaming_common.o roaming_serv.o \
         sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o \
-        sandbox-seccomp-filter.o \
+        sandbox-seccomp-filter.o sandbox-capsicum.o \
         consolekit.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-keysign.8.out ssh-pkcs11-helper.8.out sshd_config.5.out ssh_config.5.out
@@ -114,6 +117,7 @@ PATHSUBS	= \
         -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|/etc/ssh/ssh_host_ed25519_key|$(sysconfdir)/ssh_host_ed25519_key|g' \
         -e 's|/var/run/sshd.pid|$(piddir)/sshd.pid|g' \
         -e 's|/etc/moduli|$(sysconfdir)/moduli|g' \
         -e 's|/etc/ssh/moduli|$(sysconfdir)/moduli|g' \
@@ -335,6 +339,11 @@ host-key: ssh-keygen$(EXEEXT)
                 else \
                         ./ssh-keygen -t rsa -f $(sysconfdir)/ssh_host_rsa_key -N "" ; \
                 fi ; \
+                if [ -f $(sysconfdir)/ssh_host_ed25519_key ] ; then \
+                        echo "$(sysconfdir)/ssh_host_ed25519_key already exists, skipping." ; \
+                else \
+                        ./ssh-keygen -t ed25519 -f $(sysconfdir)/ssh_host_ed25519_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." ; \
@@ -348,6 +357,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 ""
+        ./ssh-keygen -t ed25519 -f $(DESTDIR)$(sysconfdir)/ssh_host_ed25519_key -N ""
         test -z "@COMMENT_OUT_ECC@" && ./ssh-keygen -t ecdsa -f $(DESTDIR)$(sysconfdir)/ssh_host_ecdsa_key -N ""
 
 uninstallall:   uninstall
@@ -394,9 +404,17 @@ regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c
         $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \
         $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
 
+regress/setuid-allowed$(EXEEXT): $(srcdir)/regress/setuid-allowed.c
+        [ -d `pwd`/regress ]  ||  mkdir -p `pwd`/regress
+        [ -f `pwd`/regress/Makefile ]  || \
+            ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile
+        $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \
+        $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
+
 tests interop-tests:    $(TARGETS) regress/modpipe$(EXEEXT)
         BUILDDIR=`pwd`; \
         TEST_SHELL="@TEST_SHELL@"; \
+        TEST_SSH_SCP="$${BUILDDIR}/scp"; \
         TEST_SSH_SSH="$${BUILDDIR}/ssh"; \
         TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \
         TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \
@@ -411,7 +429,6 @@ tests interop-tests:	$(TARGETS) regress/modpipe$(EXEEXT)
         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" \
@@ -419,7 +436,9 @@ tests interop-tests:	$(TARGETS) regress/modpipe$(EXEEXT)
                 BUILDDIR="$${BUILDDIR}" \
                 OBJ="$${BUILDDIR}/regress/" \
                 PATH="$${BUILDDIR}:$${PATH}" \
+                TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \
                 TEST_SHELL="$${TEST_SHELL}" \
+                TEST_SSH_SCP="$${TEST_SSH_SCP}" \
                 TEST_SSH_SSH="$${TEST_SSH_SSH}" \
                 TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \
                 TEST_SSH_SSHAGENT="$${TEST_SSH_SSHAGENT}" \
@@ -434,7 +453,6 @@ tests interop-tests:	$(TARGETS) regress/modpipe$(EXEEXT)
                 TEST_SSH_CONCH="$${TEST_SSH_CONCH}" \
                 TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \
                 TEST_SSH_ECC="$${TEST_SSH_ECC}" \
-                TEST_SSH_SHA256="$${TEST_SSH_SHA256}" \
                 EXEEXT="$(EXEEXT)" \
                 $@ && echo all tests passed
 
@@ -459,4 +477,3 @@ package: $(CONFIGFILES) $(MANPAGES) $(TARGETS)
         if [ "@MAKE_PACKAGE_SUPPORTED@" = yes ]; then \
                 sh buildpkg.sh; \
         fi
-