tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 00:04:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
whitespace at EOL

OpenBSD-Regress-ID: f4b5df99b28c6f63478deb916c6ed0e794685f07
This commit is contained in:
djm@openbsd.org@openbsd.org 2017-10-30 22:01:52 +00:00 committed by Damien Miller
parent c6415b1f8f
commit f2ad63c071
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
regress/keytype.sh
View File

@ -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. # Placed in the Public Domain.
tid="login with different key types" tid="login with different key types"
@ -17,7 +17,7 @@ for i in `$SSH -Q key`; do
esac esac
done done
for kt in $ktypes; do for kt in $ktypes; do
rm -f $OBJ/key.$kt rm -f $OBJ/key.$kt
bits=`echo ${kt} | awk -F- '{print $2}'` bits=`echo ${kt} | awk -F- '{print $2}'`
type=`echo ${kt} | awk -F- '{print $1}'` type=`echo ${kt} | awk -F- '{print $1}'`
@ -27,10 +27,10 @@ for kt in $ktypes; do
done done
tries="1 2 3" tries="1 2 3"
for ut in $ktypes; do for ut in $ktypes; do
htypes=$ut htypes=$ut
#htypes=$ktypes #htypes=$ktypes
for ht in $htypes; do for ht in $htypes; do
case $ht in case $ht in
dsa-1024) t=ssh-dss;; dsa-1024) t=ssh-dss;;
ecdsa-256) t=ecdsa-sha2-nistp256;; ecdsa-256) t=ecdsa-sha2-nistp256;;
@ -42,13 +42,13 @@ for ut in $ktypes; do
trace "ssh connect, userkey $ut, hostkey $ht" trace "ssh connect, userkey $ut, hostkey $ht"
( (
grep -v HostKey $OBJ/sshd_proxy_bak grep -v HostKey $OBJ/sshd_proxy_bak
echo HostKey $OBJ/key.$ht echo HostKey $OBJ/key.$ht
echo PubkeyAcceptedKeyTypes $t echo PubkeyAcceptedKeyTypes $t
echo HostKeyAlgorithms $t echo HostKeyAlgorithms $t
) > $OBJ/sshd_proxy ) > $OBJ/sshd_proxy
( (
grep -v IdentityFile $OBJ/ssh_proxy_bak grep -v IdentityFile $OBJ/ssh_proxy_bak
echo IdentityFile $OBJ/key.$ut echo IdentityFile $OBJ/key.$ut
echo PubkeyAcceptedKeyTypes $t echo PubkeyAcceptedKeyTypes $t
echo HostKeyAlgorithms $t echo HostKeyAlgorithms $t
) > $OBJ/ssh_proxy ) > $OBJ/ssh_proxy