4 files changed, 11 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 74bfc0469..3ce434723 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20100301
+ - (dtucker) [regress/{cert-hostkey,cfgmatch,cipher-speed}.sh} Replace
+   "echo -n" with "echon" for portability.
+
 20100228
  - (djm) [auth.c] On Cygwin, refuse usernames that have differences in
    case from that matched in the system password database. On this
diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh
index 14cd2230b..9539a927f 100644
--- a/regress/cert-hostkey.sh
+++ b/regress/cert-hostkey.sh
@@ -12,8 +12,8 @@ HOSTS='localhost-with-alias,127.0.0.1,::1'
 ${SSHKEYGEN} -q -N '' -t rsa  -f $OBJ/host_ca_key ||\
         fail "ssh-keygen of host_ca_key failed"
 (
-        echo -n '@cert-authority '
-        echo -n "$HOSTS "
+        echon '@cert-authority '
+        echon "$HOSTS "
         cat $OBJ/host_ca_key.pub
 ) > $OBJ/known_hosts-cert
 
@@ -102,7 +102,7 @@ for ktype in rsa dsa ; do
             -n $HOSTS $OBJ/cert_host_key_${ktype} ||
                 fail "couldn't sign cert_host_key_${ktype}"
         (
-                echo -n "$HOSTS "
+                echon "$HOSTS "
                 cat $OBJ/cert_host_key_${ktype}.pub
         ) > $OBJ/known_hosts-cert
         (
diff --git a/regress/cfgmatch.sh b/regress/cfgmatch.sh
index 35c5e52a1..96badd51b 100644
--- a/regress/cfgmatch.sh
+++ b/regress/cfgmatch.sh
@@ -57,9 +57,9 @@ for p in 1 2; do
 done
 
 # Retry previous with key option, should also be denied.
-echo -n 'permitopen="127.0.0.1:'$PORT'" ' >$OBJ/authorized_keys_$USER
+echon 'permitopen="127.0.0.1:'$PORT'" ' >$OBJ/authorized_keys_$USER
 cat $OBJ/rsa.pub >> $OBJ/authorized_keys_$USER
-echo -n 'permitopen="127.0.0.1:'$PORT'" ' >>$OBJ/authorized_keys_$USER
+echon 'permitopen="127.0.0.1:'$PORT'" ' >>$OBJ/authorized_keys_$USER
 cat $OBJ/rsa1.pub >> $OBJ/authorized_keys_$USER
 for p in 1 2; do
         rm -f $pidfile
diff --git a/regress/cipher-speed.sh b/regress/cipher-speed.sh
index d39a829d4..85de6d585 100644
--- a/regress/cipher-speed.sh
+++ b/regress/cipher-speed.sh
@@ -19,7 +19,7 @@ ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc
 for c in $ciphers; do for m in $macs; do
         trace "proto 2 cipher $c mac $m"
         for x in $tries; do
-                echo -n "$c/$m:\t"
+                echon "$c/$m:\t"
                 ( ${SSH} -o 'compression no' \
                         -F $OBJ/ssh_proxy -2 -m $m -c $c somehost \
                         exec sh -c \'"dd of=/dev/null obs=32k"\' \
@@ -35,7 +35,7 @@ ciphers="3des blowfish"
 for c in $ciphers; do
         trace "proto 1 cipher $c"
         for x in $tries; do
-                echo -n "$c:\t"
+                echon "$c:\t"
                 ( ${SSH} -o 'compression no' \
                         -F $OBJ/ssh_proxy -1 -c $c somehost \
                         exec sh -c \'"dd of=/dev/null obs=32k"\' \