28 files changed, 88 insertions, 552 deletions

diff --git a/regress/Makefile b/regress/Makefile
index 623be8d82..6e2029348 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,11 +1,8 @@
-#       $OpenBSD: Makefile,v 1.24 2003/07/03 08:24:13 markus Exp $
+#       $OpenBSD: Makefile,v 1.20 2003/01/08 23:54:22 djm Exp $
 
-REGRESS_TARGETS=        t1 t2 t3 t4 t5 t6 t7 t-exec
-tests:          $(REGRESS_TARGETS)
+REGRESS_TARGETS=        t1 t2 t3 t4 t5 t6 t7
 
-clean:
-        for F in $(CLEANFILES); do rm -f $(OBJ)$$F; done
-distclean:      clean
+CLEANFILES+=    t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2
 
 LTESTS=         connect \
                 proxy-connect \
@@ -14,7 +11,6 @@ LTESTS= 	connect \
                 proto-mismatch \
                 exit-status \
                 transfer \
-                rekey \
                 stderr-data \
                 stderr-after-eof \
                 broken-pipe \
@@ -28,34 +24,30 @@ LTESTS= 	connect \
                 keygen-change \
                 sftp \
                 sftp-cmds \
-                sftp-badcmds \
                 sftp-batch \
-                reconfigure \
-                dynamic-forward \
                 forwarding
 
 USER!=          id -un
-CLEANFILES=     t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
-                authorized_keys_${USER} known_hosts pidfile \
+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 remote_pid
+                ls.copy
 
-#LTESTS +=      ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp
+#LTESTS+=       ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp
 
 t1:
         ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv
 
 t2:
-        cat ${.CURDIR}/rsa_openssh.prv > $(OBJ)/t2.out
-        chmod 600 $(OBJ)/t2.out
-        ssh-keygen -yf $(OBJ)/t2.out | diff - ${.CURDIR}/rsa_openssh.pub
+        cat ${.CURDIR}/rsa_openssh.prv > t2.out
+        chmod 600 t2.out
+        ssh-keygen -yf t2.out | diff - ${.CURDIR}/rsa_openssh.pub
 
 t3:
-        ssh-keygen -ef ${.CURDIR}/rsa_openssh.pub >$(OBJ)/rsa_secsh.pub
-        ssh-keygen -if $(OBJ)/rsa_secsh.pub | diff - ${.CURDIR}/rsa_openssh.pub
-        rm -f ${.CURDIR}/rsa_secsh.pub
+        ssh-keygen -ef ${.CURDIR}/rsa_openssh.pub |\
+                ssh-keygen -if /dev/stdin |\
+                diff - ${.CURDIR}/rsa_openssh.pub
 
 t4:
         ssh-keygen -lf ${.CURDIR}/rsa_openssh.pub |\
@@ -66,21 +58,22 @@ t5:
                 awk '{print $$2}' | diff - ${.CURDIR}/t5.ok
 
 t6:
-        ssh-keygen -if ${.CURDIR}/dsa_ssh2.prv > $(OBJ)/t6.out1
-        ssh-keygen -if ${.CURDIR}/dsa_ssh2.pub > $(OBJ)/t6.out2
-        chmod 600 $(OBJ)/t6.out1
-        ssh-keygen -yf $(OBJ)/t6.out1 | diff - $(OBJ)/t6.out2
+        ssh-keygen -if ${.CURDIR}/dsa_ssh2.prv > t6.out1
+        ssh-keygen -if ${.CURDIR}/dsa_ssh2.pub > t6.out2
+        chmod 600 t6.out1
+        ssh-keygen -yf t6.out1 | diff - t6.out2
 
-$(OBJ)/t7.out:
+t7.out:
         ssh-keygen -q -t rsa -N '' -f $@
 
-t7: $(OBJ)/t7.out
-        ssh-keygen -lf $(OBJ)/t7.out > /dev/null
-        ssh-keygen -Bf $(OBJ)/t7.out > /dev/null
+t7: t7.out
+        ssh-keygen -lf t7.out > /dev/null
+        ssh-keygen -Bf t7.out > /dev/null
 
-t-exec: ${LTESTS:=.sh}
-        @if [ "x$?" = "x" ]; then exit 0; fi; \
-        for TEST in ""$?; do \
-                echo "run test $${TEST}" ... 1>&2; \
-                (sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
-        done
+.for t in ${LTESTS}
+REGRESS_TARGETS+=t-${t}
+t-${t}:
+        sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/${t}.sh
+.endfor
+
+.include "bsd.regress.mk"
diff --git a/regress/README.regress b/regress/README.regress
deleted file mode 100644
index 916894a88..000000000
--- a/regress/README.regress
+++ /dev/null
@@ -1,86 +0,0 @@
-Overview.
-
-$ ./configure && make tests
-
-You'll see some progress info. A failure will cause either the make to
-abort or the driver script to report a "FATAL" failure.
-
-The test consists of 2 parts. The first is the file-based tests which is
-driven by the Makefile, and the second is a set of network or proxycommand
-based tests, which are driven by a driver script (test-exec.sh) which is
-called multiple times by the Makefile.
-
-Failures in the first part will cause the Makefile to return an error.
-Failures in the second part will print a "FATAL" message for the failed
-test and continue.
-
-OpenBSD has a system-wide regression test suite. OpenSSH Portable's test
-suite is based on OpenBSD's with modifications.
-
-
-Environment variables.
-
-SUDO: path to sudo command, if desired. Note that some systems (notably
-        systems using PAM) require sudo to execute some tests.
-TEST_SSH_TRACE: set yo "yes" for verbose output from tests 
-TEST_SSH_QUIET: set to "yes" to suppress non-fatal output.
-TEST_SSH_x: path to "ssh" command under test, where x=SSH,SSHD,SSHAGENT,SSHADD
-        SSHKEYGEN,SSHKEYSCAN,SFTP,SFTPSERVER
-OBJ: used by test scripts to access build dir.
-
-
-Individual tests.
-
-You can invoke test-exec.sh directly if you set up the path to find the
-binaries under test and the test scripts themselves, for example:
-
-$ cd regress
-$ PATH=`pwd`/..:$PATH:. sh test-exec.sh `pwd` agent-timeout.sh
-ok agent timeout test
-
-
-Files.
-
-test-exec.sh: the main test driver. Sets environment, creates config files
-and keys and runs the specified test.
-
-At the time of writing, the individual tests are:
-agent-timeout.sh:       agent timeout test
-agent.sh:               simple agent test
-broken-pipe.sh:         broken pipe test
-connect-privsep.sh:     proxy connect with privsep
-connect.sh:             simple connect
-exit-status.sh:         remote exit status
-forwarding.sh:          local and remote forwarding
-keygen-change.sh:       change passphrase for key
-keyscan.sh:             keyscan
-proto-mismatch.sh:      protocol version mismatch
-proto-version.sh:       sshd version with different protocol combinations
-proxy-connect.sh:       proxy connect
-sftp.sh:                basic sftp put/get
-ssh-com-client.sh:      connect with ssh.com client
-ssh-com-keygen.sh:      ssh.com key import
-ssh-com-sftp.sh:        basic sftp put/get with ssh.com server
-ssh-com.sh:             connect to ssh.com server
-stderr-after-eof.sh:    stderr data after eof
-stderr-data.sh:         stderr data transfer
-transfer.sh:            transfer data
-try-ciphers.sh:         try ciphers
-yes-head.sh:            yes pipe head
-
-
-Problems?
-
-Run the failing test with shell tracing (-x) turned on:
-$ PATH=`pwd`/..:$PATH:. sh -x test-exec.sh `pwd` agent-timeout.sh
-
-Failed tests can be difficult to diagnose. Suggestions:
-- run the individual test via ./test-exec.sh `pwd` [testname]
-- set LogLevel to VERBOSE in test-exec.sh and enable syslogging of
-  auth.debug (eg to /var/log/authlog).
-
-
-Known Issues.
-
-
-$Id: README.regress,v 1.1 2003/09/04 05:39:54 dtucker Exp $
diff --git a/regress/agent-getpeereid.sh b/regress/agent-getpeereid.sh
index 46d20dc2b..0889fe80e 100644
--- a/regress/agent-getpeereid.sh
+++ b/regress/agent-getpeereid.sh
@@ -7,12 +7,6 @@ UNPRIV=nobody
 ASOCK=${OBJ}/agent
 SSH_AUTH_SOCK=/nonexistant
 
-if grep "#undef.*HAVE_GETPEEREID" ${BUILDDIR}/config.h >/dev/null 2>&1
-then
-        echo "skipped (not supported on this platform)"
-        exit 0
-fi
-
 trace "start agent"
 eval `${SSHAGENT} -s -a ${ASOCK}` > /dev/null
 r=$?
diff --git a/regress/agent-ptrace.sh b/regress/agent-ptrace.sh
index cd9c0023d..9f9c99960 100644
--- a/regress/agent-ptrace.sh
+++ b/regress/agent-ptrace.sh
@@ -3,22 +3,6 @@
 
 tid="disallow agent ptrace attach"
 
-if have_prog uname ; then
-        case `uname` in
-        Linux|HP-UX|SunOS|NetBSD|AIX|CYGWIN*)
-                echo "skipped (not supported on this platform)"
-                exit 0
-                ;;
-        esac
-fi
-
-if have_prog gdb ; then
-        : ok
-else
-        echo "skipped (gdb not found)"
-        exit 0
-fi
-
 trace "start agent"
 eval `${SSHAGENT} -s` > /dev/null
 r=$?
@@ -32,7 +16,7 @@ EOF
         if [ $? -ne 0 ]; then
                 fail "gdb failed: exit code $?"
         fi
-        grep 'ptrace: Operation not permitted.' >/dev/null ${OBJ}/gdb.out
+        grep -q 'ptrace: Operation not permitted.' ${OBJ}/gdb.out
         r=$?
         rm -f ${OBJ}/gdb.out
         if [ $r -ne 0 ]; then
diff --git a/regress/agent-timeout.sh b/regress/agent-timeout.sh
index 3a40e7af8..28b1be028 100644
--- a/regress/agent-timeout.sh
+++ b/regress/agent-timeout.sh
@@ -3,7 +3,7 @@
 
 tid="agent timeout test"
 
-SSHAGENT_TIMEOUT=10
+TIMEOUT=5
 
 trace "start agent"
 eval `${SSHAGENT} -s` > /dev/null
@@ -13,7 +13,7 @@ if [ $r -ne 0 ]; then
 else
         trace "add keys with timeout"
         for t in rsa rsa1; do
-                ${SSHADD} -t ${SSHAGENT_TIMEOUT} $OBJ/$t > /dev/null 2>&1
+                ${SSHADD} -t ${TIMEOUT} $OBJ/$t > /dev/null 2>&1
                 if [ $? -ne 0 ]; then
                         fail "ssh-add did succeed exit code 0"
                 fi
@@ -23,10 +23,10 @@ else
         if [ $n -ne 2 ]; then
                 fail "ssh-add -l did not return 2 keys: $n"
         fi
-        trace "sleeping 2*${SSHAGENT_TIMEOUT} seconds"
-        sleep ${SSHAGENT_TIMEOUT}
-        sleep ${SSHAGENT_TIMEOUT}
-        ${SSHADD} -l 2> /dev/null | grep 'The agent has no identities.' >/dev/null
+        trace "sleeping 2*${TIMEOUT} seconds"
+        sleep ${TIMEOUT}
+        sleep ${TIMEOUT}
+        ${SSHADD} -l 2> /dev/null | grep -q 'The agent has no identities.'
         if [ $? -ne 0 ]; then
                 fail "ssh-add -l still returns keys after timeout"
         fi
diff --git a/regress/agent.sh b/regress/agent.sh
index b34487767..7e9b4cb18 100644
--- a/regress/agent.sh
+++ b/regress/agent.sh
@@ -19,7 +19,7 @@ else
                 fail "ssh-add -l did not fail with exit code 1"
         fi
         trace "overwrite authorized keys"
-        echon > $OBJ/authorized_keys_$USER
+        echo -n > $OBJ/authorized_keys_$USER
         for t in rsa rsa1; do
                 # generate user key for agent
                 rm -f $OBJ/$t-agent
diff --git a/regress/authorized_keys_root b/regress/authorized_keys_root
new file mode 100644
index 000000000..328537120
--- /dev/null
+++ b/regress/authorized_keys_root
@@ -0,0 +1,2 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAt6ttBacbgvLPsF1VWWfT51t55/5Mj62Xp8EaoH5SNSaLiGIgrrja077lKEept75U4uKFUYU5JJX9GPE9A7Y43LXv+/A6Jm4rEj/U0s4H8tf0UmzVC3t6xh0sRK0hYVNILyoHnIAgdY8CmOiybw7p6DxJY8MRAehD3n9+kFcachU= root@xenon
+1024 35 132789427207755621599908461558918671787816692978751485815532032934821830960131244604702969298486352138126114080367609979552547448841583955126231410604842765726397407176910594168641969541792069550006878863592030567875913190224374005367884774859544943329148178663694126456638431428703289837638970464685771819219 root@xenon
diff --git a/regress/copy.1 b/regress/copy.1
new file mode 100755
index 000000000..92d4d20f9
--- /dev/null
+++ b/regress/copy.1
diff --git a/regress/copy.2 b/regress/copy.2
new file mode 100755
index 000000000..92d4d20f9
--- /dev/null
+++ b/regress/copy.2
diff --git a/regress/dynamic-forward.sh b/regress/dynamic-forward.sh
deleted file mode 100644
index 2b0b825d0..000000000
--- a/regress/dynamic-forward.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#       $OpenBSD: dynamic-forward.sh,v 1.2 2003/07/03 08:21:46 markus Exp $
-#       Placed in the Public Domain.
-
-tid="dynamic forwarding"
-
-PORT=4242
-FWDPORT=4243
-DATA=/bin/ls${EXEEXT}
-
-if have_prog nc && nc -h 2>&1 | grep "x proxy address" >/dev/null; then
-        proxycmd="nc -x 127.0.0.1:$FWDPORT -X"
-elif have_prog connect; then
-        proxycmd="connect -S 127.0.0.1:$FWDPORT -"
-else
-        echo "skipped (no suitable ProxyCommand found)"
-        exit 0
-fi
-trace "will use ProxyCommand $proxycmd"
-
-start_sshd
-
-for p in 1 2; do
-        trace "start dynamic forwarding, fork to background"
-        ${SSH} -$p -F $OBJ/ssh_config -f -D $FWDPORT -q somehost \
-                exec sh -c \'"echo \$\$ > $OBJ/remote_pid; exec sleep 444"\'
-
-        for s in 4 5; do
-            for h in 127.0.0.1 localhost; do
-                trace "testing ssh protocol $p socks version $s host $h"
-                ${SSH} -F $OBJ/ssh_config \
-                        -o "ProxyCommand ${proxycmd}${s} $h $PORT" \
-                        somehost cat $DATA > $OBJ/ls.copy
-                test -f $OBJ/ls.copy     || fail "failed copy $DATA"
-                cmp $DATA $OBJ/ls.copy || fail "corrupted copy of $DATA"
-            done
-        done
-
-        if [ -f $OBJ/remote_pid ]; then
-                remote=`cat $OBJ/remote_pid`
-                trace "terminate remote shell, pid $remote"
-                if [ $remote -gt 1 ]; then
-                        kill -HUP $remote
-                fi
-        else
-                fail "no pid file: $OBJ/remote_pid"
-        fi
-done
diff --git a/regress/forwarding.sh b/regress/forwarding.sh
index dfe065dd6..7b281c013 100644
--- a/regress/forwarding.sh
+++ b/regress/forwarding.sh
@@ -2,7 +2,6 @@
 #       Placed in the Public Domain.
 
 tid="local and remote forwarding"
-DATA=/bin/ls${EXEEXT}
 
 start_sshd
 
@@ -26,9 +25,9 @@ for p in 1 2; do
 
         trace "transfer over forwarded channels and check result"
         ${SSH} -$q -F $OBJ/ssh_config -p$last -o 'ConnectionAttempts=4' \
-                somehost cat $DATA > $OBJ/ls.copy
-        test -f $OBJ/ls.copy                    || fail "failed copy $DATA"
-        cmp $DATA $OBJ/ls.copy                  || fail "corrupted copy of $DATA"
+                somehost cat /bin/ls > $OBJ/ls.copy
+        test -f $OBJ/ls.copy                    || fail "failed copy /bin/ls"
+        cmp /bin/ls $OBJ/ls.copy                || fail "corrupted copy of /bin/ls"
 
         sleep 10
 done
diff --git a/regress/proto-version.sh b/regress/proto-version.sh
index 1651a69e1..7dc616f5f 100644
--- a/regress/proto-version.sh
+++ b/regress/proto-version.sh
@@ -8,7 +8,7 @@ check_version ()
 {
         version=$1
         expect=$2
-        banner=`echon | ${SSHD} -o "Protocol=${version}" -i -f ${OBJ}/sshd_proxy`
+        banner=`echo -n | ${SSHD} -o "Protocol=${version}" -i -f ${OBJ}/sshd_proxy`
         case ${banner} in
         SSH-1.99-*)
                 proto=199
diff --git a/regress/reconfigure.sh b/regress/reconfigure.sh
deleted file mode 100644
index ba6dbc6f5..000000000
--- a/regress/reconfigure.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#       $OpenBSD: reconfigure.sh,v 1.2 2003/06/21 09:14:05 markus Exp $
-#       Placed in the Public Domain.
-
-tid="simple connect after reconfigure"
-
-# we need the full path to sshd for -HUP
-case $SSHD in
-/*)
-        # full path is OK 
-        ;;
-*)
-        # otherwise make fully qualified
-        SSHD=$OBJ/$SSHD
-esac
-
-start_sshd
-
-$SUDO kill -HUP `cat $PIDFILE`
-sleep 1
-
-trace "wait for sshd to restart"
-i=0;
-while [ ! -f $PIDFILE -a $i -lt 10 ]; do
-        i=`expr $i + 1`
-        sleep $i
-done
-
-test -f $PIDFILE || fatal "sshd did not restart"
-
-for p in 1 2; do
-        ${SSH} -o "Protocol=$p" -F $OBJ/ssh_config somehost true
-        if [ $? -ne 0 ]; then
-                fail "ssh connect with protocol $p failed after reconfigure"
-        fi
-done
diff --git a/regress/rekey.sh b/regress/rekey.sh
deleted file mode 100644
index 6b7e845ec..000000000
--- a/regress/rekey.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#       $OpenBSD: rekey.sh,v 1.1 2003/03/28 13:58:28 markus Exp $
-#       Placed in the Public Domain.
-
-tid="rekey during transfer data"
-
-DATA=${OBJ}/data
-COPY=${OBJ}/copy
-LOG=${OBJ}/log
-
-rm -f ${COPY} ${LOG} ${DATA}
-dd if=/bin/ls${EXEEXT} of=${DATA} bs=1k seek=511 count=1 > /dev/null 2>&1
-
-for s in 16 1k 128k 256k; do
-        trace "rekeylimit ${s}"
-        rm -f ${COPY}
-        cat $DATA | \
-                ${SSH} -oCompression=no -oRekeyLimit=$s \
-                        -v -F $OBJ/ssh_proxy somehost "cat > ${COPY}" \
-                2> ${LOG}
-        if [ $? -ne 0 ]; then
-                fail "ssh failed"
-        fi
-        cmp $DATA ${COPY}               || fail "corrupted copy"
-        n=`grep 'NEWKEYS sent' ${LOG} | wc -l`
-        n=`expr $n - 1`
-        trace "$n rekeying(s)"
-        if [ $n -lt 1 ]; then
-                fail "no rekeying occured"
-        fi
-done
-rm -f ${COPY} ${LOG} ${DATA}
diff --git a/regress/sftp-badcmds.sh b/regress/sftp-badcmds.sh
deleted file mode 100644
index a6a19409d..000000000
--- a/regress/sftp-badcmds.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#       $OpenBSD: sftp-badcmds.sh,v 1.2 2003/05/15 04:07:12 mouring Exp $
-#       Placed in the Public Domain.
-
-tid="sftp invalid commands"
-
-DATA=/bin/ls${EXEEXT}
-DATA2=/bin/cat${EXEEXT}
-NONEXIST=/NONEXIST.$$
-COPY=${OBJ}/copy
-GLOBFILES=`(cd /bin;echo l*)`
-
-rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd
-
-rm -f ${COPY}
-verbose "$tid: get nonexistent"
-echo "get $NONEXIST $COPY" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
-        || fail "get nonexistent failed"
-test -f ${COPY} && fail "existing copy after get nonexistent"
-
-rm -f ${COPY}.dd/*
-verbose "$tid: glob get to nonexistent directory"
-echo "get /bin/l* $NONEXIST" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
-        || fail "get nonexistent failed"
-for x in $GLOBFILES; do
-        test -f ${COPY}.dd/$x && fail "existing copy after get nonexistent"
-done
-
-rm -f ${COPY}
-verbose "$tid: put nonexistent"
-echo "put $NONEXIST $COPY" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
-        || fail "put nonexistent failed"
-test -f ${COPY} && fail "existing copy after put nonexistent"
-
-rm -f ${COPY}.dd/*
-verbose "$tid: glob put to nonexistent directory"
-echo "put /bin/l* ${COPY}.dd" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
-        || fail "put nonexistent failed"
-for x in $GLOBFILES; do
-        test -f ${COPY}.dd/$x && fail "existing copy after nonexistent"
-done
-
-rm -f ${COPY}
-verbose "$tid: rename nonexistent"
-echo "rename $NONEXIST ${COPY}.1" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
-        || fail "rename nonexist failed"
-test -f ${COPY}.1 && fail "file exists after rename nonexistent"
-
-rm -f ${COPY} ${COPY}.1
-cp $DATA $COPY
-cp $DATA2 ${COPY}.1
-verbose "$tid: rename target exists"
-echo "rename $COPY ${COPY}.1" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
-        || fail "rename target exists failed"
-test -f ${COPY} || fail "oldname missing after rename target exists"
-test -f ${COPY}.1 || fail "newname missing after rename target exists"
-cmp $DATA ${COPY} >/dev/null 2>&1 || fail "corrupted oldname after rename target exists"
-cmp $DATA2 ${COPY}.1 >/dev/null 2>&1 || fail "corrupted newname after rename target exists"
-
-rm -rf ${COPY} ${COPY}.dd
-cp $DATA $COPY
-mkdir ${COPY}.dd
-verbose "$tid: rename target exists (directory)"
-echo "rename $COPY ${COPY}.dd" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
-        || fail "rename target exists (directory) failed"
-test -f ${COPY} || fail "oldname missing after rename target exists (directory)"
-test -d ${COPY}.dd || fail "newname missing after rename target exists (directory)"
-cmp $DATA ${COPY} >/dev/null 2>&1 || fail "corrupted oldname after rename target exists (directory)"
-
-rm -f ${COPY}.dd/*
-rm -rf ${COPY}
-cp ${DATA2} ${COPY}
-verbose "$tid: glob put files to local file"
-echo "put /bin/l* $COPY" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 
-cmp ${DATA2} ${COPY} || fail "put successed when it should have failed"
-
-rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd
-
-
diff --git a/regress/sftp-batch.sh b/regress/sftp-batch.sh
index f648eae80..cffacb6df 100644
--- a/regress/sftp-batch.sh
+++ b/regress/sftp-batch.sh
@@ -3,9 +3,9 @@
 
 tid="sftp batchfile"
 
-DATA=/bin/ls${EXEEXT}
+DATA=/bin/ls
 COPY=${OBJ}/copy
-BATCH=${OBJ}/sftp-batch.tmp
+BATCH=${OBJ}/sftp-batch
 
 rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${BATCH}.*
 
diff --git a/regress/sftp-cmds.sh b/regress/sftp-cmds.sh
index 1256aeb2d..462c6802f 100644
--- a/regress/sftp-cmds.sh
+++ b/regress/sftp-cmds.sh
@@ -1,42 +1,17 @@
-#       $OpenBSD: sftp-cmds.sh,v 1.5 2003/07/19 00:46:31 djm Exp $
+#       $OpenBSD: sftp-cmds.sh,v 1.2 2003/01/10 07:52:41 djm Exp $
 #       Placed in the Public Domain.
 
 # XXX - TODO: 
+# - globbed operations
 # - chmod / chown / chgrp
 # - -p flag for get & put
 
 tid="sftp commands"
 
-DATA=/bin/ls${EXEEXT}
+DATA=/bin/ls
 COPY=${OBJ}/copy
-# test that these files are readable!
-for i in `(cd /bin;echo l*)`
-do
-        if [ -r $i ]; then
-                GLOBFILES="$GLOBFILES $i"
-        fi
-done
-
-if have_prog uname
-then
-        case `uname` in
-        CYGWIN*)
-                os=cygwin
-                ;;
-        *)
-                os=`uname`
-                ;;
-        esac
-else
-        os="unknown"
-fi
-
-# Path with embedded quote
-QUOTECOPY=${COPY}".\"blah\""
-QUOTECOPY_ARG=${COPY}'.\"blah\"'
-
-rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${COPY}.dd2
-mkdir ${COPY}.dd
+
+rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${BATCH}.*
 
 verbose "$tid: lls"
 echo "lls ${OBJ}" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
@@ -79,91 +54,21 @@ echo "get $DATA $COPY" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
         || fail "get failed"
 cmp $DATA ${COPY} || fail "corrupted copy after get"
 
-rm -f ${COPY}.dd/*
-verbose "$tid: get to directory"
-echo "get $DATA ${COPY}.dd" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
-        || fail "get failed"
-cmp $DATA ${COPY}.dd/`basename $DATA` || fail "corrupted copy after get"
-
-rm -f ${COPY}.dd/*
-verbose "$tid: glob get to directory"
-echo "get /bin/l* ${COPY}.dd" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
-        || fail "get failed"
-for x in $GLOBFILES; do
-        cmp /bin/$x ${COPY}.dd/$x || fail "corrupted copy after get"
-done
-
-rm -f ${COPY}.dd/*
-verbose "$tid: get to local dir"
-(echo "lcd ${COPY}.dd"; echo "get $DATA" ) | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
-        || fail "get failed"
-cmp $DATA ${COPY}.dd/`basename $DATA` || fail "corrupted copy after get"
-
-rm -f ${COPY}.dd/*
-verbose "$tid: glob get to local dir"
-(echo "lcd ${COPY}.dd"; echo "get /bin/l*") | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
-        || fail "get failed"
-for x in $GLOBFILES; do
-        cmp /bin/$x ${COPY}.dd/$x || fail "corrupted copy after get"
-done
-
 rm -f ${COPY}
 verbose "$tid: put"
 echo "put $DATA $COPY" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
         || fail "put failed"
 cmp $DATA ${COPY} || fail "corrupted copy after put"
 
-if [ "$os" != "cygwin" ]; then
-rm -f ${QUOTECOPY}
-verbose "$tid: put filename with quotes"
-echo "put $DATA \"$QUOTECOPY_ARG\"" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
-        || fail "put failed"
-cmp $DATA ${QUOTECOPY} || fail "corrupted copy after put with quotes"
-fi
-
-rm -f ${COPY}.dd/*
-verbose "$tid: put to directory"
-echo "put $DATA ${COPY}.dd" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
-        || fail "put failed"
-cmp $DATA ${COPY}.dd/`basename $DATA` || fail "corrupted copy after put"
-
-rm -f ${COPY}.dd/*
-verbose "$tid: glob put to directory"
-echo "put /bin/l* ${COPY}.dd" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
-        || fail "put failed"
-for x in $GLOBFILES; do
-        cmp /bin/$x ${COPY}.dd/$x || fail "corrupted copy after put"
-done
-
-rm -f ${COPY}.dd/*
-verbose "$tid: put to local dir"
-(echo "cd ${COPY}.dd"; echo "put $DATA") | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
-        || fail "put failed"
-cmp $DATA ${COPY}.dd/`basename $DATA` || fail "corrupted copy after put"
-
-rm -f ${COPY}.dd/*
-verbose "$tid: glob put to local dir"
-(echo "cd ${COPY}.dd"; echo "put /bin/l*") | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
-        || fail "put failed"
-for x in $GLOBFILES; do
-        cmp /bin/$x ${COPY}.dd/$x || fail "corrupted copy after put"
-done
-
 verbose "$tid: rename"
 echo "rename $COPY ${COPY}.1" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
         || fail "rename failed"
 test -f ${COPY}.1 || fail "missing file after rename"
 cmp $DATA ${COPY}.1 >/dev/null 2>&1 || fail "corrupted copy after rename"
 
-verbose "$tid: rename directory"
-echo "rename ${COPY}.dd ${COPY}.dd2" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
-        || fail "rename directory failed"
-test -d ${COPY}.dd && fail "oldname exists after rename directory"
-test -d ${COPY}.dd2 || fail "missing newname after rename directory"
-
 verbose "$tid: ln"
 echo "ln ${COPY}.1 ${COPY}.2" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 || fail "ln failed"
-test -h ${COPY}.2 || fail "missing file after ln"
+test -L ${COPY}.2 || fail "missing file after ln"
 
 verbose "$tid: mkdir"
 echo "mkdir ${COPY}.dd" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
@@ -190,6 +95,6 @@ verbose "$tid: lchdir"
 echo "lchdir ${COPY}.dd" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
         || fail "lchdir failed"
 
-rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${COPY}.dd2
+rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${BATCH}.*
 
 
diff --git a/regress/sftp.sh b/regress/sftp.sh
index 0e22f8f6b..e8d473123 100644
--- a/regress/sftp.sh
+++ b/regress/sftp.sh
@@ -3,33 +3,27 @@
 
 tid="basic sftp put/get"
 
-DATA=/bin/ls${EXEEXT}
+DATA=/bin/ls
 COPY=${OBJ}/copy
 
-SFTPCMDFILE=${OBJ}/batch
-cat >$SFTPCMDFILE <<EOF
-version
-get $DATA ${COPY}.1
-put $DATA ${COPY}.2
-EOF
-
 BUFFERSIZE="5 1000 32000 64000"
 REQUESTS="1 2 10"
 
 for B in ${BUFFERSIZE}; do
         for R in ${REQUESTS}; do
                 verbose "test $tid: buffer_size $B num_requests $R"
-                rm -f ${COPY}.1 ${COPY}.2                
-                ${SFTP} -P ${SFTPSERVER} -B $B -R $R -b $SFTPCMDFILE \
-                > /dev/null 2>&1
+                rm -f ${COPY}.1 ${COPY}.2
+                ${SFTP} -P ${SFTPSERVER} -B $B -R $R -b /dev/stdin \
+                > /dev/null 2>&1 << EOF
+                version
+                get $DATA ${COPY}.1
+                put $DATA ${COPY}.2
+EOF
                 r=$?
                 if [ $r -ne 0 ]; then
                         fail "sftp failed with $r"
-                else 
-                        cmp $DATA ${COPY}.1 || fail "corrupted copy after get"
-                        cmp $DATA ${COPY}.2 || fail "corrupted copy after put"
                 fi
+                cmp $DATA ${COPY}.1 || fail "corrupted copy after get"
+                cmp $DATA ${COPY}.2 || fail "corrupted copy after put"
         done
 done
-rm -f ${COPY}.1 ${COPY}.2                
-rm -f $SFTPCMDFILE
diff --git a/regress/ssh-com-client.sh b/regress/ssh-com-client.sh
index fc953228e..015ebbb8c 100644
--- a/regress/ssh-com-client.sh
+++ b/regress/ssh-com-client.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: ssh-com-client.sh,v 1.5 2003/05/14 22:08:27 markus Exp $
+#       $OpenBSD: ssh-com-client.sh,v 1.4 2002/07/16 08:58:16 markus Exp $
 #       Placed in the Public Domain.
 
 tid="connect with ssh.com client"
@@ -17,8 +17,6 @@ VERSIONS="
         3.0.0
         3.1.0
         3.2.0
-        3.2.2
-        3.2.3
         3.3.0"
 
 # 2.0.10 2.0.12 2.0.13 don't like the test setup
@@ -64,7 +62,7 @@ EOF
 # we need a real server (no ProxyConnect option)
 start_sshd
 
-DATA=/bin/ls${EXEEXT}
+DATA=/bin/ls
 COPY=${OBJ}/copy
 rm -f ${COPY}
 
diff --git a/regress/ssh-com-keygen.sh b/regress/ssh-com-keygen.sh
index dbe9b0a6b..e93dc78c9 100644
--- a/regress/ssh-com-keygen.sh
+++ b/regress/ssh-com-keygen.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: ssh-com-keygen.sh,v 1.3 2003/05/14 22:08:27 markus Exp $
+#       $OpenBSD: ssh-com-keygen.sh,v 1.2 2002/07/16 08:58:16 markus Exp $
 #       Placed in the Public Domain.
 
 tid="ssh.com key import"
@@ -20,8 +20,6 @@ VERSIONS="
         3.0.0
         3.1.0
         3.2.0
-        3.2.2
-        3.2.3
         3.3.0"
 
 COMPRV=${OBJ}/comkey
diff --git a/regress/ssh-com-sftp.sh b/regress/ssh-com-sftp.sh
index 6ca7dad51..f08018b84 100644
--- a/regress/ssh-com-sftp.sh
+++ b/regress/ssh-com-sftp.sh
@@ -1,17 +1,10 @@
-#       $OpenBSD: ssh-com-sftp.sh,v 1.4 2003/05/14 22:08:27 markus Exp $
+#       $OpenBSD: ssh-com-sftp.sh,v 1.3 2002/07/16 08:58:16 markus Exp $
 #       Placed in the Public Domain.
 
 tid="basic sftp put/get with ssh.com server"
 
-DATA=/bin/ls${EXEEXT}
+DATA=/bin/ls
 COPY=${OBJ}/copy
-SFTPCMDFILE=${OBJ}/batch
-
-cat >$SFTPCMDFILE <<EOF
-version
-get $DATA ${COPY}.1
-put $DATA ${COPY}.2
-EOF
 
 BUFFERSIZE="5 1000 32000 64000"
 REQUESTS="1 2 10"
@@ -33,8 +26,6 @@ VERSIONS="
         3.0.0
         3.1.0
         3.2.0
-        3.2.2
-        3.2.3
         3.3.0"
 
 # go for it
@@ -48,17 +39,18 @@ for v in ${VERSIONS}; do
                 for R in ${REQUESTS}; do
                         verbose "test $tid: buffer_size $B num_requests $R"
                         rm -f ${COPY}.1 ${COPY}.2
-                        ${SFTP} -P ${server} -B $B -R $R -b $SFTPCMDFILE \
-                        > /dev/null 2>&1
+                        ${SFTP} -P ${server} -B $B -R $R -b /dev/stdin \
+                        > /dev/null 2>&1 << EOF
+                        version
+                        get $DATA ${COPY}.1
+                        put $DATA ${COPY}.2
+EOF
                         r=$?
                         if [ $r -ne 0 ]; then
                                 fail "sftp failed with $r"
-                        else                                
-                                cmp $DATA ${COPY}.1 || fail "corrupted copy after get"
-                                cmp $DATA ${COPY}.2 || fail "corrupted copy after put"
                         fi
+                        cmp $DATA ${COPY}.1 || fail "corrupted copy after get"
+                        cmp $DATA ${COPY}.2 || fail "corrupted copy after put"
                 done
         done
 done
-rm -f ${COPY}.1 ${COPY}.2                
-rm -f $SFTPCMDFILE
diff --git a/regress/ssh-com.sh b/regress/ssh-com.sh
index 78ae6e9e1..c2bd15380 100644
--- a/regress/ssh-com.sh
+++ b/regress/ssh-com.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: ssh-com.sh,v 1.5 2003/05/14 22:08:27 markus Exp $
+#       $OpenBSD: ssh-com.sh,v 1.4 2002/07/16 08:58:16 markus Exp $
 #       Placed in the Public Domain.
 
 tid="connect to ssh.com server"
@@ -18,8 +18,6 @@ VERSIONS="
         3.0.0
         3.1.0
         3.2.0
-        3.2.2
-        3.2.3
         3.3.0"
 # 2.0.10 does not support UserConfigDirectory
 # 2.3.1 requires a config in $HOME/.ssh2
@@ -67,7 +65,7 @@ done
 
 # convert and append DSA hostkey
 (
-        echon 'ssh2-localhost-with-alias,127.0.0.1,::1 '
+        echo -n 'ssh2-localhost-with-alias,127.0.0.1,::1 '
         ${SSHKEYGEN} -if ${SRC}/dsa_ssh2.pub
 ) >> $OBJ/known_hosts
 
diff --git a/regress/stderr-after-eof.sh b/regress/stderr-after-eof.sh
index 05a5ea56d..bebd700bf 100644
--- a/regress/stderr-after-eof.sh
+++ b/regress/stderr-after-eof.sh
@@ -7,23 +7,13 @@ DATA=/etc/motd
 DATA=${OBJ}/data
 COPY=${OBJ}/copy
 
-if have_prog md5sum; then
-        CHECKSUM=md5sum
-elif have_prog openssl; then
-        CHECKSUM="openssl md5"
-elif have_prog cksum; then
-        CHECKSUM=cksum
-elif have_prog sum; then
-        CHECKSUM=sum
-else
-        fatal "No checksum program available, aborting $tid test"
-fi
+MD5=md5sum
 
 # setup data
 rm -f ${DATA} ${COPY}
 cp /dev/null ${DATA}
 for i in 1 2 3 4 5 6; do
-        (date;echo $i) | $CHECKSUM >> ${DATA}
+        (date;echo $i) | $MD5 >> ${DATA}
 done
 
 ${SSH} -2 -F $OBJ/ssh_proxy otherhost \
diff --git a/regress/stderr-data.sh b/regress/stderr-data.sh
index 1daf79bb5..0157690b0 100644
--- a/regress/stderr-data.sh
+++ b/regress/stderr-data.sh
@@ -3,7 +3,7 @@
 
 tid="stderr data transfer"
 
-DATA=/bin/ls${EXEEXT}
+DATA=/bin/ls
 COPY=${OBJ}/copy
 rm -f ${COPY}
 
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index cc7ea67fe..a7a8ddbe6 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -2,16 +2,10 @@
 #       Placed in the Public Domain.
 
 PORT=4242
+USER=`id -un`
+SUDO=
 #SUDO=sudo
 
-if [ -x /usr/ucb/whoami ]; then
-        USER=`/usr/ucb/whoami`
-elif whoami >/dev/null 2>&1; then
-        USER=`whoami`
-else
-        USER=`id -un`
-fi
-
 OBJ=$1
 if [ "x$OBJ" = "x" ]; then
         echo '$OBJ not defined'
@@ -78,32 +72,6 @@ export SSH SSHD SSHAGENT SSHADD SSHKEYGEN SSHKEYSCAN SFTP SFTPSERVER
 #echo $SSH $SSHD $SSHAGENT $SSHADD $SSHKEYGEN $SSHKEYSCAN $SFTP $SFTPSERVER
 
 # helper
-echon()
-{
-       if [ "x`echo -n`" = "x" ]; then
-               echo -n "$@"
-       elif [ "x`echo '\c'`" = "x" ]; then
-               echo "$@\c"
-       else
-               fatal "Don't know how to echo without newline."
-       fi
-}
-
-have_prog()
-{
-        saved_IFS="$IFS"
-        IFS=":"
-        for i in $PATH
-        do
-                if [ -x $i/$1 ]; then
-                        IFS="$saved_IFS"
-                        return 0
-                fi
-        done
-        IFS="$saved_IFS"
-        return 1
-}
-
 cleanup ()
 {
         if [ -f $PIDFILE ]; then
@@ -143,7 +111,7 @@ fail ()
 
 fatal ()
 {
-        echon "FATAL: "
+        echo -n "FATAL: "
         fail "$@"
         cleanup
         exit $RESULT
@@ -162,7 +130,6 @@ cat << EOF > $OBJ/sshd_config
         PidFile                 $PIDFILE
         AuthorizedKeysFile      $OBJ/authorized_keys_%u
         LogLevel                QUIET
-        StrictModes             no
 EOF
 
 # server config for proxy connects
@@ -202,7 +169,7 @@ for t in rsa rsa1; do
 
         # known hosts file for client
         (
-                echon 'localhost-with-alias,127.0.0.1,::1 '
+                echo -n 'localhost-with-alias,127.0.0.1,::1 '
                 cat $OBJ/$t.pub
         ) >> $OBJ/known_hosts
 
@@ -222,7 +189,7 @@ chmod 644 $OBJ/authorized_keys_$USER
 # create a proxy version of the client config
 (
         cat $OBJ/ssh_config
-        echo proxycommand ${SUDO} ${SSHD} -i -f $OBJ/sshd_proxy
+        echo proxycommand ${SSHD} -i -f $OBJ/sshd_proxy
 ) > $OBJ/ssh_proxy
 
 # check proxy config
@@ -236,7 +203,7 @@ start_sshd ()
 
         trace "wait for sshd"
         i=0;
-        while [ ! -f $PIDFILE -a $i -lt 10 ]; do
+        while [ ! -f $PIDFILE -a $i -lt 5 ]; do
                 i=`expr $i + 1`
                 sleep $i
         done
diff --git a/regress/transfer.sh b/regress/transfer.sh
index 13ea367d5..31cdc0ce3 100644
--- a/regress/transfer.sh
+++ b/regress/transfer.sh
@@ -3,7 +3,7 @@
 
 tid="transfer data"
 
-DATA=/bin/ls${EXEEXT}
+DATA=/bin/ls
 COPY=${OBJ}/copy
 
 for p in 1 2; do
diff --git a/regress/try-ciphers.sh b/regress/try-ciphers.sh
index 2c727f66c..161f039c0 100644
--- a/regress/try-ciphers.sh
+++ b/regress/try-ciphers.sh
@@ -1,11 +1,10 @@
-#       $OpenBSD: try-ciphers.sh,v 1.8 2003/06/12 15:40:01 markus Exp $
+#       $OpenBSD: try-ciphers.sh,v 1.7 2002/04/03 09:30:01 markus Exp $
 #       Placed in the Public Domain.
 
 tid="try ciphers"
 
 ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc arcfour 
-        aes192-cbc aes256-cbc rijndael-cbc@lysator.liu.se
-        aes128-ctr aes192-ctr aes256-ctr"
+        aes192-cbc aes256-cbc rijndael-cbc@lysator.liu.se"
 macs="hmac-sha1 hmac-md5 hmac-sha1-96 hmac-md5-96"
 
 for c in $ciphers; do
diff --git a/regress/yes-head.sh b/regress/yes-head.sh
index 17a4d0dd4..f213f6863 100644
--- a/regress/yes-head.sh
+++ b/regress/yes-head.sh
@@ -4,7 +4,7 @@
 tid="yes pipe head"
 
 for p in 1 2; do
-        lines=`${SSH} -$p -F $OBJ/ssh_proxy thishost 'sh -c "while true;do echo yes;done | head -2000"' | (sleep 3 ; wc -l)`
+        lines=`${SSH} -$p -F $OBJ/ssh_proxy thishost 'yes | head -2000' | (sleep 3 ; wc -l)`
         if [ $? -ne 0 ]; then
                 fail "yes|head test failed"
                 lines = 0;