upstream commit

Adapt tests, now that DSA if off by default; use
 PubkeyAcceptedKeyTypes and PubkeyAcceptedKeyTypes to test DSA.

Upstream-Regress-ID: 0ff2a3ff5ac1ce5f92321d27aa07b98656efcc5c

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 @@
-#       $OpenBSD: keytype.sh,v 1.3 2013/12/06 13:52:46 markus Exp $
+#       $OpenBSD: keytype.sh,v 1.4 2015/07/10 06:23:25 markus Exp $
 #       Placed in the Public Domain.
 
 tid="login with different key types"
@@ -36,14 +36,26 @@ for ut in $ktypes; do
         htypes=$ut
         #htypes=$ktypes
         for ht in $htypes; do 
+                case $ht in
+                dsa-1024)       t=ssh-dss;;
+                ecdsa-256)      t=ecdsa-sha2-nistp256;;
+                ecdsa-384)      t=ecdsa-sha2-nistp384;;
+                ecdsa-521)      t=ecdsa-sha2-nistp521;;
+                ed25519-512)    t=ssh-ed25519;;
+                rsa-*)          t=ssh-rsa;;
+                esac
                 trace "ssh connect, userkey $ut, hostkey $ht"
                 (
                         grep -v HostKey $OBJ/sshd_proxy_bak
                         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 PubkeyAcceptedKeyTypes $t
+                        echo HostKeyAlgorithms $t
                 ) > $OBJ/ssh_proxy
                 (
                         printf 'localhost-with-alias,127.0.0.1,::1 '