1 files changed, 19 insertions, 12 deletions

diff --git a/Makefile.in b/Makefile.in
index 1afb4f798..0ee0285f6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# uncomment if you run a non bourne compatable shell. Ie. csh
+# uncomment if you run a non bourne compatible shell. Ie. csh
 #SHELL = @SH@
 
 AUTORECONF=autoreconf
@@ -84,13 +84,13 @@ LIBOPENSSH_OBJS=\
         ${XMSS_OBJS}
 
 LIBSSH_OBJS=${LIBOPENSSH_OBJS} \
-        authfd.o authfile.o bufaux.o bufbn.o bufec.o buffer.o \
+        authfd.o authfile.o \
         canohost.o channels.o cipher.o cipher-aes.o cipher-aesctr.o \
         cipher-ctr.o cleanup.o \
         compat.o crc32.o fatal.o hostfile.o \
         log.o match.o moduli.o nchan.o packet.o opacket.o \
         readpass.o ttymodes.o xmalloc.o addrmatch.o \
-        atomicio.o key.o dispatch.o mac.o uidswap.o uuencode.o misc.o utf8.o \
+        atomicio.o dispatch.o mac.o uuencode.o misc.o utf8.o \
         monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.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 \
@@ -111,7 +111,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o \
         sshpty.o sshlogin.o servconf.o serverloop.o \
         auth.o auth2.o auth-options.o session.o \
         auth2-chall.o groupaccess.o \
-        auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \
+        auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \
         auth2-none.o auth2-passwd.o auth2-pubkey.o \
         monitor.o monitor_wrap.o auth-krb5.o \
         auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o \
@@ -119,7 +119,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o \
         sftp-server.o sftp-common.o \
         sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o \
         sandbox-seccomp-filter.o sandbox-capsicum.o sandbox-pledge.o \
-        sandbox-solaris.o
+        sandbox-solaris.o uidswap.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
 MANPAGES_IN     = moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-keysign.8 ssh-pkcs11-helper.8 sshd_config.5 ssh_config.5
@@ -176,7 +176,7 @@ sshd$(EXEEXT): libssh.a	$(LIBCOMPAT) $(SSHDOBJS)
         $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) $(GSSLIBS) $(K5LIBS)
 
 scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o
-        $(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
+        $(LD) -o $@ scp.o progressmeter.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
 
 ssh-add$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-add.o
         $(LD) -o $@ ssh-add.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
@@ -187,8 +187,8 @@ ssh-agent$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-agent.o ssh-pkcs11-client.o
 ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o
         $(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
 
-ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o readconf.o
-        $(LD) -o $@ ssh-keysign.o readconf.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
+ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o readconf.o uidswap.o
+        $(LD) -o $@ ssh-keysign.o readconf.o uidswap.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
 
 ssh-pkcs11-helper$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-pkcs11-helper.o ssh-pkcs11.o
         $(LD) -o $@ ssh-pkcs11-helper.o ssh-pkcs11.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
@@ -231,6 +231,7 @@ clean:	regressclean
         rm -f *.o *.a $(TARGETS) logintest config.cache config.log
         rm -f *.out core survey
         rm -f regress/check-perm$(EXEEXT)
+        rm -f regress/mkdtemp$(EXEEXT)
         rm -f regress/unittests/test_helper/*.a
         rm -f regress/unittests/test_helper/*.o
         rm -f regress/unittests/sshbuf/*.o
@@ -259,6 +260,8 @@ distclean:	regressclean
         rm -f Makefile buildpkg.sh config.h config.status
         rm -f survey.sh openbsd-compat/regress/Makefile *~ 
         rm -rf autom4te.cache
+        rm -f regress/check-perm
+        rm -f regress/mkdtemp
         rm -f regress/unittests/test_helper/*.a
         rm -f regress/unittests/test_helper/*.o
         rm -f regress/unittests/sshbuf/*.o
@@ -277,7 +280,8 @@ distclean:	regressclean
         rm -f regress/unittests/match/test_match
         rm -f regress/unittests/utf8/*.o
         rm -f regress/unittests/utf8/test_utf8
-        rm -f regress/unittests/misc/kexfuzz
+        rm -f regress/misc/kexfuzz/*.o
+        rm -f regress/misc/kexfuzz
         (cd openbsd-compat && $(MAKE) distclean)
         if test -d pkg ; then \
                 rm -fr pkg ; \
@@ -461,6 +465,10 @@ regress/check-perm$(EXEEXT): $(srcdir)/regress/check-perm.c $(REGRESSLIBS)
         $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/regress/check-perm.c \
         $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
 
+regress/mkdtemp$(EXEEXT): $(srcdir)/regress/mkdtemp.c $(REGRESSLIBS)
+        $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/regress/mkdtemp.c \
+        $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
+
 UNITTESTS_TEST_HELPER_OBJS=\
         regress/unittests/test_helper/test_helper.o \
         regress/unittests/test_helper/fuzz.o
@@ -569,6 +577,7 @@ regress-binaries: regress/modpipe$(EXEEXT) \
         regress/setuid-allowed$(EXEEXT) \
         regress/netcat$(EXEEXT) \
         regress/check-perm$(EXEEXT) \
+        regress/mkdtemp$(EXEEXT) \
         regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \
         regress/unittests/sshkey/test_sshkey$(EXEEXT) \
         regress/unittests/bitmap/test_bitmap$(EXEEXT) \
@@ -579,8 +588,6 @@ 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"; \
@@ -604,7 +611,7 @@ tests interop-tests t-exec unit: regress-prep regress-binaries $(TARGETS)
                 .OBJDIR="$${BUILDDIR}/regress" \
                 .CURDIR="`pwd`" \
                 BUILDDIR="$${BUILDDIR}" \
-                OBJ="$(REGRESSTMP)" \
+                OBJ="$${BUILDDIR}/regress/" \
                 PATH="$${BUILDDIR}:$${PATH}" \
                 TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \
                 TEST_MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \