summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2008-03-27 17:42:06 +1100
committerDamien Miller <djm@mindrot.org>2008-03-27 17:42:06 +1100
commit9c8a427453a0a354d7251600872f9c9c0a924a9e (patch)
tree5fba13bb93b14b5b2d6e040473d587aea2ecc322
parent5b1c8b31038af7144efdcf9317df66c96031d19f (diff)
- (djm) [regress/Makefile] cleanup PuTTY interop test droppings
-rw-r--r--ChangeLog3
-rw-r--r--regress/Makefile5
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4c2df0181..3b5e6f179 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,7 @@
52 by dkrause@ 52 by dkrause@
53 - (djm) [configure.ac] fix alignment of --without-stackprotect description 53 - (djm) [configure.ac] fix alignment of --without-stackprotect description
54 - (djm) [configure.ac] --with-selinux too 54 - (djm) [configure.ac] --with-selinux too
55 - (djm) [regress/Makefile] cleanup PuTTY interop test droppings
55 56
5620080315 5720080315
57 - (djm) [regress/test-exec.sh] Quote putty-related variables in case they are 58 - (djm) [regress/test-exec.sh] Quote putty-related variables in case they are
@@ -3820,4 +3821,4 @@
3820 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3821 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3821 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3822 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3822 3823
3823$Id: ChangeLog,v 1.4893 2008/03/27 01:33:07 djm Exp $ 3824$Id: ChangeLog,v 1.4894 2008/03/27 06:42:06 djm Exp $
diff --git a/regress/Makefile b/regress/Makefile
index 8224c11c2..b229fca48 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -8,6 +8,8 @@ interop interop-tests: t-exec-interop
8 8
9clean: 9clean:
10 for F in $(CLEANFILES); do rm -f $(OBJ)$$F; done 10 for F in $(CLEANFILES); do rm -f $(OBJ)$$F; done
11 rm -rf $(OBJ).putty
12
11distclean: clean 13distclean: clean
12 14
13LTESTS= connect \ 15LTESTS= connect \
@@ -59,7 +61,8 @@ CLEANFILES= t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
59 rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \ 61 rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \
60 ls.copy banner.in banner.out empty.in \ 62 ls.copy banner.in banner.out empty.in \
61 scp-ssh-wrapper.scp ssh_proxy_envpass remote_pid \ 63 scp-ssh-wrapper.scp ssh_proxy_envpass remote_pid \
62 sshd_proxy_bak rsa_ssh2_cr.prv rsa_ssh2_crnl.prv 64 sshd_proxy_bak rsa_ssh2_cr.prv rsa_ssh2_crnl.prv \
65 putty.rsa2
63 66
64t1: 67t1:
65 ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv 68 ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv