summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--regress/Makefile4
-rw-r--r--regress/banner.sh25
3 files changed, 30 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 62f18d09a..6e7bdc2e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
120040129
2 - (dtucker) OpenBSD CVS Sync regress/
3 - dtucker@cvs.openbsd.org 2003/10/11 11:49:49
4 [Makefile banner.sh]
5 Test missing banner file, suppression of banner with ssh -q, check return
6 code from ssh. ok markus@
7
120040128 820040128
2 - (dtucker) [regress/README.regress] Add tcpwrappers issue, noted by tim@ 9 - (dtucker) [regress/README.regress] Add tcpwrappers issue, noted by tim@
3 - (dtucker) [moduli] Import new moduli file from OpenBSD. 10 - (dtucker) [moduli] Import new moduli file from OpenBSD.
@@ -1766,4 +1773,4 @@
1766 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1773 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1767 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1774 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1768 1775
1769$Id: ChangeLog,v 1.3199 2004/01/28 04:44:04 dtucker Exp $ 1776$Id: ChangeLog,v 1.3200 2004/01/30 01:58:51 dtucker Exp $
diff --git a/regress/Makefile b/regress/Makefile
index da4a6731c..76e28d36d 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.25 2003/10/07 01:52:13 dtucker Exp $ 1# $OpenBSD: Makefile,v 1.26 2003/10/11 11:49:49 dtucker Exp $
2 2
3REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec 3REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec
4tests: $(REGRESS_TARGETS) 4tests: $(REGRESS_TARGETS)
@@ -41,7 +41,7 @@ CLEANFILES= t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
41 ssh_config ssh_proxy sshd_config sshd_proxy \ 41 ssh_config ssh_proxy sshd_config sshd_proxy \
42 rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \ 42 rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \
43 rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \ 43 rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \
44 ls.copy banner.in banner.out remote_pid 44 ls.copy banner.in banner.out empty.in remote_pid
45 45
46#LTESTS += ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp 46#LTESTS += ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp
47 47
diff --git a/regress/banner.sh b/regress/banner.sh
index 0f6a68dff..0b9c95007 100644
--- a/regress/banner.sh
+++ b/regress/banner.sh
@@ -1,13 +1,21 @@
1# $OpenBSD: banner.sh,v 1.1 2003/10/07 01:52:13 dtucker Exp $ 1# $OpenBSD: banner.sh,v 1.2 2003/10/11 11:49:49 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="banner" 4tid="banner"
5echo "Banner $OBJ/banner.in" >> $OBJ/sshd_proxy 5echo "Banner $OBJ/banner.in" >> $OBJ/sshd_proxy
6 6
7rm -f $OBJ/banner.out $OBJ/banner.in $OBJ/empty.in
8touch $OBJ/empty.in
9
10trace "test missing banner file"
11verbose "test $tid: missing banner file"
12( ${SSH} -2 -F $OBJ/ssh_proxy otherhost true 2>$OBJ/banner.out && \
13 cmp $OBJ/empty.in $OBJ/banner.out ) || \
14 fail "missing banner file"
15
7for s in 0 10 100 1000 10000 100000 ; do 16for s in 0 10 100 1000 10000 100000 ; do
8 if [ "$s" = "0" ]; then 17 if [ "$s" = "0" ]; then
9 # create empty banner 18 # create empty banner
10 rm -f $OBJ/banner.in
11 touch $OBJ/banner.in 19 touch $OBJ/banner.in
12 elif [ "$s" = "10" ]; then 20 elif [ "$s" = "10" ]; then
13 # create 10-byte banner file 21 # create 10-byte banner file
@@ -22,8 +30,15 @@ for s in 0 10 100 1000 10000 100000 ; do
22 30
23 trace "test banner size $s" 31 trace "test banner size $s"
24 verbose "test $tid: size $s" 32 verbose "test $tid: size $s"
25 ${SSH} -2 -F $OBJ/ssh_proxy otherhost true 2>$OBJ/banner.out 33 ( ${SSH} -2 -F $OBJ/ssh_proxy otherhost true 2>$OBJ/banner.out && \
26 cmp $OBJ/banner.in $OBJ/banner.out || fail "banner size $s mismatch" 34 cmp $OBJ/banner.in $OBJ/banner.out ) || \
35 fail "banner size $s mismatch"
27done 36done
28 37
29rm -f $OBJ/banner.out $OBJ/banner.in 38trace "test suppress banner (-q)"
39verbose "test $tid: suppress banner (-q)"
40( ${SSH} -q -2 -F $OBJ/ssh_proxy otherhost true 2>$OBJ/banner.out && \
41 cmp $OBJ/empty.in $OBJ/banner.out ) || \
42 fail "suppress banner (-q)"
43
44rm -f $OBJ/banner.out $OBJ/banner.in $OBJ/empty.in