New upstream release (7.7p1)

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 @@
-#       $OpenBSD: keytype.sh,v 1.5 2017/03/20 22:08:06 djm Exp $
+#       $OpenBSD: keytype.sh,v 1.7 2018/03/12 00:54:04 djm Exp $
 #       Placed in the Public Domain.
 
 tid="login with different key types"
@@ -17,7 +17,7 @@ for i in `$SSH -Q key`; do
         esac
 done
 
-for kt in $ktypes; do 
+for kt in $ktypes; do
         rm -f $OBJ/key.$kt
         bits=`echo ${kt} | awk -F- '{print $2}'`
         type=`echo ${kt}  | awk -F- '{print $1}'`
@@ -27,28 +27,28 @@ for kt in $ktypes; do
 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;;
                 ecdsa-384)      t=ecdsa-sha2-nistp384;;
                 ecdsa-521)      t=ecdsa-sha2-nistp521;;
                 ed25519-512)    t=ssh-ed25519;;
-                rsa-*)          t=ssh-rsa;;
+                rsa-*)          t=rsa-sha2-512,rsa-sha2-256,ssh-rsa;;
                 esac
                 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