diff options
Diffstat (limited to 'regress/usr.bin/ssh')
| -rw-r--r-- | regress/usr.bin/ssh/keytype.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/regress/usr.bin/ssh/keytype.sh b/regress/usr.bin/ssh/keytype.sh index e0ea5c01285..49c4c5e8e53 100644 --- a/regress/usr.bin/ssh/keytype.sh +++ b/regress/usr.bin/ssh/keytype.sh @@ -1,4 +1,4 @@ -# $OpenBSD: keytype.sh,v 1.5 2017/03/20 22:08:06 djm Exp $ +# $OpenBSD: keytype.sh,v 1.6 2017/10/30 22:01:52 djm Exp $ # Placed in the Public Domain. tid="login with different key types" @@ -8,20 +8,20 @@ cp $OBJ/ssh_proxy $OBJ/ssh_proxy_bak ktypes="dsa-1024 rsa-2048 ecdsa-256 rsa-3072 ecdsa-384 ecdsa-521 ed25519-512" -for kt in $ktypes; do +for kt in $ktypes; do rm -f $OBJ/key.$kt bits=${kt#*-} - type=${kt%-*} + type=${kt%-*} verbose "keygen $type, $bits bits" ${SSHKEYGEN} -b $bits -q -N '' -t $type -f $OBJ/key.$kt || \ fail "ssh-keygen for type $type, $bits bits failed" done tries="1 2 3" -for ut in $ktypes; do +for ut in $ktypes; do htypes=$ut #htypes=$ktypes - for ht in $htypes; do + for ht in $htypes; do case $ht in dsa-1024) t=ssh-dss;; ecdsa-256) t=ecdsa-sha2-nistp256;; @@ -33,13 +33,13 @@ for ut in $ktypes; do trace "ssh connect, userkey $ut, hostkey $ht" ( grep -v HostKey $OBJ/sshd_proxy_bak - echo HostKey $OBJ/key.$ht + echo HostKey $OBJ/key.$ht echo PubkeyAcceptedKeyTypes $t echo HostKeyAlgorithms $t ) > $OBJ/sshd_proxy ( grep -v IdentityFile $OBJ/ssh_proxy_bak - echo IdentityFile $OBJ/key.$ut + echo IdentityFile $OBJ/key.$ut echo PubkeyAcceptedKeyTypes $t echo HostKeyAlgorithms $t ) > $OBJ/ssh_proxy |