- (dtucker) [regress/{cert-hostkey,cfgmatch,cipher-speed}.sh} Replace

   "echo -n" with "echon" for portability.

diff --git a/ChangeLog b/ChangeLog
index 74bfc04695962d47653890ab78e5624af617d920..3ce4347233bcc1c70e09c83404dcd38d3774e17d 100644 (file)
--- 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 14cd2230b6392eb442f8ed10063bd4c937c5d0f8..9539a927f0ca58ed86af9805e5c00d6faaa52f46 100644 (file)
--- 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 35c5e52a12bdf7ad8599fa7e9279c9b364cdae53..96badd51b26dda9a1d2f972c0820ccd9b2b1daf5 100644 (file)
--- 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 d39a829d4d6add20c0979d224e19a9b4a30de3c3..85de6d58560439333ea7eae3f1f46d559f203c43 100644 (file)
--- 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"\' \