tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-09-26 11:29:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream: Remove dropbear key types not supported

Browse Source 
by current OpenSSH. Allows subsequent test runs to work if OpenSSH is
rebuilt w/out OpenSSL.

OpenBSD-Regress-ID: e0129eb2b1d31771105903a8055216fbba20a770
This commit is contained in:
dtucker@openbsd.org 2024-06-20 08:18:34 +00:00 committed by Darren Tucker
parent e9b6471c59
commit 8de2c8cebc
No known key found for this signature in database
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
regress/test-exec.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: test-exec.sh,v 1.118 2024/06/19 10:08:34 dtucker Exp $ # $OpenBSD: test-exec.sh,v 1.119 2024/06/20 08:18:34 dtucker Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
#SUDO=sudo #SUDO=sudo
@ -845,17 +845,15 @@ esac
if test "$REGRESS_INTEROP_DROPBEAR" = "yes" ; then if test "$REGRESS_INTEROP_DROPBEAR" = "yes" ; then
trace Create dropbear keys and add to authorized_keys trace Create dropbear keys and add to authorized_keys
kt="ed25519"
if $SSH -Q key-plain | grep '^ssh-dss$' >/dev/null; then
kt="$kt dss"
fi
if $SSH -Q key-plain | grep '^ssh-rsa$' >/dev/null; then
kt="$kt rsa"
fi
if $SSH -Q key-plain | grep '^ecdsa-sha2' >/dev/null; then
kt="$kt ecdsa"
fi
mkdir -p $OBJ/.dropbear mkdir -p $OBJ/.dropbear
kt="ed25519"
for i in dss rsa ecdsa; do
if $SSH -Q key-plain | grep "$i" >/dev/null; then
kt="$kt $i"
else
rm -f "$OBJ/.dropbear/id_$i"
fi
done
for i in $kt; do for i in $kt; do
if [ ! -f "$OBJ/.dropbear/id_$i" ]; then if [ ! -f "$OBJ/.dropbear/id_$i" ]; then
verbose Create dropbear key type $i verbose Create dropbear key type $i