diff options
Diffstat (limited to 'regress/usr.bin')
| -rw-r--r-- | regress/usr.bin/ssh/Makefile | 4 | ||||
| -rw-r--r-- | regress/usr.bin/ssh/banner.sh | 25 |
2 files changed, 21 insertions, 8 deletions
diff --git a/regress/usr.bin/ssh/Makefile b/regress/usr.bin/ssh/Makefile index 342cec6c91d..8dcbdae2f0e 100644 --- a/regress/usr.bin/ssh/Makefile +++ b/regress/usr.bin/ssh/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2003/10/07 01:52:13 dtucker Exp $ +# $OpenBSD: Makefile,v 1.26 2003/10/11 11:49:49 dtucker Exp $ REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 @@ -37,7 +37,7 @@ CLEANFILES+= authorized_keys_${USER} known_hosts pidfile \ ssh_config ssh_proxy sshd_config sshd_proxy \ rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \ rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \ - ls.copy banner.in banner.out + ls.copy banner.in banner.out empty.in #LTESTS+= ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp diff --git a/regress/usr.bin/ssh/banner.sh b/regress/usr.bin/ssh/banner.sh index 03e2fc8f15b..0b9c9500749 100644 --- a/regress/usr.bin/ssh/banner.sh +++ b/regress/usr.bin/ssh/banner.sh @@ -1,13 +1,21 @@ -# $OpenBSD: banner.sh,v 1.1 2003/10/07 01:52:13 dtucker Exp $ +# $OpenBSD: banner.sh,v 1.2 2003/10/11 11:49:49 dtucker Exp $ # Placed in the Public Domain. tid="banner" echo "Banner $OBJ/banner.in" >> $OBJ/sshd_proxy +rm -f $OBJ/banner.out $OBJ/banner.in $OBJ/empty.in +touch $OBJ/empty.in + +trace "test missing banner file" +verbose "test $tid: missing banner file" +( ${SSH} -2 -F $OBJ/ssh_proxy otherhost true 2>$OBJ/banner.out && \ + cmp $OBJ/empty.in $OBJ/banner.out ) || \ + fail "missing banner file" + for s in 0 10 100 1000 10000 100000 ; do if [ "$s" = "0" ]; then # create empty banner - rm -f $OBJ/banner.in touch $OBJ/banner.in elif [ "$s" = "10" ]; then # create 10-byte banner file @@ -22,10 +30,15 @@ for s in 0 10 100 1000 10000 100000 ; do trace "test banner size $s" verbose "test $tid: size $s" - ${SSH} -2 -F $OBJ/ssh_proxy otherhost true 2>$OBJ/banner.out - if ! cmp $OBJ/banner.in $OBJ/banner.out ; then + ( ${SSH} -2 -F $OBJ/ssh_proxy otherhost true 2>$OBJ/banner.out && \ + cmp $OBJ/banner.in $OBJ/banner.out ) || \ fail "banner size $s mismatch" - fi done -rm -f $OBJ/banner.out $OBJ/banner.in +trace "test suppress banner (-q)" +verbose "test $tid: suppress banner (-q)" +( ${SSH} -q -2 -F $OBJ/ssh_proxy otherhost true 2>$OBJ/banner.out && \ + cmp $OBJ/empty.in $OBJ/banner.out ) || \ + fail "suppress banner (-q)" + +rm -f $OBJ/banner.out $OBJ/banner.in $OBJ/empty.in |