- dtucker@cvs.openbsd.org 2003/10/11 11:49:49
[Makefile banner.sh] Test missing banner file, suppression of banner with ssh -q, check return code from ssh. ok markus@
This commit is contained in:
parent
77970695de
commit
22991ba2e2
|
@ -1,3 +1,10 @@
|
||||||
|
20040129
|
||||||
|
- (dtucker) OpenBSD CVS Sync regress/
|
||||||
|
- dtucker@cvs.openbsd.org 2003/10/11 11:49:49
|
||||||
|
[Makefile banner.sh]
|
||||||
|
Test missing banner file, suppression of banner with ssh -q, check return
|
||||||
|
code from ssh. ok markus@
|
||||||
|
|
||||||
20040128
|
20040128
|
||||||
- (dtucker) [regress/README.regress] Add tcpwrappers issue, noted by tim@
|
- (dtucker) [regress/README.regress] Add tcpwrappers issue, noted by tim@
|
||||||
- (dtucker) [moduli] Import new moduli file from OpenBSD.
|
- (dtucker) [moduli] Import new moduli file from OpenBSD.
|
||||||
|
@ -1766,4 +1773,4 @@
|
||||||
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
|
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
|
||||||
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
|
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
|
||||||
|
|
||||||
$Id: ChangeLog,v 1.3199 2004/01/28 04:44:04 dtucker Exp $
|
$Id: ChangeLog,v 1.3200 2004/01/30 01:58:51 dtucker Exp $
|
||||||
|
|
|
@ -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 t-exec
|
REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec
|
||||||
tests: $(REGRESS_TARGETS)
|
tests: $(REGRESS_TARGETS)
|
||||||
|
@ -41,7 +41,7 @@ CLEANFILES= t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
|
||||||
ssh_config ssh_proxy sshd_config sshd_proxy \
|
ssh_config ssh_proxy sshd_config sshd_proxy \
|
||||||
rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \
|
rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \
|
||||||
rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \
|
rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \
|
||||||
ls.copy banner.in banner.out remote_pid
|
ls.copy banner.in banner.out empty.in remote_pid
|
||||||
|
|
||||||
#LTESTS += ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp
|
#LTESTS += ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp
|
||||||
|
|
||||||
|
|
|
@ -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.
|
# Placed in the Public Domain.
|
||||||
|
|
||||||
tid="banner"
|
tid="banner"
|
||||||
echo "Banner $OBJ/banner.in" >> $OBJ/sshd_proxy
|
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
|
for s in 0 10 100 1000 10000 100000 ; do
|
||||||
if [ "$s" = "0" ]; then
|
if [ "$s" = "0" ]; then
|
||||||
# create empty banner
|
# create empty banner
|
||||||
rm -f $OBJ/banner.in
|
|
||||||
touch $OBJ/banner.in
|
touch $OBJ/banner.in
|
||||||
elif [ "$s" = "10" ]; then
|
elif [ "$s" = "10" ]; then
|
||||||
# create 10-byte banner file
|
# create 10-byte banner file
|
||||||
|
@ -22,8 +30,15 @@ for s in 0 10 100 1000 10000 100000 ; do
|
||||||
|
|
||||||
trace "test banner size $s"
|
trace "test banner size $s"
|
||||||
verbose "test $tid: size $s"
|
verbose "test $tid: size $s"
|
||||||
${SSH} -2 -F $OBJ/ssh_proxy otherhost true 2>$OBJ/banner.out
|
( ${SSH} -2 -F $OBJ/ssh_proxy otherhost true 2>$OBJ/banner.out && \
|
||||||
cmp $OBJ/banner.in $OBJ/banner.out || fail "banner size $s mismatch"
|
cmp $OBJ/banner.in $OBJ/banner.out ) || \
|
||||||
|
fail "banner size $s mismatch"
|
||||||
done
|
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
|
||||||
|
|
Loading…
Reference in New Issue