diff options
Diffstat (limited to 'regress/keytype.sh')
-rw-r--r-- | regress/keytype.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/regress/keytype.sh b/regress/keytype.sh index 88b022de4..f78a2c171 100644 --- a/regress/keytype.sh +++ b/regress/keytype.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: keytype.sh,v 1.5 2017/03/20 22:08:06 djm Exp $ | 1 | # $OpenBSD: keytype.sh,v 1.7 2018/03/12 00:54:04 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="login with different key types" | 4 | tid="login with different key types" |
@@ -17,7 +17,7 @@ for i in `$SSH -Q key`; do | |||
17 | esac | 17 | esac |
18 | done | 18 | done |
19 | 19 | ||
20 | for kt in $ktypes; do | 20 | for kt in $ktypes; do |
21 | rm -f $OBJ/key.$kt | 21 | rm -f $OBJ/key.$kt |
22 | bits=`echo ${kt} | awk -F- '{print $2}'` | 22 | bits=`echo ${kt} | awk -F- '{print $2}'` |
23 | type=`echo ${kt} | awk -F- '{print $1}'` | 23 | type=`echo ${kt} | awk -F- '{print $1}'` |
@@ -27,28 +27,28 @@ for kt in $ktypes; do | |||
27 | done | 27 | done |
28 | 28 | ||
29 | tries="1 2 3" | 29 | tries="1 2 3" |
30 | for ut in $ktypes; do | 30 | for ut in $ktypes; do |
31 | htypes=$ut | 31 | htypes=$ut |
32 | #htypes=$ktypes | 32 | #htypes=$ktypes |
33 | for ht in $htypes; do | 33 | for ht in $htypes; do |
34 | case $ht in | 34 | case $ht in |
35 | dsa-1024) t=ssh-dss;; | 35 | dsa-1024) t=ssh-dss;; |
36 | ecdsa-256) t=ecdsa-sha2-nistp256;; | 36 | ecdsa-256) t=ecdsa-sha2-nistp256;; |
37 | ecdsa-384) t=ecdsa-sha2-nistp384;; | 37 | ecdsa-384) t=ecdsa-sha2-nistp384;; |
38 | ecdsa-521) t=ecdsa-sha2-nistp521;; | 38 | ecdsa-521) t=ecdsa-sha2-nistp521;; |
39 | ed25519-512) t=ssh-ed25519;; | 39 | ed25519-512) t=ssh-ed25519;; |
40 | rsa-*) t=ssh-rsa;; | 40 | rsa-*) t=rsa-sha2-512,rsa-sha2-256,ssh-rsa;; |
41 | esac | 41 | esac |
42 | trace "ssh connect, userkey $ut, hostkey $ht" | 42 | trace "ssh connect, userkey $ut, hostkey $ht" |
43 | ( | 43 | ( |
44 | grep -v HostKey $OBJ/sshd_proxy_bak | 44 | grep -v HostKey $OBJ/sshd_proxy_bak |
45 | echo HostKey $OBJ/key.$ht | 45 | echo HostKey $OBJ/key.$ht |
46 | echo PubkeyAcceptedKeyTypes $t | 46 | echo PubkeyAcceptedKeyTypes $t |
47 | echo HostKeyAlgorithms $t | 47 | echo HostKeyAlgorithms $t |
48 | ) > $OBJ/sshd_proxy | 48 | ) > $OBJ/sshd_proxy |
49 | ( | 49 | ( |
50 | grep -v IdentityFile $OBJ/ssh_proxy_bak | 50 | grep -v IdentityFile $OBJ/ssh_proxy_bak |
51 | echo IdentityFile $OBJ/key.$ut | 51 | echo IdentityFile $OBJ/key.$ut |
52 | echo PubkeyAcceptedKeyTypes $t | 52 | echo PubkeyAcceptedKeyTypes $t |
53 | echo HostKeyAlgorithms $t | 53 | echo HostKeyAlgorithms $t |
54 | ) > $OBJ/ssh_proxy | 54 | ) > $OBJ/ssh_proxy |