3 files changed, 42 insertions, 4 deletions
diff --git a/regress/usr.bin/ssh/Makefile b/regress/usr.bin/ssh/Makefile
index b7f6d4498c1..b3ac6fb45f1 100644
--- a/regress/usr.bin/ssh/Makefile
+++ b/regress/usr.bin/ssh/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 2002/03/21 21:45:07 markus Exp $
+#	$OpenBSD: Makefile,v 1.8 2002/03/21 22:27:00 markus Exp $
 
 REGRESSTARGETS=	t1 t2 t3 t4 t5 t6 t7
 
@@ -15,6 +15,7 @@ LTESTS= 	connect \
 		yes-head \
 		agent \
 		keyscan \
+		sftp \
 		forwarding
 
 USER!=		id -un
diff --git a/regress/usr.bin/ssh/sftp.sh b/regress/usr.bin/ssh/sftp.sh
new file mode 100644
index 00000000000..fcb0b02b6c9
--- /dev/null
+++ b/regress/usr.bin/ssh/sftp.sh
@@ -0,0 +1,29 @@
+#	$OpenBSD: sftp.sh,v 1.1 2002/03/21 22:27:00 markus Exp $
+#	Placed in the Public Domain.
+
+tid="basic sftp put/get"
+
+DATA=/bin/ls
+LS=${OBJ}/copy
+
+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 /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"
+		fi
+		cmp $DATA ${COPY}.1 || fail "corrupted copy after get"
+		cmp $DATA ${COPY}.2 || fail "corrupted copy after put"
+	done
+done
diff --git a/regress/usr.bin/ssh/test-exec.sh b/regress/usr.bin/ssh/test-exec.sh
index 785082b7628..d7194fd075c 100644
--- a/regress/usr.bin/ssh/test-exec.sh
+++ b/regress/usr.bin/ssh/test-exec.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: test-exec.sh,v 1.10 2002/03/15 13:08:56 markus Exp $
+#	$OpenBSD: test-exec.sh,v 1.11 2002/03/21 22:27:00 markus Exp $
 #	Placed in the Public Domain.
 
 PORT=4242
@@ -39,6 +39,8 @@ SSHAGENT=ssh-agent
 SSHADD=ssh-add
 SSHKEYGEN=ssh-keygen
 SSHKEYSCAN=ssh-keyscan
+SFTP=sftp
+SFTPSERVER=/usr/libexec/sftp-server
 
 if [ "x$TEST_SSH_SSH" != "x" ]; then
 	SSH=${TEST_SSH_SSH}
@@ -58,10 +60,16 @@ fi
 if [ "x$TEST_SSH_SSHKEYSCAN" != "x" ]; then
 	SSHKEYSCAN=${TEST_SSH_SSHKEYSCAN}
 fi
+if [ "x$TEST_SSH_SFTP" != "x" ]; then
+	SFTP=${TEST_SSH_SFTP}
+fi
+if [ "x$TEST_SSH_SFTPSERVER" != "x" ]; then
+	SFTPSERVER=${TEST_SSH_SFTP}
+fi
 
 # these should be used in tests
-export SSH SSHD SSHAGENT SSHADD SSHKEYGEN SSHKEYSCAN
-#echo $SSH $SSHD $SSHAGENT $SSHADD $SSHKEYGEN $SSHKEYSCAN
+export SSH SSHD SSHAGENT SSHADD SSHKEYGEN SSHKEYSCAN SFTP SFTPSERVER
+#echo $SSH $SSHD $SSHAGENT $SSHADD $SSHKEYGEN $SSHKEYSCAN $SFTP $SFTPSERVER
 
 # helper
 cleanup ()