diff options
author | markus@openbsd.org <markus@openbsd.org> | 2015-07-10 06:23:25 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-07-15 16:04:27 +1000 |
commit | 5bf0933184cb622ca3f96d224bf3299fd2285acc (patch) | |
tree | 18ad0591b04a1ff98bb69265e04bc7c5b961533e /regress/hostkey-agent.sh | |
parent | 7a6e3fd7b41dbd3756b6bf9acd67954c0b1564cc (diff) |
upstream commit
Adapt tests, now that DSA if off by default; use
PubkeyAcceptedKeyTypes and PubkeyAcceptedKeyTypes to test DSA.
Upstream-Regress-ID: 0ff2a3ff5ac1ce5f92321d27aa07b98656efcc5c
Diffstat (limited to 'regress/hostkey-agent.sh')
-rw-r--r-- | regress/hostkey-agent.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/regress/hostkey-agent.sh b/regress/hostkey-agent.sh index a011ec831..094700da6 100644 --- a/regress/hostkey-agent.sh +++ b/regress/hostkey-agent.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: hostkey-agent.sh,v 1.5 2015/02/21 20:51:02 djm Exp $ | 1 | # $OpenBSD: hostkey-agent.sh,v 1.6 2015/07/10 06:23:25 markus Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="hostkey agent" | 4 | tid="hostkey agent" |
@@ -31,10 +31,11 @@ cp $OBJ/known_hosts.orig $OBJ/known_hosts | |||
31 | unset SSH_AUTH_SOCK | 31 | unset SSH_AUTH_SOCK |
32 | 32 | ||
33 | for ps in no yes; do | 33 | for ps in no yes; do |
34 | cp $OBJ/sshd_proxy.orig $OBJ/sshd_proxy | ||
35 | echo "UsePrivilegeSeparation $ps" >> $OBJ/sshd_proxy | ||
36 | for k in `${SSH} -Q key-plain` ; do | 34 | for k in `${SSH} -Q key-plain` ; do |
37 | verbose "key type $k privsep=$ps" | 35 | verbose "key type $k privsep=$ps" |
36 | cp $OBJ/sshd_proxy.orig $OBJ/sshd_proxy | ||
37 | echo "UsePrivilegeSeparation $ps" >> $OBJ/sshd_proxy | ||
38 | echo "HostKeyAlgorithms $k" >> $OBJ/sshd_proxy | ||
38 | opts="-oHostKeyAlgorithms=$k -F $OBJ/ssh_proxy" | 39 | opts="-oHostKeyAlgorithms=$k -F $OBJ/ssh_proxy" |
39 | cp $OBJ/known_hosts.orig $OBJ/known_hosts | 40 | cp $OBJ/known_hosts.orig $OBJ/known_hosts |
40 | SSH_CONNECTION=`${SSH} $opts host 'echo $SSH_CONNECTION'` | 41 | SSH_CONNECTION=`${SSH} $opts host 'echo $SSH_CONNECTION'` |