diff options
author | Colin Watson <cjwatson@debian.org> | 2015-11-29 17:18:35 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2015-11-29 17:32:50 +0000 |
commit | 0b372585c0026f78676f1414510ec9f87a383803 (patch) | |
tree | a3fa6b329a8a5e9841b526f30332d21fc110118a /regress/keytype.sh | |
parent | 24ffa45372888d206f21e1864e3911024c6d5e62 (diff) | |
parent | 6d0faf6dc76ac8cc73d6f8e478db7c97f7013a2d (diff) |
New upstream release (7.0p1).
Diffstat (limited to 'regress/keytype.sh')
-rw-r--r-- | regress/keytype.sh | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/regress/keytype.sh b/regress/keytype.sh index 9752acb0a..8f697788f 100644 --- a/regress/keytype.sh +++ b/regress/keytype.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: keytype.sh,v 1.3 2013/12/06 13:52:46 markus Exp $ | 1 | # $OpenBSD: keytype.sh,v 1.4 2015/07/10 06:23:25 markus 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" |
@@ -36,14 +36,26 @@ for ut in $ktypes; do | |||
36 | htypes=$ut | 36 | htypes=$ut |
37 | #htypes=$ktypes | 37 | #htypes=$ktypes |
38 | for ht in $htypes; do | 38 | for ht in $htypes; do |
39 | case $ht in | ||
40 | dsa-1024) t=ssh-dss;; | ||
41 | ecdsa-256) t=ecdsa-sha2-nistp256;; | ||
42 | ecdsa-384) t=ecdsa-sha2-nistp384;; | ||
43 | ecdsa-521) t=ecdsa-sha2-nistp521;; | ||
44 | ed25519-512) t=ssh-ed25519;; | ||
45 | rsa-*) t=ssh-rsa;; | ||
46 | esac | ||
39 | trace "ssh connect, userkey $ut, hostkey $ht" | 47 | trace "ssh connect, userkey $ut, hostkey $ht" |
40 | ( | 48 | ( |
41 | grep -v HostKey $OBJ/sshd_proxy_bak | 49 | grep -v HostKey $OBJ/sshd_proxy_bak |
42 | echo HostKey $OBJ/key.$ht | 50 | echo HostKey $OBJ/key.$ht |
51 | echo PubkeyAcceptedKeyTypes $t | ||
52 | echo HostKeyAlgorithms $t | ||
43 | ) > $OBJ/sshd_proxy | 53 | ) > $OBJ/sshd_proxy |
44 | ( | 54 | ( |
45 | grep -v IdentityFile $OBJ/ssh_proxy_bak | 55 | grep -v IdentityFile $OBJ/ssh_proxy_bak |
46 | echo IdentityFile $OBJ/key.$ut | 56 | echo IdentityFile $OBJ/key.$ut |
57 | echo PubkeyAcceptedKeyTypes $t | ||
58 | echo HostKeyAlgorithms $t | ||
47 | ) > $OBJ/ssh_proxy | 59 | ) > $OBJ/ssh_proxy |
48 | ( | 60 | ( |
49 | printf 'localhost-with-alias,127.0.0.1,::1 ' | 61 | printf 'localhost-with-alias,127.0.0.1,::1 ' |