diff options
Diffstat (limited to 'regress')
-rw-r--r-- | regress/cert-hostkey.sh | 6 | ||||
-rw-r--r-- | regress/cfgmatch.sh | 4 | ||||
-rw-r--r-- | regress/cipher-speed.sh | 4 |
3 files changed, 7 insertions, 7 deletions
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' | |||
12 | ${SSHKEYGEN} -q -N '' -t rsa -f $OBJ/host_ca_key ||\ | 12 | ${SSHKEYGEN} -q -N '' -t rsa -f $OBJ/host_ca_key ||\ |
13 | fail "ssh-keygen of host_ca_key failed" | 13 | fail "ssh-keygen of host_ca_key failed" |
14 | ( | 14 | ( |
15 | echo -n '@cert-authority ' | 15 | echon '@cert-authority ' |
16 | echo -n "$HOSTS " | 16 | echon "$HOSTS " |
17 | cat $OBJ/host_ca_key.pub | 17 | cat $OBJ/host_ca_key.pub |
18 | ) > $OBJ/known_hosts-cert | 18 | ) > $OBJ/known_hosts-cert |
19 | 19 | ||
@@ -102,7 +102,7 @@ for ktype in rsa dsa ; do | |||
102 | -n $HOSTS $OBJ/cert_host_key_${ktype} || | 102 | -n $HOSTS $OBJ/cert_host_key_${ktype} || |
103 | fail "couldn't sign cert_host_key_${ktype}" | 103 | fail "couldn't sign cert_host_key_${ktype}" |
104 | ( | 104 | ( |
105 | echo -n "$HOSTS " | 105 | echon "$HOSTS " |
106 | cat $OBJ/cert_host_key_${ktype}.pub | 106 | cat $OBJ/cert_host_key_${ktype}.pub |
107 | ) > $OBJ/known_hosts-cert | 107 | ) > $OBJ/known_hosts-cert |
108 | ( | 108 | ( |
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 | |||
57 | done | 57 | done |
58 | 58 | ||
59 | # Retry previous with key option, should also be denied. | 59 | # Retry previous with key option, should also be denied. |
60 | echo -n 'permitopen="127.0.0.1:'$PORT'" ' >$OBJ/authorized_keys_$USER | 60 | echon 'permitopen="127.0.0.1:'$PORT'" ' >$OBJ/authorized_keys_$USER |
61 | cat $OBJ/rsa.pub >> $OBJ/authorized_keys_$USER | 61 | cat $OBJ/rsa.pub >> $OBJ/authorized_keys_$USER |
62 | echo -n 'permitopen="127.0.0.1:'$PORT'" ' >>$OBJ/authorized_keys_$USER | 62 | echon 'permitopen="127.0.0.1:'$PORT'" ' >>$OBJ/authorized_keys_$USER |
63 | cat $OBJ/rsa1.pub >> $OBJ/authorized_keys_$USER | 63 | cat $OBJ/rsa1.pub >> $OBJ/authorized_keys_$USER |
64 | for p in 1 2; do | 64 | for p in 1 2; do |
65 | rm -f $pidfile | 65 | 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 | |||
19 | for c in $ciphers; do for m in $macs; do | 19 | for c in $ciphers; do for m in $macs; do |
20 | trace "proto 2 cipher $c mac $m" | 20 | trace "proto 2 cipher $c mac $m" |
21 | for x in $tries; do | 21 | for x in $tries; do |
22 | echo -n "$c/$m:\t" | 22 | echon "$c/$m:\t" |
23 | ( ${SSH} -o 'compression no' \ | 23 | ( ${SSH} -o 'compression no' \ |
24 | -F $OBJ/ssh_proxy -2 -m $m -c $c somehost \ | 24 | -F $OBJ/ssh_proxy -2 -m $m -c $c somehost \ |
25 | exec sh -c \'"dd of=/dev/null obs=32k"\' \ | 25 | exec sh -c \'"dd of=/dev/null obs=32k"\' \ |
@@ -35,7 +35,7 @@ ciphers="3des blowfish" | |||
35 | for c in $ciphers; do | 35 | for c in $ciphers; do |
36 | trace "proto 1 cipher $c" | 36 | trace "proto 1 cipher $c" |
37 | for x in $tries; do | 37 | for x in $tries; do |
38 | echo -n "$c:\t" | 38 | echon "$c:\t" |
39 | ( ${SSH} -o 'compression no' \ | 39 | ( ${SSH} -o 'compression no' \ |
40 | -F $OBJ/ssh_proxy -1 -c $c somehost \ | 40 | -F $OBJ/ssh_proxy -1 -c $c somehost \ |
41 | exec sh -c \'"dd of=/dev/null obs=32k"\' \ | 41 | exec sh -c \'"dd of=/dev/null obs=32k"\' \ |