summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--regress/reconfigure.sh28
-rw-r--r--regress/rekey.sh31
-rw-r--r--regress/sftp-badcmds.sh78
4 files changed, 140 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 936ee6ea3..3f5fd2a54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,8 @@
23 - markus@cvs.openbsd.org 2003/06/17 18:14:23 23 - markus@cvs.openbsd.org 2003/06/17 18:14:23
24 [cipher-ctr.c] 24 [cipher-ctr.c]
25 use license from /usr/share/misc/license.template for new code 25 use license from /usr/share/misc/license.template for new code
26 - (dtucker) [reconfigure.sh rekey.sh sftp-badcmds.sh]
27 Import new regression tests from OpenBSD
26 28
2720030614 2920030614
28 - (djm) Update license on fake-rfc2553.[ch]; ok itojun@ 30 - (djm) Update license on fake-rfc2553.[ch]; ok itojun@
@@ -538,4 +540,4 @@
538 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 540 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
539 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 541 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
540 542
541$Id: ChangeLog,v 1.2808 2003/06/18 10:29:35 djm Exp $ 543$Id: ChangeLog,v 1.2809 2003/06/18 12:18:57 dtucker Exp $
diff --git a/regress/reconfigure.sh b/regress/reconfigure.sh
new file mode 100644
index 000000000..1de846a7e
--- /dev/null
+++ b/regress/reconfigure.sh
@@ -0,0 +1,28 @@
1# $OpenBSD: reconfigure.sh,v 1.1 2003/06/12 15:43:32 markus Exp $
2# Placed in the Public Domain.
3
4tid="simple connect after reconfigure"
5
6# we need the full path to sshd for -HUP
7SSHD=/usr/sbin/sshd
8
9start_sshd
10
11kill -HUP `cat $PIDFILE`
12sleep 1
13
14trace "wait for sshd to restart"
15i=0;
16while [ ! -f $PIDFILE -a $i -lt 10 ]; do
17 i=`expr $i + 1`
18 sleep $i
19done
20
21test -f $PIDFILE || fatal "sshd did not restart"
22
23for p in 1 2; do
24 ${SSH} -o "Protocol=$p" -F $OBJ/ssh_config somehost true
25 if [ $? -ne 0 ]; then
26 fail "ssh connect with protocol $p failed after reconfigure"
27 fi
28done
diff --git a/regress/rekey.sh b/regress/rekey.sh
new file mode 100644
index 000000000..26848d27b
--- /dev/null
+++ b/regress/rekey.sh
@@ -0,0 +1,31 @@
1# $OpenBSD: rekey.sh,v 1.1 2003/03/28 13:58:28 markus Exp $
2# Placed in the Public Domain.
3
4tid="rekey during transfer data"
5
6DATA=${OBJ}/data
7COPY=${OBJ}/copy
8LOG=${OBJ}/log
9
10rm -f ${COPY} ${LOG} ${DATA}
11dd if=/dev/zero of=${DATA} bs=1k count=512 > /dev/null 2>&1
12
13for s in 16 1k 128k 256k; do
14 trace "rekeylimit ${s}"
15 rm -f ${COPY}
16 cat $DATA | \
17 ${SSH} -oCompression=no -oRekeyLimit=$s \
18 -v -F $OBJ/ssh_proxy somehost "cat > ${COPY}" \
19 2> ${LOG}
20 if [ $? -ne 0 ]; then
21 fail "ssh failed"
22 fi
23 cmp $DATA ${COPY} || fail "corrupted copy"
24 n=`grep 'NEWKEYS sent' ${LOG} | wc -l`
25 n=`expr $n - 1`
26 trace "$n rekeying(s)"
27 if [ $n -lt 1 ]; then
28 fail "no rekeying occured"
29 fi
30done
31rm -f ${COPY} ${LOG} ${DATA}
diff --git a/regress/sftp-badcmds.sh b/regress/sftp-badcmds.sh
new file mode 100644
index 000000000..ca46909c0
--- /dev/null
+++ b/regress/sftp-badcmds.sh
@@ -0,0 +1,78 @@
1# $OpenBSD: sftp-badcmds.sh,v 1.2 2003/05/15 04:07:12 mouring Exp $
2# Placed in the Public Domain.
3
4tid="sftp invalid commands"
5
6DATA=/bin/ls
7DATA2=/bin/cat
8NONEXIST=/NONEXIST.$$
9COPY=${OBJ}/copy
10GLOBFILES=`(cd /bin;echo l*)`
11
12rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${BATCH}.*
13
14rm -f ${COPY}
15verbose "$tid: get nonexistent"
16echo "get $NONEXIST $COPY" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
17 || fail "get nonexistent failed"
18test -f ${COPY} && fail "existing copy after get nonexistent"
19
20rm -f ${COPY}.dd/*
21verbose "$tid: glob get to nonexistent directory"
22echo "get /bin/l* $NONEXIST" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
23 || fail "get nonexistent failed"
24for x in $GLOBFILES; do
25 test -f ${COPY}.dd/$x && fail "existing copy after get nonexistent"
26done
27
28rm -f ${COPY}
29verbose "$tid: put nonexistent"
30echo "put $NONEXIST $COPY" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
31 || fail "put nonexistent failed"
32test -f ${COPY} && fail "existing copy after put nonexistent"
33
34rm -f ${COPY}.dd/*
35verbose "$tid: glob put to nonexistent directory"
36echo "put /bin/l* ${COPY}.dd" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
37 || fail "put nonexistent failed"
38for x in $GLOBFILES; do
39 test -f ${COPY}.dd/$x && fail "existing copy after nonexistent"
40done
41
42rm -f ${COPY}
43verbose "$tid: rename nonexistent"
44echo "rename $NONEXIST ${COPY}.1" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
45 || fail "rename nonexist failed"
46test -f ${COPY}.1 && fail "file exists after rename nonexistent"
47
48rm -f ${COPY} ${COPY}.1
49cp $DATA $COPY
50cp $DATA2 ${COPY}.1
51verbose "$tid: rename target exists"
52echo "rename $COPY ${COPY}.1" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
53 || fail "rename target exists failed"
54test -f ${COPY} || fail "oldname missing after rename target exists"
55test -f ${COPY}.1 || fail "newname missing after rename target exists"
56cmp $DATA ${COPY} >/dev/null 2>&1 || fail "corrupted oldname after rename target exists"
57cmp $DATA2 ${COPY}.1 >/dev/null 2>&1 || fail "corrupted newname after rename target exists"
58
59rm -rf ${COPY} ${COPY}.dd
60cp $DATA $COPY
61mkdir ${COPY}.dd
62verbose "$tid: rename target exists (directory)"
63echo "rename $COPY ${COPY}.dd" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
64 || fail "rename target exists (directory) failed"
65test -f ${COPY} || fail "oldname missing after rename target exists (directory)"
66test -d ${COPY}.dd || fail "newname missing after rename target exists (directory)"
67cmp $DATA ${COPY} >/dev/null 2>&1 || fail "corrupted oldname after rename target exists (directory)"
68
69rm -f ${COPY}.dd/*
70rm -rf ${COPY}
71cp ${DATA2} ${COPY}
72verbose "$tid: glob put files to local file"
73echo "put /bin/l* $COPY" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1
74cmp ${DATA2} ${COPY} || fail "put successed when it should have failed"
75
76rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${BATCH}.*
77
78