Skip to content

Commit

Permalink
upstream: Stop using DSA in dropbear interop tests.
Browse files Browse the repository at this point in the history
OpenBSD-Regress-ID: abfd4457d99d8cc1417fd22ca2c570270f74c1cf
  • Loading branch information
[email protected] authored and daztucker committed Jun 18, 2024
1 parent 7614380 commit dabc2c7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions regress/dropbear-kex.sh
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions regress/test-exec.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 \
Expand Down

0 comments on commit dabc2c7

Please sign in to comment.