1 files changed, 81 insertions, 20 deletions

diff --git a/Makefile.in b/Makefile.in
index 06be3d5d5..40cc7aae1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -65,28 +65,33 @@ 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)
 
 LIBOPENSSH_OBJS=\
+        ssh_api.o \
         ssherr.o \
         sshbuf.o \
         sshkey.o \
         sshbuf-getput-basic.o \
         sshbuf-misc.o \
-        sshbuf-getput-crypto.o
+        sshbuf-getput-crypto.o \
+        krl.o \
+        bitmap.o
 
 LIBSSH_OBJS=${LIBOPENSSH_OBJS} \
-        authfd.o authfile.o bufaux.o bufbn.o buffer.o \
-        canohost.o channels.o cipher.o cipher-aes.o \
+        authfd.o authfile.o bufaux.o bufbn.o bufec.o buffer.o \
+        canohost.o channels.o cipher.o cipher-aes.o cipher-aesctr.o \
         cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \
-        compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \
-        log.o match.o md-sha256.o moduli.o nchan.o packet.o \
+        compat.o crc32.o deattack.o fatal.o hostfile.o \
+        log.o match.o md-sha256.o moduli.o nchan.o packet.o opacket.o \
         readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \
-        atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \
+        atomicio.o key.o dispatch.o mac.o uidswap.o uuencode.o misc.o \
         monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \
-        kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \
         msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.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-openssl.o hmac.o \
-        sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o blocks.o
+        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 \
+        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
 
 SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
         sshconnect.o sshconnect1.o sshconnect2.o mux.o \
@@ -99,8 +104,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
         auth-chall.o auth2-chall.o groupaccess.o \
         auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \
         auth2-none.o auth2-passwd.o auth2-pubkey.o \
-        monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o kexecdhs.o \
-        kexc25519s.o auth-krb5.o \
+        monitor_mm.o monitor.o monitor_wrap.o auth-krb5.o \
         auth2-gss.o gss-serv.o gss-serv-krb5.o \
         loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \
         sftp-server.o sftp-common.o \
@@ -230,6 +234,12 @@ clean:	regressclean
         rm -f regress/unittests/sshbuf/test_sshbuf
         rm -f regress/unittests/sshkey/*.o
         rm -f regress/unittests/sshkey/test_sshkey
+        rm -f regress/unittests/bitmap/*.o
+        rm -f regress/unittests/bitmap/test_bitmap
+        rm -f regress/unittests/hostkeys/*.o
+        rm -f regress/unittests/hostkeys/test_hostkeys
+        rm -f regress/unittests/kex/*.o
+        rm -f regress/unittests/kex/test_kex
         (cd openbsd-compat && $(MAKE) clean)
 
 distclean:      regressclean
@@ -244,6 +254,12 @@ distclean:	regressclean
         rm -f regress/unittests/sshbuf/test_sshbuf
         rm -f regress/unittests/sshkey/*.o
         rm -f regress/unittests/sshkey/test_sshkey
+        rm -f regress/unittests/bitmap/*.o
+        rm -f regress/unittests/bitmap/test_bitmap
+        rm -f regress/unittests/hostkeys/*.o
+        rm -f regress/unittests/hostkeys/test_hostkeys
+        rm -f regress/unittests/kex/*.o
+        rm -f regress/unittests/kex/test_kex
         (cd openbsd-compat && $(MAKE) distclean)
         if test -d pkg ; then \
                 rm -fr pkg ; \
@@ -417,15 +433,21 @@ uninstall:
         -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
 
 regress-prep:
-        [ -d `pwd`/regress ]  ||  mkdir -p `pwd`/regress
-        [ -d `pwd`/regress/unittests ]  ||  mkdir -p `pwd`/regress/unittests
-        [ -d `pwd`/regress/unittests/test_helper ]  || \
+        [ -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 ]  || \
+        [ -d `pwd`/regress/unittests/sshbuf ] || \
                 mkdir -p `pwd`/regress/unittests/sshbuf
-        [ -d `pwd`/regress/unittests/sshkey ]  || \
+        [ -d `pwd`/regress/unittests/sshkey ] || \
                 mkdir -p `pwd`/regress/unittests/sshkey
-        [ -f `pwd`/regress/Makefile ]  || \
+        [ -d `pwd`/regress/unittests/bitmap ] || \
+                mkdir -p `pwd`/regress/unittests/bitmap
+        [ -d `pwd`/regress/unittests/hostkeys ] || \
+                mkdir -p `pwd`/regress/unittests/hostkeys
+        [ -d `pwd`/regress/unittests/kex ] || \
+                mkdir -p `pwd`/regress/unittests/kex
+        [ -f `pwd`/regress/Makefile ] || \
             ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile
 
 regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c
@@ -436,6 +458,10 @@ regress/setuid-allowed$(EXEEXT): $(srcdir)/regress/setuid-allowed.c
         $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \
         $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
 
+regress/netcat$(EXEEXT): $(srcdir)/regress/netcat.c
+        $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \
+        $(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
@@ -473,11 +499,46 @@ regress/unittests/sshkey/test_sshkey$(EXEEXT): ${UNITTESTS_TEST_SSHKEY_OBJS} \
             regress/unittests/test_helper/libtest_helper.a \
             -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
 
+UNITTESTS_TEST_BITMAP_OBJS=\
+        regress/unittests/bitmap/tests.o
+
+regress/unittests/bitmap/test_bitmap$(EXEEXT): ${UNITTESTS_TEST_BITMAP_OBJS} \
+    regress/unittests/test_helper/libtest_helper.a libssh.a
+        $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_BITMAP_OBJS) \
+            regress/unittests/test_helper/libtest_helper.a \
+            -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
+
+UNITTESTS_TEST_KEX_OBJS=\
+        regress/unittests/kex/tests.o \
+        regress/unittests/kex/test_kex.o \
+        roaming_dummy.o
+
+regress/unittests/kex/test_kex$(EXEEXT): ${UNITTESTS_TEST_KEX_OBJS} \
+    regress/unittests/test_helper/libtest_helper.a libssh.a
+        $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_KEX_OBJS) \
+            regress/unittests/test_helper/libtest_helper.a \
+            -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
+
+UNITTESTS_TEST_HOSTKEYS_OBJS=\
+        regress/unittests/hostkeys/tests.o \
+        regress/unittests/hostkeys/test_iterate.o
+
+regress/unittests/hostkeys/test_hostkeys$(EXEEXT): \
+    ${UNITTESTS_TEST_HOSTKEYS_OBJS} \
+    regress/unittests/test_helper/libtest_helper.a libssh.a
+        $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_HOSTKEYS_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/netcat$(EXEEXT) \
         regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \
-        regress/unittests/sshkey/test_sshkey$(EXEEXT)
+        regress/unittests/sshkey/test_sshkey$(EXEEXT) \
+        regress/unittests/bitmap/test_bitmap$(EXEEXT) \
+        regress/unittests/hostkeys/test_hostkeys$(EXEEXT) \
+        regress/unittests/kex/test_kex$(EXEEXT)
 
 tests interop-tests t-exec: regress-prep $(TARGETS) $(REGRESS_BINARIES)
         BUILDDIR=`pwd`; \