tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

"echo -n" with "echon" for portability.
This commit is contained in:
Darren Tucker 2010-03-01 12:49:05 +11:00
parent bff24b8ad2
commit c614c78c53
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
20100301
- (dtucker) [regress/{cert-hostkey,cfgmatch,cipher-speed}.sh} Replace
"echo -n" with "echon" for portability.
20100228 20100228
- (djm) [auth.c] On Cygwin, refuse usernames that have differences in - (djm) [auth.c] On Cygwin, refuse usernames that have differences in
case from that matched in the system password database. On this case from that matched in the system password database. On this

6
regress/cert-hostkey.sh
View File

@ -12,8 +12,8 @@ HOSTS='localhost-with-alias,127.0.0.1,::1'
${SSHKEYGEN} -q -N '' -t rsa -f $OBJ/host_ca_key ||\ ${SSHKEYGEN} -q -N '' -t rsa -f $OBJ/host_ca_key ||\
fail "ssh-keygen of host_ca_key failed" fail "ssh-keygen of host_ca_key failed"
( (
echo -n '@cert-authority ' echon '@cert-authority '
echo -n "$HOSTS " echon "$HOSTS "
cat $OBJ/host_ca_key.pub cat $OBJ/host_ca_key.pub
) > $OBJ/known_hosts-cert ) > $OBJ/known_hosts-cert
@ -102,7 +102,7 @@ for ktype in rsa dsa ; do
-n $HOSTS $OBJ/cert_host_key_${ktype} || -n $HOSTS $OBJ/cert_host_key_${ktype} ||
fail "couldn't sign cert_host_key_${ktype}" fail "couldn't sign cert_host_key_${ktype}"
( (
echo -n "$HOSTS " echon "$HOSTS "
cat $OBJ/cert_host_key_${ktype}.pub cat $OBJ/cert_host_key_${ktype}.pub
) > $OBJ/known_hosts-cert ) > $OBJ/known_hosts-cert
( (

4
regress/cfgmatch.sh
View File

@ -57,9 +57,9 @@ for p in 1 2; do
done done
# Retry previous with key option, should also be denied. # 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 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 cat $OBJ/rsa1.pub >> $OBJ/authorized_keys_$USER
for p in 1 2; do for p in 1 2; do
rm -f $pidfile rm -f $pidfile

4
regress/cipher-speed.sh
View File

@ -19,7 +19,7 @@ ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc
for c in $ciphers; do for m in $macs; do for c in $ciphers; do for m in $macs; do
trace "proto 2 cipher $c mac $m" trace "proto 2 cipher $c mac $m"
for x in $tries; do for x in $tries; do
echo -n "$c/$m:\t" echon "$c/$m:\t"
( ${SSH} -o 'compression no' \ ( ${SSH} -o 'compression no' \
-F $OBJ/ssh_proxy -2 -m $m -c $c somehost \ -F $OBJ/ssh_proxy -2 -m $m -c $c somehost \
exec sh -c \'"dd of=/dev/null obs=32k"\' \ exec sh -c \'"dd of=/dev/null obs=32k"\' \
@ -35,7 +35,7 @@ ciphers="3des blowfish"
for c in $ciphers; do for c in $ciphers; do
trace "proto 1 cipher $c" trace "proto 1 cipher $c"
for x in $tries; do for x in $tries; do
echo -n "$c:\t" echon "$c:\t"
( ${SSH} -o 'compression no' \ ( ${SSH} -o 'compression no' \
-F $OBJ/ssh_proxy -1 -c $c somehost \ -F $OBJ/ssh_proxy -1 -c $c somehost \
exec sh -c \'"dd of=/dev/null obs=32k"\' \ exec sh -c \'"dd of=/dev/null obs=32k"\' \