From 3a0e9f6479d50a95b5ccd7d7668b0ff45571de9c Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Fri, 5 Nov 2010 10:16:34 +1100
Subject:    - djm@cvs.openbsd.org 2010/09/22 12:26:05      [regress/Makefile
 regress/kextype.sh]      regress test for each of the key exchange algorithms
 that we support

---
 regress/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'regress/Makefile')

diff --git a/regress/Makefile b/regress/Makefile
index 9762ab204..f51307f02 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,6 +1,6 @@
-#	$OpenBSD: Makefile,v 1.54 2010/06/27 19:19:56 phessler Exp $
+#	$OpenBSD: Makefile,v 1.55 2010/08/31 12:24:25 djm Exp $
 
-REGRESS_TARGETS=	t1 t2 t3 t4 t5 t6 t7 t-exec
+REGRESS_TARGETS=	t1 t2 t3 t4 t5 t6 t7 t8 t9 t-exec
 tests:		$(REGRESS_TARGETS)
 
 # Interop tests are not run by default
@@ -61,6 +61,7 @@ INTEROP_TESTS=	putty-transfer putty-ciphers putty-kex conch-ciphers
 
 USER!=		id -un
 CLEANFILES=	t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
+		t8.out t8.out.pub t9.out t9.out.pub \
 		authorized_keys_${USER} known_hosts pidfile \
 		ssh_config sshd_config.orig ssh_proxy sshd_config sshd_proxy \
 		rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \
-- 
cgit v1.2.3


From eab5f0df90cad495ee65abdb557538dbfb625d15 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Fri, 5 Nov 2010 18:23:38 +1100
Subject:  - (dtucker) [Makefile configure.ac regress/Makefile
 regress/keytype.sh]    Import recent changes to regress/Makefile, pass a flag
 to enable ECC tests    from configure through to regress/Makefile and use it
 in the tests.

---
 ChangeLog               |  3 +++
 configure.ac            |  7 +++++--
 regress/Makefile        | 27 +++++++++++++++++++++++++++
 regress/cert-hostkey.sh |  3 +--
 regress/cert-userkey.sh |  3 +--
 regress/kextype.sh      |  4 +++-
 regress/keytype.sh      |  5 ++++-
 7 files changed, 44 insertions(+), 8 deletions(-)

(limited to 'regress/Makefile')

diff --git a/ChangeLog b/ChangeLog
index 2f309739d..c6dfa2403 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,9 @@
  - (dtucker) [platform.c platform.h session.c] Move the Cygwin special-case
    check into platform.c
  - (dtucker) [regress/keytype.sh] Import new test.
+ - (dtucker) [Makefile configure.ac regress/Makefile regress/keytype.sh]
+   Import recent changes to regress/Makefile, pass a flag to enable ECC tests
+   from configure through to regress/Makefile and use it in the tests.
 
 20101025
  - (tim) [openbsd-compat/glob.h] Remove sys/cdefs.h include that came with
diff --git a/configure.ac b/configure.ac
index 39b68c70a..97d4e6bdb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.456 2010/11/05 01:03:05 dtucker Exp $
+# $Id: configure.ac,v 1.457 2010/11/05 07:23:38 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
-AC_REVISION($Revision: 1.456 $)
+AC_REVISION($Revision: 1.457 $)
 AC_CONFIG_SRCDIR([ssh.c])
 
 AC_CONFIG_HEADER(config.h)
@@ -2209,11 +2209,14 @@ int main(void) {
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(OPENSSL_HAS_ECC, 1,
 		    [libcrypto includes complete ECC support])
+		TEST_SSH_ECC=yes
 	],
 	[
 		AC_MSG_RESULT(no)
+		TEST_SSH_ECC=no
 	]
 )
+AC_SUBST(TEST_SSH_ECC)
 
 saved_LIBS="$LIBS"
 AC_CHECK_LIB(iaf, ia_openinfo, [
diff --git a/regress/Makefile b/regress/Makefile
index f51307f02..d5668f08f 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -53,12 +53,16 @@ LTESTS= 	connect \
 		localcommand \
 		forcecommand \
 		portnum \
+		keytype \
+		kextype \
 		cert-hostkey \
 		cert-userkey
 
 INTEROP_TESTS=	putty-transfer putty-ciphers putty-kex conch-ciphers
 #INTEROP_TESTS+=ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp
 
+#LTESTS= 	cipher-speed
+
 USER!=		id -un
 CLEANFILES=	t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
 		t8.out t8.out.pub t9.out t9.out.pub \
@@ -78,6 +82,10 @@ TEST_ENV=      "MALLOC_OPTIONS=AFGJPRX"
 
 t1:
 	ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv
+	tr '\n' '\r' <${.CURDIR}/rsa_ssh2.prv > ${.OBJDIR}/rsa_ssh2_cr.prv
+	ssh-keygen -if ${.OBJDIR}/rsa_ssh2_cr.prv | diff - ${.CURDIR}/rsa_openssh.prv
+	awk '{print $$0 "\r"}' ${.CURDIR}/rsa_ssh2.prv > ${.OBJDIR}/rsa_ssh2_crnl.prv
+	ssh-keygen -if ${.OBJDIR}/rsa_ssh2_crnl.prv | diff - ${.CURDIR}/rsa_openssh.prv
 
 t2:
 	cat ${.CURDIR}/rsa_openssh.prv > $(OBJ)/t2.out
@@ -110,6 +118,23 @@ t7: $(OBJ)/t7.out
 	ssh-keygen -lf $(OBJ)/t7.out > /dev/null
 	ssh-keygen -Bf $(OBJ)/t7.out > /dev/null
 
+t8.out:
+	ssh-keygen -q -t dsa -N '' -f $@
+
+t8: t8.out
+	ssh-keygen -lf t8.out > /dev/null
+	ssh-keygen -Bf t8.out > /dev/null
+
+t9.out:
+	test "${TEST_SSH_ECC}" != yes || \
+	ssh-keygen -q -t ecdsa -N '' -f
+
+t9: t9.out
+	test "${TEST_SSH_ECC}" != yes || \
+	ssh-keygen -lf t9.out > /dev/null
+	test "${TEST_SSH_ECC}" != yes || \
+	ssh-keygen -Bf t9.out > /dev/null
+
 t-exec:	${LTESTS:=.sh}
 	@if [ "x$?" = "x" ]; then exit 0; fi; \
 	for TEST in ""$?; do \
@@ -124,3 +149,5 @@ t-exec-interop:	${INTEROP_TESTS:=.sh}
 		(env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
 	done
 
+# Not run by default
+interop: ${INTEROP_TARGETS}
diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh
index 7461beca6..1ae5d0bda 100644
--- a/regress/cert-hostkey.sh
+++ b/regress/cert-hostkey.sh
@@ -5,8 +5,7 @@ tid="certified host keys"
 
 # used to disable ECC based tests on platforms without ECC
 ecdsa=""
-if grep "#define.*OPENSSL_HAS_ECC" ${BUILDDIR}/config.h >/dev/null 2>&1
-then
+if "$TEST_SSH_ECC" = "yes"; then
 	ecdsa=ecdsa
 fi
 
diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh
index a7760a2f6..a42c7f34a 100644
--- a/regress/cert-userkey.sh
+++ b/regress/cert-userkey.sh
@@ -5,8 +5,7 @@ tid="certified user keys"
 
 # used to disable ECC based tests on platforms without ECC
 ecdsa=""
-if grep "#define.*OPENSSL_HAS_ECC" ${BUILDDIR}/config.h >/dev/null 2>&1
-then
+if "$TEST_SSH_ECC" = "yes"; then
 	ecdsa=ecdsa
 fi
 
diff --git a/regress/kextype.sh b/regress/kextype.sh
index ba6fd9509..22ceb40c9 100644
--- a/regress/kextype.sh
+++ b/regress/kextype.sh
@@ -7,7 +7,9 @@ TIME=/usr/bin/time
 cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak
 cp $OBJ/ssh_proxy $OBJ/ssh_proxy_bak
 
-kextypes="ecdh-sha2-nistp256 ecdh-sha2-nistp384 ecdh-sha2-nistp521"
+if "$TEST_SSH_ECC" = "yes"; then
+	kextypes="ecdh-sha2-nistp256 ecdh-sha2-nistp384 ecdh-sha2-nistp521"
+fi
 kextypes="$kextypes diffie-hellman-group-exchange-sha256"
 kextypes="$kextypes diffie-hellman-group-exchange-sha1"
 kextypes="$kextypes diffie-hellman-group14-sha1"
diff --git a/regress/keytype.sh b/regress/keytype.sh
index 7be3cc0c8..cd9024587 100644
--- a/regress/keytype.sh
+++ b/regress/keytype.sh
@@ -7,7 +7,10 @@ TIME=/usr/bin/time
 cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak
 cp $OBJ/ssh_proxy $OBJ/ssh_proxy_bak
 
-ktypes="dsa-1024 rsa-2048 ecdsa-256 rsa-3072 ecdsa-384 ecdsa-521"
+ktypes="dsa-1024 rsa-2048 rsa-3072"
+if test "$TEST_SSH_ECC" = "yes"; then
+	ktypes="$ktypes ecdsa-256 ecdsa-384 ecdsa-521"
+fi
 
 for kt in $ktypes; do 
 	rm -f $OBJ/key.$kt
-- 
cgit v1.2.3


From 522262f8b328e6d5951bf2a77f22080bdc123f04 Mon Sep 17 00:00:00 2001
From: Tim Rice <tim@multitalents.net>
Date: Sun, 7 Nov 2010 13:00:27 -0800
Subject:  - (tim) [regress/Makefile] Fixes to allow building/testing outside
 source    tree.

---
 ChangeLog        |  4 ++++
 regress/Makefile | 18 +++++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'regress/Makefile')

diff --git a/ChangeLog b/ChangeLog
index d02a2dabf..ca87f0902 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20101108
+ - (tim) [regress/Makefile] Fixes to allow building/testing outside source
+   tree.
+
 20101107
  - (dtucker) [platform.c] includes.h instead of defines.h so that we get
    the correct typedefs.
diff --git a/regress/Makefile b/regress/Makefile
index d5668f08f..d80b04ea8 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -118,22 +118,22 @@ t7: $(OBJ)/t7.out
 	ssh-keygen -lf $(OBJ)/t7.out > /dev/null
 	ssh-keygen -Bf $(OBJ)/t7.out > /dev/null
 
-t8.out:
+$(OBJ)/t8.out:
 	ssh-keygen -q -t dsa -N '' -f $@
 
-t8: t8.out
-	ssh-keygen -lf t8.out > /dev/null
-	ssh-keygen -Bf t8.out > /dev/null
+t8: $(OBJ)/t8.out
+	ssh-keygen -lf $(OBJ)/t8.out > /dev/null
+	ssh-keygen -Bf $(OBJ)/t8.out > /dev/null
 
-t9.out:
+$(OBJ)/t9.out:
 	test "${TEST_SSH_ECC}" != yes || \
-	ssh-keygen -q -t ecdsa -N '' -f
+	ssh-keygen -q -t ecdsa -N '' -f $@
 
-t9: t9.out
+t9: $(OBJ)/t9.out
 	test "${TEST_SSH_ECC}" != yes || \
-	ssh-keygen -lf t9.out > /dev/null
+	ssh-keygen -lf $(OBJ)/t9.out > /dev/null
 	test "${TEST_SSH_ECC}" != yes || \
-	ssh-keygen -Bf t9.out > /dev/null
+	ssh-keygen -Bf $(OBJ)/t9.out > /dev/null
 
 t-exec:	${LTESTS:=.sh}
 	@if [ "x$?" = "x" ]; then exit 0; fi; \
-- 
cgit v1.2.3


From 7e1a5a4e1bcacd5f7248d5e616cdc4be33743fad Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sun, 5 Dec 2010 09:29:31 +1100
Subject:  - (dtucker) [regress/Makefile] Id sync.

---
 ChangeLog        | 1 +
 regress/Makefile | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'regress/Makefile')

diff --git a/ChangeLog b/ChangeLog
index fb23d52b0..585a984fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,7 @@
    - djm@cvs.openbsd.org 2010/12/04 13:31:37
      [hostfile.c]
      fix fd leak; spotted and ok dtucker
+ - (dtucker) [regress/Makefile] Id sync.
 
 20101204
  - (djm) [openbsd-compat/bindresvport.c] Use arc4random_uniform(range)
diff --git a/regress/Makefile b/regress/Makefile
index d80b04ea8..9ebb2500e 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.55 2010/08/31 12:24:25 djm Exp $
+#	$OpenBSD: Makefile,v 1.57 2010/09/22 12:26:05 djm Exp $
 
 REGRESS_TARGETS=	t1 t2 t3 t4 t5 t6 t7 t8 t9 t-exec
 tests:		$(REGRESS_TARGETS)
-- 
cgit v1.2.3


From 7d06b00032d2d57474dbba9fddd0b8cd9ef05ef3 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Fri, 7 Jan 2011 09:54:20 +1100
Subject:    - djm@cvs.openbsd.org 2011/01/06 22:46:21      [regress/Makefile
 regress/host-expand.sh]      regress test for LocalCommand %n expansion from
 bert.wesarg AT      googlemail.com; ok markus@

---
 ChangeLog              |  4 ++++
 regress/Makefile       |  7 ++++---
 regress/host-expand.sh | 18 ++++++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 regress/host-expand.sh

(limited to 'regress/Makefile')

diff --git a/ChangeLog b/ChangeLog
index 5e2089620..4fc608814 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,10 @@
      [clientloop.c]
      when exiting due to ServerAliveTimeout, mention the hostname that caused
      it (useful with backgrounded controlmaster)
+   - djm@cvs.openbsd.org 2011/01/06 22:46:21
+     [regress/Makefile regress/host-expand.sh]
+     regress test for LocalCommand %n expansion from bert.wesarg AT
+     googlemail.com; ok markus@
 
 20110106
  - (djm) OpenBSD CVS Sync
diff --git a/regress/Makefile b/regress/Makefile
index 9ebb2500e..85fd3a5ad 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.57 2010/09/22 12:26:05 djm Exp $
+#	$OpenBSD: Makefile,v 1.58 2011/01/06 22:46:21 djm Exp $
 
 REGRESS_TARGETS=	t1 t2 t3 t4 t5 t6 t7 t8 t9 t-exec
 tests:		$(REGRESS_TARGETS)
@@ -56,7 +56,8 @@ LTESTS= 	connect \
 		keytype \
 		kextype \
 		cert-hostkey \
-		cert-userkey
+		cert-userkey \
+		host-expand
 
 INTEROP_TESTS=	putty-transfer putty-ciphers putty-kex conch-ciphers
 #INTEROP_TESTS+=ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp
@@ -75,7 +76,7 @@ CLEANFILES=	t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
 		sshd_proxy_bak rsa_ssh2_cr.prv rsa_ssh2_crnl.prv \
 		known_hosts-cert host_ca_key* cert_host_key* \
 		putty.rsa2 sshd_proxy_orig \
-		authorized_principals_${USER}
+		authorized_principals_${USER} expect actual
 
 # Enable all malloc(3) randomisations and checks
 TEST_ENV=      "MALLOC_OPTIONS=AFGJPRX"
diff --git a/regress/host-expand.sh b/regress/host-expand.sh
new file mode 100644
index 000000000..c0417d9c9
--- /dev/null
+++ b/regress/host-expand.sh
@@ -0,0 +1,18 @@
+#	Placed in the Public Domain.
+
+tid="expand %h and %n"
+
+echo 'PermitLocalCommand yes' >> $OBJ/ssh_proxy
+printf 'LocalCommand printf "%%%%s\\n" "%%n" "%%h"\n' >> $OBJ/ssh_proxy
+
+cat >expect <<EOE
+somehost
+127.0.0.1
+EOE
+
+for p in 1 2; do
+	verbose "test $tid: proto $p"
+	${SSH} -F $OBJ/ssh_proxy -$p somehost true >actual
+	diff expect actual || fail "$tid proto $p"
+done
+
-- 
cgit v1.2.3


From cbaf8e6ec17ceceb488eed578a11f3ab73264a1e Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Thu, 13 Jan 2011 21:08:27 +1100
Subject:  - (djm) [regress/Makefile] add a few more generated files to the
 clean    target

---
 ChangeLog        | 2 ++
 regress/Makefile | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'regress/Makefile')

diff --git a/ChangeLog b/ChangeLog
index 438c2cdd7..baf445fd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
    ecdsa keys. ok djm.
  - (djm) [entropy.c] cast OPENSSL_VERSION_NUMBER to u_long to avoid
    gcc warning on platforms where it defaults to int
+ - (djm) [regress/Makefile] add a few more generated files to the clean
+   target
 
 20110212
  - OpenBSD CVS Sync
diff --git a/regress/Makefile b/regress/Makefile
index 85fd3a5ad..776a29c54 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -75,7 +75,7 @@ CLEANFILES=	t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
 		scp-ssh-wrapper.scp ssh_proxy_envpass remote_pid \
 		sshd_proxy_bak rsa_ssh2_cr.prv rsa_ssh2_crnl.prv \
 		known_hosts-cert host_ca_key* cert_host_key* \
-		putty.rsa2 sshd_proxy_orig \
+		putty.rsa2 sshd_proxy_orig ssh_proxy_bak key.[rd]sa-* \
 		authorized_principals_${USER} expect actual
 
 # Enable all malloc(3) randomisations and checks
-- 
cgit v1.2.3


From 369c0e8eefe767c244c085677e7901526ef462be Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Mon, 17 Jan 2011 10:51:40 +1100
Subject:  - (djm) [regress/Makefile] use $TEST_SSH_KEYGEN instead of the one
 in    $PATH, fix cleanup of droppings; reported by openssh AT   
 roumenpetrov.info; ok dtucker@

---
 ChangeLog        |  5 +++++
 regress/Makefile | 48 +++++++++++++++++++++++++-----------------------
 2 files changed, 30 insertions(+), 23 deletions(-)

(limited to 'regress/Makefile')

diff --git a/ChangeLog b/ChangeLog
index a0282b739..00e4bdbd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20110117
+ - (djm) [regress/Makefile] use $TEST_SSH_KEYGEN instead of the one in
+   $PATH, fix cleanup of droppings; reported by openssh AT
+   roumenpetrov.info; ok dtucker@
+
 20110116
  - (dtucker) [Makefile.in configure.ac regress/kextype.sh] Skip sha256-based
    on configurations that don't have it.
diff --git a/regress/Makefile b/regress/Makefile
index 776a29c54..f114c27e9 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -65,7 +65,7 @@ INTEROP_TESTS=	putty-transfer putty-ciphers putty-kex conch-ciphers
 #LTESTS= 	cipher-speed
 
 USER!=		id -un
-CLEANFILES=	t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
+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 \
 		authorized_keys_${USER} known_hosts pidfile \
 		ssh_config sshd_config.orig ssh_proxy sshd_config sshd_proxy \
@@ -75,66 +75,68 @@ CLEANFILES=	t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
 		scp-ssh-wrapper.scp ssh_proxy_envpass remote_pid \
 		sshd_proxy_bak rsa_ssh2_cr.prv rsa_ssh2_crnl.prv \
 		known_hosts-cert host_ca_key* cert_host_key* \
-		putty.rsa2 sshd_proxy_orig ssh_proxy_bak key.[rd]sa-* \
+		putty.rsa2 sshd_proxy_orig ssh_proxy_bak \
+		key.rsa-* key.dsa-* key.ecdsa-* \
 		authorized_principals_${USER} expect actual
 
 # Enable all malloc(3) randomisations and checks
 TEST_ENV=      "MALLOC_OPTIONS=AFGJPRX"
 
+TEST_SSH_SSHKEYGEN?=ssh-keygen
+
 t1:
-	ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv
+	${TEST_SSH_SSHKEYGEN} -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv
 	tr '\n' '\r' <${.CURDIR}/rsa_ssh2.prv > ${.OBJDIR}/rsa_ssh2_cr.prv
-	ssh-keygen -if ${.OBJDIR}/rsa_ssh2_cr.prv | diff - ${.CURDIR}/rsa_openssh.prv
+	${TEST_SSH_SSHKEYGEN} -if ${.OBJDIR}/rsa_ssh2_cr.prv | diff - ${.CURDIR}/rsa_openssh.prv
 	awk '{print $$0 "\r"}' ${.CURDIR}/rsa_ssh2.prv > ${.OBJDIR}/rsa_ssh2_crnl.prv
-	ssh-keygen -if ${.OBJDIR}/rsa_ssh2_crnl.prv | diff - ${.CURDIR}/rsa_openssh.prv
+	${TEST_SSH_SSHKEYGEN} -if ${.OBJDIR}/rsa_ssh2_crnl.prv | diff - ${.CURDIR}/rsa_openssh.prv
 
 t2:
 	cat ${.CURDIR}/rsa_openssh.prv > $(OBJ)/t2.out
 	chmod 600 $(OBJ)/t2.out
-	ssh-keygen -yf $(OBJ)/t2.out | diff - ${.CURDIR}/rsa_openssh.pub
+	${TEST_SSH_SSHKEYGEN} -yf $(OBJ)/t2.out | diff - ${.CURDIR}/rsa_openssh.pub
 
 t3:
-	ssh-keygen -ef ${.CURDIR}/rsa_openssh.pub >$(OBJ)/rsa_secsh.pub
-	ssh-keygen -if $(OBJ)/rsa_secsh.pub | diff - ${.CURDIR}/rsa_openssh.pub
-	rm -f ${.CURDIR}/rsa_secsh.pub
+	${TEST_SSH_SSHKEYGEN} -ef ${.CURDIR}/rsa_openssh.pub >$(OBJ)/t3.out
+	${TEST_SSH_SSHKEYGEN} -if $(OBJ)/t3.out | diff - ${.CURDIR}/rsa_openssh.pub
 
 t4:
-	ssh-keygen -lf ${.CURDIR}/rsa_openssh.pub |\
+	${TEST_SSH_SSHKEYGEN} -lf ${.CURDIR}/rsa_openssh.pub |\
 		awk '{print $$2}' | diff - ${.CURDIR}/t4.ok
 
 t5:
-	ssh-keygen -Bf ${.CURDIR}/rsa_openssh.pub |\
+	${TEST_SSH_SSHKEYGEN} -Bf ${.CURDIR}/rsa_openssh.pub |\
 		awk '{print $$2}' | diff - ${.CURDIR}/t5.ok
 
 t6:
-	ssh-keygen -if ${.CURDIR}/dsa_ssh2.prv > $(OBJ)/t6.out1
-	ssh-keygen -if ${.CURDIR}/dsa_ssh2.pub > $(OBJ)/t6.out2
+	${TEST_SSH_SSHKEYGEN} -if ${.CURDIR}/dsa_ssh2.prv > $(OBJ)/t6.out1
+	${TEST_SSH_SSHKEYGEN} -if ${.CURDIR}/dsa_ssh2.pub > $(OBJ)/t6.out2
 	chmod 600 $(OBJ)/t6.out1
-	ssh-keygen -yf $(OBJ)/t6.out1 | diff - $(OBJ)/t6.out2
+	${TEST_SSH_SSHKEYGEN} -yf $(OBJ)/t6.out1 | diff - $(OBJ)/t6.out2
 
 $(OBJ)/t7.out:
-	ssh-keygen -q -t rsa -N '' -f $@
+	${TEST_SSH_SSHKEYGEN} -q -t rsa -N '' -f $@
 
 t7: $(OBJ)/t7.out
-	ssh-keygen -lf $(OBJ)/t7.out > /dev/null
-	ssh-keygen -Bf $(OBJ)/t7.out > /dev/null
+	${TEST_SSH_SSHKEYGEN} -lf $(OBJ)/t7.out > /dev/null
+	${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t7.out > /dev/null
 
 $(OBJ)/t8.out:
-	ssh-keygen -q -t dsa -N '' -f $@
+	${TEST_SSH_SSHKEYGEN} -q -t dsa -N '' -f $@
 
 t8: $(OBJ)/t8.out
-	ssh-keygen -lf $(OBJ)/t8.out > /dev/null
-	ssh-keygen -Bf $(OBJ)/t8.out > /dev/null
+	${TEST_SSH_SSHKEYGEN} -lf $(OBJ)/t8.out > /dev/null
+	${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t8.out > /dev/null
 
 $(OBJ)/t9.out:
 	test "${TEST_SSH_ECC}" != yes || \
-	ssh-keygen -q -t ecdsa -N '' -f $@
+	${TEST_SSH_SSHKEYGEN} -q -t ecdsa -N '' -f $@
 
 t9: $(OBJ)/t9.out
 	test "${TEST_SSH_ECC}" != yes || \
-	ssh-keygen -lf $(OBJ)/t9.out > /dev/null
+	${TEST_SSH_SSHKEYGEN} -lf $(OBJ)/t9.out > /dev/null
 	test "${TEST_SSH_ECC}" != yes || \
-	ssh-keygen -Bf $(OBJ)/t9.out > /dev/null
+	${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t9.out > /dev/null
 
 t-exec:	${LTESTS:=.sh}
 	@if [ "x$?" = "x" ]; then exit 0; fi; \
-- 
cgit v1.2.3