1 files changed, 50 insertions, 51 deletions

diff --git a/Makefile.in b/Makefile.in
index 08b989a4d..1afb4f798 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,3 @@
-# $Id: Makefile.in,v 1.365 2014/08/30 06:23:07 djm Exp $
-
 # uncomment if you run a non bourne compatable shell. Ie. csh
 #SHELL = @SH@
 
@@ -54,16 +52,25 @@ AR=@AR@
 AWK=@AWK@
 RANLIB=@RANLIB@
 INSTALL=@INSTALL@
-PERL=@PERL@
 SED=@SED@
 ENT=@ENT@
 XAUTH_PATH=@XAUTH_PATH@
 LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@
 EXEEXT=@EXEEXT@
 MANFMT=@MANFMT@
+MKDIR_P=@MKDIR_P@
 
 TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT)
 
+XMSS_OBJS=\
+        ssh-xmss.o \
+        sshkey-xmss.o \
+        xmss_commons.o \
+        xmss_fast.o \
+        xmss_hash.o \
+        xmss_hash_address.o \
+        xmss_wots.o
+
 LIBOPENSSH_OBJS=\
         ssh_api.o \
         ssherr.o \
@@ -73,7 +80,8 @@ LIBOPENSSH_OBJS=\
         sshbuf-misc.o \
         sshbuf-getput-crypto.o \
         krl.o \
-        bitmap.o
+        bitmap.o \
+        ${XMSS_OBJS}
 
 LIBSSH_OBJS=${LIBOPENSSH_OBJS} \
         authfd.o authfile.o bufaux.o bufbn.o bufec.o buffer.o \
@@ -88,7 +96,7 @@ LIBSSH_OBJS=${LIBOPENSSH_OBJS} \
         ssh-pkcs11.o smult_curve25519_ref.o \
         poly1305.o chacha.o cipher-chachapoly.o \
         ssh-ed25519.o digest-openssl.o digest-libc.o hmac.o \
-        sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o blocks.o \
+        sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o \
         kex.o kexdh.o kexgex.o kexecdh.o kexc25519.o \
         kexdhc.o kexgexc.o kexecdhc.o kexc25519c.o \
         kexdhs.o kexgexs.o kexecdhs.o kexc25519s.o \
@@ -219,13 +227,6 @@ $(CONFIGFILES): $(CONFIGFILES_IN)
 moduli:
         echo
 
-# special case target for umac128
-umac128.o:      umac.c
-        $(CC) $(CFLAGS) $(CPPFLAGS) -o umac128.o -c $(srcdir)/umac.c \
-            -DUMAC_OUTPUT_LEN=16 -Dumac_new=umac128_new \
-            -Dumac_update=umac128_update -Dumac_final=umac128_final \
-            -Dumac_delete=umac128_delete -Dumac_ctx=umac128_ctx
-
 clean:  regressclean
         rm -f *.o *.a $(TARGETS) logintest config.cache config.log
         rm -f *.out core survey
@@ -299,9 +300,21 @@ catman-do:
                         >$$base.0 ; \
         done
 
-distprep: catman-do
+depend: depend-rebuild
+        rm -f .depend.bak
+
+depend-rebuild:
+        rm -f config.h
+        touch config.h
+        makedepend -w1000 -Y. -f .depend *.c 2>/dev/null
+        rm -f config.h
+
+depend-check: depend-rebuild
+        cmp .depend .depend.bak || (echo .depend stale && exit 1)
+
+distprep: catman-do depend-check
         $(AUTORECONF)
-        -rm -rf autom4te.cache
+        -rm -rf autom4te.cache .depend.bak
 
 install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config
 install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf
@@ -311,14 +324,13 @@ check-config:
         -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config
 
 install-files:
-        $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
-        $(srcdir)/mkinstalldirs $(DESTDIR)$(sbindir)
-        $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)
-        $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1
-        $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)5
-        $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8
-        $(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)
-        (umask 022 ; $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH))
+        $(MKDIR_P) $(DESTDIR)$(bindir)
+        $(MKDIR_P) $(DESTDIR)$(sbindir)
+        $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)1
+        $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
+        $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
+        $(MKDIR_P) $(DESTDIR)$(libexecdir)
+        $(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH)
         $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
         $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)
         $(INSTALL) -m 0755 $(STRIP_OPT) ssh-add$(EXEEXT) $(DESTDIR)$(bindir)/ssh-add$(EXEEXT)
@@ -347,9 +359,7 @@ install-files:
         $(INSTALL) -m 644 ssh-pkcs11-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8
 
 install-sysconf:
-        if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
-                $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
-        fi
+        $(MKDIR_P) $(DESTDIR)$(sysconfdir)
         @if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \
                 $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \
         else \
@@ -377,9 +387,6 @@ host-key: ssh-keygen$(EXEEXT)
         fi
 
 host-key-force: ssh-keygen$(EXEEXT) ssh$(EXEEXT)
-        if ./ssh -Q protocol-version | grep '^1$$' >/dev/null; then \
-                ./ssh-keygen -t rsa1 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N ""; \
-        fi
         ./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 ""
@@ -423,28 +430,16 @@ uninstall:
         -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8
 
 regress-prep:
-        [ -d `pwd`/regress ] || mkdir -p `pwd`/regress
-        [ -d `pwd`/regress/unittests ] || mkdir -p `pwd`/regress/unittests
-        [ -d `pwd`/regress/unittests/test_helper ] || \
-                mkdir -p `pwd`/regress/unittests/test_helper
-        [ -d `pwd`/regress/unittests/sshbuf ] || \
-                mkdir -p `pwd`/regress/unittests/sshbuf
-        [ -d `pwd`/regress/unittests/sshkey ] || \
-                mkdir -p `pwd`/regress/unittests/sshkey
-        [ -d `pwd`/regress/unittests/bitmap ] || \
-                mkdir -p `pwd`/regress/unittests/bitmap
-        [ -d `pwd`/regress/unittests/conversion ] || \
-                mkdir -p `pwd`/regress/unittests/conversion
-        [ -d `pwd`/regress/unittests/hostkeys ] || \
-                mkdir -p `pwd`/regress/unittests/hostkeys
-        [ -d `pwd`/regress/unittests/kex ] || \
-                mkdir -p `pwd`/regress/unittests/kex
-        [ -d `pwd`/regress/unittests/match ] || \
-                mkdir -p `pwd`/regress/unittests/match
-        [ -d `pwd`/regress/unittests/utf8 ] || \
-                mkdir -p `pwd`/regress/unittests/utf8
-        [ -d `pwd`/regress/misc/kexfuzz ] || \
-                mkdir -p `pwd`/regress/misc/kexfuzz
+        $(MKDIR_P) `pwd`/regress/unittests/test_helper
+        $(MKDIR_P) `pwd`/regress/unittests/sshbuf
+        $(MKDIR_P) `pwd`/regress/unittests/sshkey
+        $(MKDIR_P) `pwd`/regress/unittests/bitmap
+        $(MKDIR_P) `pwd`/regress/unittests/conversion
+        $(MKDIR_P) `pwd`/regress/unittests/hostkeys
+        $(MKDIR_P) `pwd`/regress/unittests/kex
+        $(MKDIR_P) `pwd`/regress/unittests/match
+        $(MKDIR_P) `pwd`/regress/unittests/utf8
+        $(MKDIR_P) `pwd`/regress/misc/kexfuzz
         [ -f `pwd`/regress/Makefile ] || \
             ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile
 
@@ -584,6 +579,8 @@ regress-binaries: regress/modpipe$(EXEEXT) \
         regress/unittests/utf8/test_utf8$(EXEEXT) \
         regress/misc/kexfuzz/kexfuzz$(EXEEXT)
 
+REGRESSTMP = "$(PWD)/regress"
+
 tests interop-tests t-exec unit: regress-prep regress-binaries $(TARGETS)
         BUILDDIR=`pwd`; \
         TEST_SSH_SCP="$${BUILDDIR}/scp"; \
@@ -607,7 +604,7 @@ tests interop-tests t-exec unit: regress-prep regress-binaries $(TARGETS)
                 .OBJDIR="$${BUILDDIR}/regress" \
                 .CURDIR="`pwd`" \
                 BUILDDIR="$${BUILDDIR}" \
-                OBJ="$${BUILDDIR}/regress/" \
+                OBJ="$(REGRESSTMP)" \
                 PATH="$${BUILDDIR}:$${PATH}" \
                 TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \
                 TEST_MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \
@@ -652,3 +649,5 @@ package: $(CONFIGFILES) $(MANPAGES) $(TARGETS)
         if [ "@MAKE_PACKAGE_SUPPORTED@" = yes ]; then \
                 sh buildpkg.sh; \
         fi
+
+# @DEPEND@