diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-11-01 01:55:41 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-11-01 13:10:09 +1100 |
commit | afa59e26eeb44a93f36f043f60b936eaddae77c4 (patch) | |
tree | 912ebedd889a6757938be603c3b17442b9e84aa3 /regress/hostkey-agent.sh | |
parent | de871e4daf346a712c78fa4ab8f18b231a47cb85 (diff) |
upstream: skip security-key key types for tests until we have a
dummy U2F middleware to use.
OpenBSD-Regress-ID: 37200462b44334a4ad45e6a1f7ad1bd717521a95
Diffstat (limited to 'regress/hostkey-agent.sh')
-rw-r--r-- | regress/hostkey-agent.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/regress/hostkey-agent.sh b/regress/hostkey-agent.sh index 811b6b9ab..c581c7bfd 100644 --- a/regress/hostkey-agent.sh +++ b/regress/hostkey-agent.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: hostkey-agent.sh,v 1.7 2017/04/30 23:34:55 djm Exp $ | 1 | # $OpenBSD: hostkey-agent.sh,v 1.8 2019/11/01 01:55:41 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="hostkey agent" | 4 | tid="hostkey agent" |
@@ -14,7 +14,7 @@ grep -vi 'hostkey' $OBJ/sshd_proxy > $OBJ/sshd_proxy.orig | |||
14 | echo "HostKeyAgent $SSH_AUTH_SOCK" >> $OBJ/sshd_proxy.orig | 14 | echo "HostKeyAgent $SSH_AUTH_SOCK" >> $OBJ/sshd_proxy.orig |
15 | 15 | ||
16 | trace "load hostkeys" | 16 | trace "load hostkeys" |
17 | for k in `${SSH} -Q key-plain` ; do | 17 | for k in `${SSH} -Q key-plain | grep -v ^sk-` ; do |
18 | ${SSHKEYGEN} -qt $k -f $OBJ/agent-key.$k -N '' || fatal "ssh-keygen $k" | 18 | ${SSHKEYGEN} -qt $k -f $OBJ/agent-key.$k -N '' || fatal "ssh-keygen $k" |
19 | ( | 19 | ( |
20 | printf 'localhost-with-alias,127.0.0.1,::1 ' | 20 | printf 'localhost-with-alias,127.0.0.1,::1 ' |
@@ -31,7 +31,7 @@ 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 | for k in `${SSH} -Q key-plain` ; do | 34 | for k in `${SSH} -Q key-plain | grep -v ^sk-` ; do |
35 | verbose "key type $k privsep=$ps" | 35 | verbose "key type $k privsep=$ps" |
36 | cp $OBJ/sshd_proxy.orig $OBJ/sshd_proxy | 36 | cp $OBJ/sshd_proxy.orig $OBJ/sshd_proxy |
37 | echo "UsePrivilegeSeparation $ps" >> $OBJ/sshd_proxy | 37 | echo "UsePrivilegeSeparation $ps" >> $OBJ/sshd_proxy |