- (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@

2 files changed, 30 insertions, 23 deletions

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; \