1 files changed, 38 insertions, 9 deletions

diff --git a/regress/Makefile b/regress/Makefile
index 3feb7a997..99a7d60f5 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,11 +1,14 @@
-#       $OpenBSD: Makefile,v 1.70 2014/06/24 01:14:17 djm Exp $
+#       $OpenBSD: Makefile,v 1.78 2015/01/26 06:12:18 djm Exp $
 
-REGRESS_TARGETS=        unit t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t-exec
-tests:          $(REGRESS_TARGETS)
+REGRESS_TARGETS=        unit t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t-exec
+tests:          prep $(REGRESS_TARGETS)
 
 # Interop tests are not run by default
 interop interop-tests: t-exec-interop
 
+prep:
+        test "x${USE_VALGRIND}" = "x" || mkdir -p $(OBJ)/valgrind-out
+
 clean:
         for F in $(CLEANFILES); do rm -f $(OBJ)$$F; done
         test -z "${SUDO}" || ${SUDO} rm -f ${SUDO_CLEAN}
@@ -64,7 +67,14 @@ LTESTS= 	connect \
                 keys-command \
                 forward-control \
                 integrity \
-                krl
+                krl \
+                multipubkey \
+                limit-keytype \
+                hostkey-agent \
+                keygen-knownhosts \
+                hostkey-rotate
+
+
 #               dhgex \
 
 INTEROP_TESTS=  putty-transfer putty-ciphers putty-kex conch-ciphers
@@ -75,6 +85,7 @@ INTEROP_TESTS=	putty-transfer putty-ciphers putty-kex conch-ciphers
 USER!=          id -un
 CLEANFILES=     t2.out t3.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
                 t8.out t8.out.pub t9.out t9.out.pub t10.out t10.out.pub \
+                t12.out t12.out.pub \
                 authorized_keys_${USER} known_hosts pidfile testdata \
                 ssh_config sshd_config.orig ssh_proxy sshd_config sshd_proxy \
                 rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \
@@ -91,7 +102,8 @@ CLEANFILES=	t2.out t3.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
                 regress.log failed-regress.log ssh-log-wrapper.sh \
                 sftp-server.sh sftp-server.log sftp.log setuid-allowed \
                 data ed25519-agent ed25519-agent.pub key.ed25519-512 \
-                key.ed25519-512.pub
+                key.ed25519-512.pub netcat host_krl_* host_revoked_* \
+                kh.* user_*key* agent-key.* known_hosts.* hkr.*
 
 SUDO_CLEAN+=    /var/run/testdata_${USER} /var/run/keycommand_${USER}
 
@@ -119,7 +131,7 @@ t3:
         ${TEST_SSH_SSHKEYGEN} -if $(OBJ)/t3.out | diff - ${.CURDIR}/rsa_openssh.pub
 
 t4:
-        ${TEST_SSH_SSHKEYGEN} -lf ${.CURDIR}/rsa_openssh.pub |\
+        ${TEST_SSH_SSHKEYGEN} -E md5 -lf ${.CURDIR}/rsa_openssh.pub |\
                 awk '{print $$2}' | diff - ${.CURDIR}/t4.ok
 
 t5:
@@ -164,6 +176,16 @@ t10: $(OBJ)/t10.out
         ${TEST_SSH_SSHKEYGEN} -lf $(OBJ)/t10.out > /dev/null
         ${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t10.out > /dev/null
 
+t11:
+        ${TEST_SSH_SSHKEYGEN} -E sha256 -lf ${.CURDIR}/rsa_openssh.pub |\
+                awk '{print $$2}' | diff - ${.CURDIR}/t11.ok
+
+t12.out:
+        ${TEST_SSH_SSHKEYGEN} -q -t ed25519 -N '' -C 'test-comment-1234' -f $(OBJ)/$@
+
+t12: t12.out
+        ${TEST_SSH_SSHKEYGEN} -lf $(OBJ)/t12.out.pub | grep test-comment-1234 >/dev/null
+
 t-exec: ${LTESTS:=.sh}
         @if [ "x$?" = "x" ]; then exit 0; fi; \
         for TEST in ""$?; do \
@@ -184,7 +206,14 @@ interop: ${INTEROP_TARGETS}
 # Unit tests, built by top-level Makefile
 unit:
         set -e ; if test -z "${SKIP_UNIT}" ; then \
-                ${.OBJDIR}/unittests/sshbuf/test_sshbuf ; \
-                ${.OBJDIR}/unittests/sshkey/test_sshkey \
-                        -d  ${.CURDIR}//unittests/sshkey/testdata ; \
+                V="" ; \
+                test "x${USE_VALGRIND}" = "x" || \
+                    V=${.CURDIR}/valgrind-unit.sh ; \
+                $$V ${.OBJDIR}/unittests/sshbuf/test_sshbuf ; \
+                $$V ${.OBJDIR}/unittests/sshkey/test_sshkey \
+                        -d ${.CURDIR}/unittests/sshkey/testdata ; \
+                $$V ${.OBJDIR}/unittests/bitmap/test_bitmap ; \
+                $$V ${.OBJDIR}/unittests/kex/test_kex ; \
+                $$V ${.OBJDIR}/unittests/hostkeys/test_hostkeys \
+                        -d ${.CURDIR}/unittests/hostkeys/testdata ; \
         fi