]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: Re-enable ssh-dss tests
authordtucker@openbsd.org <dtucker@openbsd.org>
Tue, 18 Jun 2024 08:11:48 +0000 (08:11 +0000)
committerDarren Tucker <dtucker@dtucker.net>
Tue, 18 Jun 2024 09:57:41 +0000 (19:57 +1000)
... if ssh is compiled with DSA support

OpenBSD-Regress-ID: bbfaf8c17f2b50a2d46ac35cb97af99b990c990d

regress/test-exec.sh

index aa5b1a5e5c2886bfe20379d0f874111b61918cb5..2f6c1486c382d45ae8b6b598922950485f41ef34 100644 (file)
@@ -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