diff options
| author | anton@openbsd.org <anton@openbsd.org> | 2024-06-18 08:14:27 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2024-06-18 11:57:36 +0200 |
| commit | dabc2c7cf3c141e8e5d5a1a60d6c1d2d2422cf43 (patch) | |
| tree | 07ba7f5c00b6b10631451d6b47c5e18f49d59ecc | |
| parent | missed a bit of DSA in the fuzzer (diff) | |
| download | openssh-dabc2c7cf3c141e8e5d5a1a60d6c1d2d2422cf43.tar.xz openssh-dabc2c7cf3c141e8e5d5a1a60d6c1d2d2422cf43.zip | |
upstream: Stop using DSA in dropbear interop tests.
OpenBSD-Regress-ID: abfd4457d99d8cc1417fd22ca2c570270f74c1cf
| -rw-r--r-- | regress/dropbear-kex.sh | 6 | ||||
| -rw-r--r-- | regress/test-exec.sh | 4 |
2 files changed, 5 insertions, 5 deletions
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 \ |