1 files changed, 80 insertions, 10 deletions

diff --git a/Makefile.in b/Makefile.in
index 7d192bb7c..4eab574a7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.356 2014/02/04 00:12:56 djm Exp $
+# $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@
@@ -29,6 +29,7 @@ SSH_PKCS11_HELPER=$(libexecdir)/ssh-pkcs11-helper
 PRIVSEP_PATH=@PRIVSEP_PATH@
 SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@
 STRIP_OPT=@STRIP_OPT@
+TEST_SHELL=@TEST_SHELL@
 
 PATHS= -DSSHDIR=\"$(sysconfdir)\" \
         -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \
@@ -63,7 +64,16 @@ MANFMT=@MANFMT@
 
 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)
 
-LIBSSH_OBJS=authfd.o authfile.o bufaux.o bufbn.o buffer.o \
+LIBOPENSSH_OBJS=\
+        ssherr.o \
+        sshbuf.o \
+        sshkey.o \
+        sshbuf-getput-basic.o \
+        sshbuf-misc.o \
+        sshbuf-getput-crypto.o
+
+LIBSSH_OBJS=${LIBOPENSSH_OBJS} \
+        authfd.o authfile.o bufaux.o bufbn.o buffer.o \
         canohost.o channels.o cipher.o cipher-aes.o \
         cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \
         compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \
@@ -137,7 +147,7 @@ $(SSHOBJS): Makefile.in config.h
 $(SSHDOBJS): Makefile.in config.h
 
 .c.o:
-        $(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+        $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
 
 LIBCOMPAT=openbsd-compat/libopenbsd-compat.a
 $(LIBCOMPAT): always
@@ -216,6 +226,12 @@ umac128.o:	umac.c
 clean:  regressclean
         rm -f *.o *.a $(TARGETS) logintest config.cache config.log
         rm -f *.out core survey
+        rm -f regress/unittests/test_helper/*.a
+        rm -f regress/unittests/test_helper/*.o
+        rm -f regress/unittests/sshbuf/*.o
+        rm -f regress/unittests/sshbuf/test_sshbuf
+        rm -f regress/unittests/sshkey/*.o
+        rm -f regress/unittests/sshkey/test_sshkey
         (cd openbsd-compat && $(MAKE) clean)
 
 distclean:      regressclean
@@ -224,6 +240,12 @@ 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/unittests/test_helper/*.a
+        rm -f regress/unittests/test_helper/*.o
+        rm -f regress/unittests/sshbuf/*.o
+        rm -f regress/unittests/sshbuf/test_sshbuf
+        rm -f regress/unittests/sshkey/*.o
+        rm -f regress/unittests/sshkey/test_sshkey
         (cd openbsd-compat && $(MAKE) distclean)
         if test -d pkg ; then \
                 rm -fr pkg ; \
@@ -397,23 +419,71 @@ uninstall:
         -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8
         -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
 
-regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c
+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
         [ -f `pwd`/regress/Makefile ]  || \
             ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile
+
+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) regress/setuid-allowed$(EXEEXT)
+UNITTESTS_TEST_HELPER_OBJS=\
+        regress/unittests/test_helper/test_helper.o \
+        regress/unittests/test_helper/fuzz.o
+
+regress/unittests/test_helper/libtest_helper.a: ${UNITTESTS_TEST_HELPER_OBJS}
+        $(AR) rv $@ $(UNITTESTS_TEST_HELPER_OBJS)
+        $(RANLIB) $@
+
+UNITTESTS_TEST_SSHBUF_OBJS=\
+        regress/unittests/sshbuf/tests.o \
+        regress/unittests/sshbuf/test_sshbuf.o \
+        regress/unittests/sshbuf/test_sshbuf_getput_basic.o \
+        regress/unittests/sshbuf/test_sshbuf_getput_crypto.o \
+        regress/unittests/sshbuf/test_sshbuf_misc.o \
+        regress/unittests/sshbuf/test_sshbuf_fuzz.o \
+        regress/unittests/sshbuf/test_sshbuf_getput_fuzz.o \
+        regress/unittests/sshbuf/test_sshbuf_fixed.o
+
+regress/unittests/sshbuf/test_sshbuf$(EXEEXT): ${UNITTESTS_TEST_SSHBUF_OBJS} \
+    regress/unittests/test_helper/libtest_helper.a libssh.a
+        $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_SSHBUF_OBJS) \
+            regress/unittests/test_helper/libtest_helper.a \
+            -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
+
+UNITTESTS_TEST_SSHKEY_OBJS=\
+        regress/unittests/sshkey/test_fuzz.o \
+        regress/unittests/sshkey/tests.o \
+        regress/unittests/sshkey/common.o \
+        regress/unittests/sshkey/test_file.o \
+        regress/unittests/sshkey/test_sshkey.o
+
+regress/unittests/sshkey/test_sshkey$(EXEEXT): ${UNITTESTS_TEST_SSHKEY_OBJS} \
+    regress/unittests/test_helper/libtest_helper.a libssh.a
+        $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_SSHKEY_OBJS) \
+            regress/unittests/test_helper/libtest_helper.a \
+            -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
+
+REGRESS_BINARIES=\
+        regress/modpipe$(EXEEXT) \
+        regress/setuid-allowed$(EXEEXT) \
+        regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \
+        regress/unittests/sshkey/test_sshkey$(EXEEXT)
+
+tests interop-tests t-exec: regress-prep $(TARGETS) $(REGRESS_BINARIES)
         BUILDDIR=`pwd`; \
-        TEST_SHELL="@TEST_SHELL@"; \
         TEST_SSH_SCP="$${BUILDDIR}/scp"; \
         TEST_SSH_SSH="$${BUILDDIR}/ssh"; \
         TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \
@@ -437,7 +507,6 @@ tests interop-tests:	$(TARGETS) regress/modpipe$(EXEEXT) regress/setuid-allowed$
                 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}" \
@@ -453,6 +522,7 @@ tests interop-tests:	$(TARGETS) regress/modpipe$(EXEEXT) regress/setuid-allowed$
                 TEST_SSH_CONCH="$${TEST_SSH_CONCH}" \
                 TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \
                 TEST_SSH_ECC="$${TEST_SSH_ECC}" \
+                TEST_SHELL="${TEST_SHELL}" \
                 EXEEXT="$(EXEEXT)" \
                 $@ && echo all tests passed