summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2024-06-18 10:11:48 +0200
committerDarren Tucker <dtucker@dtucker.net>2024-06-18 11:57:41 +0200
commitde1c2e70e5a5dc3c8d2fe04b24cc93d8ef6930e7 (patch)
tree57f6df8c9c48917846a280d866393e7fc36a5ed1
parentupstream: Stop using DSA in dropbear interop tests. (diff)
downloadopenssh-de1c2e70e5a5dc3c8d2fe04b24cc93d8ef6930e7.tar.xz
openssh-de1c2e70e5a5dc3c8d2fe04b24cc93d8ef6930e7.zip
upstream: Re-enable ssh-dss tests
... if ssh is compiled with DSA support OpenBSD-Regress-ID: bbfaf8c17f2b50a2d46ac35cb97af99b990c990d
-rw-r--r--regress/test-exec.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index aa5b1a5e5..2f6c1486c 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: test-exec.sh,v 1.116 2024/06/18 06:14:27 anton Exp $
+# $OpenBSD: test-exec.sh,v 1.117 2024/06/18 08:11:48 dtucker Exp $
# Placed in the Public Domain.
#SUDO=sudo
@@ -845,6 +845,10 @@ esac
if test "$REGRESS_INTEROP_DROPBEAR" = "yes" ; then
trace Create dropbear keys and add to authorized_keys
+ kt="rsa ecdsa ed25519"
+ if $SSH -Q key-plain | grep ssh-dss >/dev/null; then
+ kt="$kt dss"
+ fi
mkdir -p $OBJ/.dropbear
for i in rsa ecdsa ed25519; do
if [ ! -f "$OBJ/.dropbear/id_$i" ]; then