From: dtucker@openbsd.org <dtucker@openbsd.org>
Date: Tue, 18 Jun 2024 08:11:48 +0000 (+0000)
Subject: upstream: Re-enable ssh-dss tests
X-Git-Tag: V_9_8_P1~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de1c2e70e5a5dc3c8d2fe04b24cc93d8ef6930e7;p=thirdparty%2Fopenssh-portable.git

upstream: Re-enable ssh-dss tests

... if ssh is compiled with DSA support

OpenBSD-Regress-ID: bbfaf8c17f2b50a2d46ac35cb97af99b990c990d
---

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