diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2019-01-28 00:12:36 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2019-01-28 11:34:22 +1100 |
| commit | e30d32364d12c351eec9e14be6c61116f9d6cc90 (patch) | |
| tree | 831490694194046d444ae89b7402f874066d3259 | |
| parent | ffdde469ed56249f5dc8af98da468dde35531398 (diff) | |
| download | openssh-git-e30d32364d12c351eec9e14be6c61116f9d6cc90.tar.gz | |
upstream: Enable ssh-dss for the agent test. Disable it for the
certificate test.
OpenBSD-Regress-ID: 388c1e03e1def539d350f139b37d69f12334668d
| -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 7111056c..788b0206 100644 --- a/regress/agent.sh +++ b/regress/agent.sh @@ -1,4 +1,4 @@ -# $OpenBSD: agent.sh,v 1.13 2017/12/19 00:49:30 djm Exp $ +# $OpenBSD: agent.sh,v 1.14 2019/01/28 00:12:36 dtucker Exp $ # Placed in the Public Domain. tid="simple agent test" @@ -27,6 +27,9 @@ ${SSHKEYGEN} -q -N '' -t ed25519 -f $OBJ/user_ca_key \ trace "overwrite authorized keys" printf '' > $OBJ/authorized_keys_$USER +echo "PubkeyAcceptedKeyTypes +ssh-dss" >> $OBJ/ssh_proxy +echo "PubkeyAcceptedKeyTypes +ssh-dss" >> $OBJ/sshd_proxy + for t in ${SSH_KEYTYPES}; do # generate user key for agent rm -f $OBJ/$t-agent $OBJ/$t-agent.pub* @@ -96,6 +99,7 @@ fi (printf 'cert-authority,principals="estragon" '; cat $OBJ/user_ca_key.pub) \ > $OBJ/authorized_keys_$USER for t in ${SSH_KEYTYPES}; do + if [ "$t" != "ssh-dss" ]; then trace "connect via agent using $t key" ${SSH} -F $OBJ/ssh_proxy -i $OBJ/$t-agent.pub \ -oCertificateFile=$OBJ/$t-agent-cert.pub \ @@ -104,6 +108,7 @@ for t in ${SSH_KEYTYPES}; do if [ $r -ne 52 ]; then fail "ssh connect with failed (exit code $r)" fi + fi done trace "delete all agent keys" |