diff options
-rw-r--r-- | regress/agent.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/regress/agent.sh b/regress/agent.sh index 7111056c9..788b02064 100644 --- a/regress/agent.sh +++ b/regress/agent.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: agent.sh,v 1.13 2017/12/19 00:49:30 djm Exp $ | 1 | # $OpenBSD: agent.sh,v 1.14 2019/01/28 00:12:36 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="simple agent test" | 4 | tid="simple agent test" |
@@ -27,6 +27,9 @@ ${SSHKEYGEN} -q -N '' -t ed25519 -f $OBJ/user_ca_key \ | |||
27 | trace "overwrite authorized keys" | 27 | trace "overwrite authorized keys" |
28 | printf '' > $OBJ/authorized_keys_$USER | 28 | printf '' > $OBJ/authorized_keys_$USER |
29 | 29 | ||
30 | echo "PubkeyAcceptedKeyTypes +ssh-dss" >> $OBJ/ssh_proxy | ||
31 | echo "PubkeyAcceptedKeyTypes +ssh-dss" >> $OBJ/sshd_proxy | ||
32 | |||
30 | for t in ${SSH_KEYTYPES}; do | 33 | for t in ${SSH_KEYTYPES}; do |
31 | # generate user key for agent | 34 | # generate user key for agent |
32 | rm -f $OBJ/$t-agent $OBJ/$t-agent.pub* | 35 | rm -f $OBJ/$t-agent $OBJ/$t-agent.pub* |
@@ -96,6 +99,7 @@ fi | |||
96 | (printf 'cert-authority,principals="estragon" '; cat $OBJ/user_ca_key.pub) \ | 99 | (printf 'cert-authority,principals="estragon" '; cat $OBJ/user_ca_key.pub) \ |
97 | > $OBJ/authorized_keys_$USER | 100 | > $OBJ/authorized_keys_$USER |
98 | for t in ${SSH_KEYTYPES}; do | 101 | for t in ${SSH_KEYTYPES}; do |
102 | if [ "$t" != "ssh-dss" ]; then | ||
99 | trace "connect via agent using $t key" | 103 | trace "connect via agent using $t key" |
100 | ${SSH} -F $OBJ/ssh_proxy -i $OBJ/$t-agent.pub \ | 104 | ${SSH} -F $OBJ/ssh_proxy -i $OBJ/$t-agent.pub \ |
101 | -oCertificateFile=$OBJ/$t-agent-cert.pub \ | 105 | -oCertificateFile=$OBJ/$t-agent-cert.pub \ |
@@ -104,6 +108,7 @@ for t in ${SSH_KEYTYPES}; do | |||
104 | if [ $r -ne 52 ]; then | 108 | if [ $r -ne 52 ]; then |
105 | fail "ssh connect with failed (exit code $r)" | 109 | fail "ssh connect with failed (exit code $r)" |
106 | fi | 110 | fi |
111 | fi | ||
107 | done | 112 | done |
108 | 113 | ||
109 | trace "delete all agent keys" | 114 | trace "delete all agent keys" |