diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2015-03-03 22:35:19 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-03-05 05:59:47 +1100 |
| commit | dad2b1892b4c1b7e58df483a8c5b983c4454e099 (patch) | |
| tree | fa461e273ef92414c934a88cc88b2875032e616f /regress/keyscan.sh | |
| parent | d48a22601bdd3eec054794c535f4ae8d8ae4c6e2 (diff) | |
| download | openssh-git-dad2b1892b4c1b7e58df483a8c5b983c4454e099.tar.gz | |
upstream commit
make it possible to run tests w/o ssh1 support; ok djm@
Diffstat (limited to 'regress/keyscan.sh')
| -rw-r--r-- | regress/keyscan.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/regress/keyscan.sh b/regress/keyscan.sh index 33f14f0f..886f3295 100644 --- a/regress/keyscan.sh +++ b/regress/keyscan.sh @@ -1,4 +1,4 @@ -# $OpenBSD: keyscan.sh,v 1.3 2002/03/15 13:08:56 markus Exp $ +# $OpenBSD: keyscan.sh,v 1.4 2015/03/03 22:35:19 markus Exp $ # Placed in the Public Domain. tid="keyscan" @@ -8,7 +8,12 @@ rm -f ${OBJ}/host.dsa start_sshd -for t in rsa1 rsa dsa; do +KEYTYPES="rsa dsa" +if ssh_version 1; then + KEYTYPES="${KEYTYPES} rsa1" +fi + +for t in $KEYTYPES; do trace "keyscan type $t" ${SSHKEYSCAN} -t $t -p $PORT 127.0.0.1 127.0.0.1 127.0.0.1 \ > /dev/null 2>&1 |