1 files changed, 30 insertions, 43 deletions

diff --git a/Makefile.in b/Makefile.in
index e7549470c..c9e4294d3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -103,7 +103,7 @@ LIBSSH_OBJS=${LIBOPENSSH_OBJS} \
         ssh-ed25519-sk.o ssh-rsa.o dh.o \
         msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \
         ssh-pkcs11.o smult_curve25519_ref.o \
-        poly1305.o chacha.o cipher-chachapoly.o \
+        poly1305.o chacha.o cipher-chachapoly.o cipher-chachapoly-libcrypto.o \
         ssh-ed25519.o digest-openssl.o digest-libc.o \
         hmac.o sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o \
         kex.o kexdh.o kexgex.o kexecdh.o kexc25519.o \
@@ -350,11 +350,15 @@ depend: depend-rebuild
         rm -f .depend.bak
 
 depend-rebuild:
-        rm -f config.h
-        touch config.h
+        mv .depend .depend.old
+        rm -f config.h .depend
+        touch config.h .depend
         makedepend -w1000 -Y. -f .depend *.c 2>/dev/null
-        (head -2 .depend; tail +3 .depend | sort) >.depend.tmp
+        (echo '# Automatically generated by makedepend.'; \
+         echo '# Run "make depend" to rebuild.'; sort .depend ) >.depend.tmp
         mv .depend.tmp .depend
+        rm -f .depend.bak
+        mv .depend.old .depend.bak
         rm -f config.h
 
 depend-check: depend-rebuild
@@ -631,6 +635,8 @@ SK_DUMMY_OBJS=\
         regress/misc/sk-dummy/fatal.lo \
         ed25519.lo hash.lo ge25519.lo fe25519.lo sc25519.lo verify.lo
 
+SK_DUMMY_LIBRARY=@SK_DUMMY_LIBRARY@
+
 .c.lo: Makefile.in config.h
         $(CC) $(CFLAGS_NOPIE) $(PICFLAG) $(CPPFLAGS) -c $< -o $@
 
@@ -644,7 +650,7 @@ regress-binaries: regress-prep $(LIBCOMPAT) \
         regress/netcat$(EXEEXT) \
         regress/check-perm$(EXEEXT) \
         regress/mkdtemp$(EXEEXT) \
-        regress/misc/sk-dummy/sk-dummy.so
+        $(SK_DUMMY_LIBRARY)
 
 regress-unit-binaries: regress-prep $(REGRESSLIBS) \
         regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \
@@ -670,27 +676,8 @@ unit: regress-unit-binaries
 
 interop-tests t-exec file-tests: regress-prep regress-binaries $(TARGETS)
         BUILDDIR=`pwd`; \
-        TEST_SSH_SCP="$${BUILDDIR}/scp"; \
-        TEST_SSH_SSH="$${BUILDDIR}/ssh"; \
-        TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \
-        TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \
-        TEST_SSH_SSHADD="$${BUILDDIR}/ssh-add"; \
-        TEST_SSH_SSHKEYGEN="$${BUILDDIR}/ssh-keygen"; \
-        TEST_SSH_SSHPKCS11HELPER="$${BUILDDIR}/ssh-pkcs11-helper"; \
-        TEST_SSH_SSHSKHELPER="$${BUILDDIR}/ssh-sk-helper"; \
-        TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan"; \
-        TEST_SSH_SFTP="$${BUILDDIR}/sftp"; \
-        TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \
-        TEST_SSH_PKCS11_HELPER="$${BUILDDIR}/ssh-pkcs11-helper"; \
-        TEST_SSH_SK_HELPER="$${BUILDDIR}/ssh-sk-helper"; \
-        TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \
-        TEST_SSH_PLINK="plink"; \
-        TEST_SSH_PUTTYGEN="puttygen"; \
-        TEST_SSH_CONCH="conch"; \
-        TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \
-        TEST_SSH_UTF8="@TEST_SSH_UTF8@" ; \
-        TEST_SSH_ECC="@TEST_SSH_ECC@" ; \
         cd $(srcdir)/regress || exit $$?; \
+        EGREP='@EGREP@' \
         $(MAKE) \
                 .OBJDIR="$${BUILDDIR}/regress" \
                 .CURDIR="`pwd`" \
@@ -699,24 +686,24 @@ interop-tests t-exec file-tests: regress-prep regress-binaries $(TARGETS)
                 PATH="$${BUILDDIR}:$${PATH}" \
                 TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \
                 TEST_MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \
-                TEST_SSH_SCP="$${TEST_SSH_SCP}" \
-                TEST_SSH_SSH="$${TEST_SSH_SSH}" \
-                TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \
-                TEST_SSH_SSHAGENT="$${TEST_SSH_SSHAGENT}" \
-                TEST_SSH_SSHADD="$${TEST_SSH_SSHADD}" \
-                TEST_SSH_SSHKEYGEN="$${TEST_SSH_SSHKEYGEN}" \
-                TEST_SSH_SSHPKCS11HELPER="$${TEST_SSH_SSHPKCS11HELPER}" \
-                TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \
-                TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \
-                TEST_SSH_PKCS11_HELPER="$${TEST_SSH_PKCS11_HELPER}" \
-                TEST_SSH_SK_HELPER="$${TEST_SSH_SK_HELPER}" \
-                TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \
-                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_UTF8="$${TEST_SSH_UTF8}" \
-                TEST_SSH_ECC="$${TEST_SSH_ECC}" \
+                TEST_SSH_SCP="$${BUILDDIR}/scp" \
+                TEST_SSH_SSH="$${BUILDDIR}/ssh" \
+                TEST_SSH_SSHD="$${BUILDDIR}/sshd" \
+                TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent" \
+                TEST_SSH_SSHADD="$${BUILDDIR}/ssh-add" \
+                TEST_SSH_SSHKEYGEN="$${BUILDDIR}/ssh-keygen" \
+                TEST_SSH_SSHPKCS11HELPER="$${BUILDDIR}/ssh-pkcs11-helper" \
+                TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan" \
+                TEST_SSH_SFTP="$${BUILDDIR}/sftp" \
+                TEST_SSH_PKCS11_HELPER="$${BUILDDIR}/ssh-pkcs11-helper" \
+                TEST_SSH_SK_HELPER="$${BUILDDIR}/ssh-sk-helper" \
+                TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server" \
+                TEST_SSH_PLINK="plink" \
+                TEST_SSH_PUTTYGEN="puttygen" \
+                TEST_SSH_CONCH="conch" \
+                TEST_SSH_IPV6="@TEST_SSH_IPV6@" \
+                TEST_SSH_UTF8="@TEST_SSH_UTF8@" \
+                TEST_SSH_ECC="@TEST_SSH_ECC@" \
                 TEST_SHELL="${TEST_SHELL}" \
                 EXEEXT="$(EXEEXT)" \
                 $@ && echo all $@ passed