From ee5f83d3eae52e997f93b9489aaaba3c828dbe32 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Wed, 18 Jun 2003 22:36:48 +1000
Subject:  - (dtucker) OpenBSD CVS Sync (regress/)    - markus@cvs.openbsd.org
 2003/05/14 22:08:27      [ssh-com-client.sh ssh-com-keygen.sh ssh-com-sftp.sh
 ssh-com.sh]      test against some new commerical versions

---
 regress/ssh-com.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'regress/ssh-com.sh')

diff --git a/regress/ssh-com.sh b/regress/ssh-com.sh
index c2bd15380..c915cc39c 100644
--- a/regress/ssh-com.sh
+++ b/regress/ssh-com.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: ssh-com.sh,v 1.4 2002/07/16 08:58:16 markus Exp $
+#	$OpenBSD: ssh-com.sh,v 1.5 2003/05/14 22:08:27 markus Exp $
 #	Placed in the Public Domain.
 
 tid="connect to ssh.com server"
@@ -18,6 +18,8 @@ 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
-- 
cgit v1.2.3


From 53c55f41798a7c386251f6922046b8d1f551a8f9 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Thu, 4 Sep 2003 15:16:56 +1000
Subject:    - [regress/agent.sh regress/proto-version.sh regress/ssh-com.sh   
   regress/test-exec.sh] Handle different was of echoing without newlines.

---
 ChangeLog                |  4 +++-
 regress/agent.sh         |  2 +-
 regress/proto-version.sh |  2 +-
 regress/ssh-com.sh       |  2 +-
 regress/test-exec.sh     | 15 +++++++++++++--
 5 files changed, 19 insertions(+), 6 deletions(-)

(limited to 'regress/ssh-com.sh')

diff --git a/ChangeLog b/ChangeLog
index 0e11f53d1..256d8c288 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,8 @@
    - [regress/sftp.sh] Remove dependency on /dev/stdin.
    - [regress/agent-ptrace.sh regress/agent-timeout.sh]
      "grep -q" -> "grep >/dev/null"
+   - [regress/agent.sh regress/proto-version.sh regress/ssh-com.sh
+     regress/test-exec.sh] Handle different was of echoing without newlines.
 
 20030903
  - (djm) OpenBSD CVS Sync
@@ -1007,4 +1009,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2951 2003/09/04 05:07:59 dtucker Exp $
+$Id: ChangeLog,v 1.2952 2003/09/04 05:16:56 dtucker Exp $
diff --git a/regress/agent.sh b/regress/agent.sh
index 7e9b4cb18..b34487767 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"
-	echo -n > $OBJ/authorized_keys_$USER
+	echon > $OBJ/authorized_keys_$USER
 	for t in rsa rsa1; do
 		# generate user key for agent
 		rm -f $OBJ/$t-agent
diff --git a/regress/proto-version.sh b/regress/proto-version.sh
index 7dc616f5f..1651a69e1 100644
--- a/regress/proto-version.sh
+++ b/regress/proto-version.sh
@@ -8,7 +8,7 @@ check_version ()
 {
 	version=$1
 	expect=$2
-	banner=`echo -n | ${SSHD} -o "Protocol=${version}" -i -f ${OBJ}/sshd_proxy`
+	banner=`echon | ${SSHD} -o "Protocol=${version}" -i -f ${OBJ}/sshd_proxy`
 	case ${banner} in
 	SSH-1.99-*)
 		proto=199
diff --git a/regress/ssh-com.sh b/regress/ssh-com.sh
index c915cc39c..78ae6e9e1 100644
--- a/regress/ssh-com.sh
+++ b/regress/ssh-com.sh
@@ -67,7 +67,7 @@ done
 
 # convert and append DSA hostkey
 (
-	echo -n 'ssh2-localhost-with-alias,127.0.0.1,::1 '
+	echon 'ssh2-localhost-with-alias,127.0.0.1,::1 '
 	${SSHKEYGEN} -if ${SRC}/dsa_ssh2.pub
 ) >> $OBJ/known_hosts
 
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index a7a8ddbe6..35f555b27 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -72,6 +72,17 @@ 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
+}
+
 cleanup ()
 {
 	if [ -f $PIDFILE ]; then
@@ -111,7 +122,7 @@ fail ()
 
 fatal ()
 {
-	echo -n "FATAL: "
+	echon "FATAL: "
 	fail "$@"
 	cleanup
 	exit $RESULT
@@ -169,7 +180,7 @@ for t in rsa rsa1; do
 
 	# known hosts file for client
 	(
-		echo -n 'localhost-with-alias,127.0.0.1,::1 '
+		echon 'localhost-with-alias,127.0.0.1,::1 '
 		cat $OBJ/$t.pub
 	) >> $OBJ/known_hosts
 
-- 
cgit v1.2.3