From: anton@openbsd.org <anton@openbsd.org>
Date: Tue, 18 Jun 2024 06:14:27 +0000 (+0000)
Subject: upstream: Stop using DSA in dropbear interop tests.
X-Git-Tag: V_9_8_P1~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dabc2c7cf3c141e8e5d5a1a60d6c1d2d2422cf43;p=thirdparty%2Fopenssh-portable.git

upstream: Stop using DSA in dropbear interop tests.

OpenBSD-Regress-ID: abfd4457d99d8cc1417fd22ca2c570270f74c1cf
---

diff --git a/regress/dropbear-kex.sh b/regress/dropbear-kex.sh
index a25de3edd..092a26ff2 100644
--- a/regress/dropbear-kex.sh
+++ b/regress/dropbear-kex.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: dropbear-kex.sh,v 1.1 2023/10/20 06:56:45 dtucker Exp $
+#	$OpenBSD: dropbear-kex.sh,v 1.2 2024/06/18 06:14:27 anton Exp $
 #	Placed in the Public Domain.
 
 tid="dropbear kex"
@@ -8,8 +8,8 @@ if test "x$REGRESS_INTEROP_DROPBEAR" != "xyes" ; then
 fi
 
 cat >>$OBJ/sshd_proxy <<EOD
-PubkeyAcceptedAlgorithms +ssh-rsa,ssh-dss
-HostkeyAlgorithms +ssh-rsa,ssh-dss
+PubkeyAcceptedAlgorithms +ssh-rsa
+HostkeyAlgorithms +ssh-rsa
 EOD
 cp $OBJ/sshd_proxy $OBJ/sshd_proxy.bak
 
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index e483bc2aa..aa5b1a5e5 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: test-exec.sh,v 1.115 2024/06/11 01:58:27 djm Exp $
+#	$OpenBSD: test-exec.sh,v 1.116 2024/06/18 06:14:27 anton Exp $
 #	Placed in the Public Domain.
 
 #SUDO=sudo
@@ -846,7 +846,7 @@ esac
 if test "$REGRESS_INTEROP_DROPBEAR" = "yes" ; then
 	trace Create dropbear keys and add to authorized_keys
 	mkdir -p $OBJ/.dropbear
-	for i in rsa ecdsa ed25519 dss; do
+	for i in rsa ecdsa ed25519; do
 		if [ ! -f "$OBJ/.dropbear/id_$i" ]; then
 			($DROPBEARKEY -t $i -f $OBJ/.dropbear/id_$i
 			$DROPBEARCONVERT dropbear openssh \