forked from rapier1/hpn-ssh
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
upstream: Provide defaults for ciphers and macs
if querying for them fails since on some versions of Dropbear (at least v2024.85) "-m help" doesn't seem to work. Enable all supported pubkey algorithms in the server. OpenBSD-Regress-ID: 4f95556a49ee9f621789f25217c367a33d2745ca
- Loading branch information
Showing
1 changed file
with
13 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
# $OpenBSD: dropbear-ciphers.sh,v 1.1 2023/10/20 06:56:45 dtucker Exp $ | ||
# $OpenBSD: dropbear-ciphers.sh,v 1.2 2024/06/19 10:15:51 dtucker Exp $ | ||
# Placed in the Public Domain. | ||
|
||
tid="dropbear ciphers" | ||
|
@@ -7,13 +7,23 @@ if test "x$REGRESS_INTEROP_DROPBEAR" != "xyes" ; then | |
skip "dropbear interop tests not enabled" | ||
fi | ||
|
||
# Enable all support algorithms | ||
algs=`$SSH -Q key-sig | tr '\n' ,` | ||
cat >>$OBJ/sshd_proxy <<EOD | ||
PubkeyAcceptedAlgorithms +ssh-rsa,ssh-dss | ||
HostkeyAlgorithms +ssh-rsa,ssh-dss | ||
PubkeyAcceptedAlgorithms $algs | ||
HostkeyAlgorithms $algs | ||
EOD | ||
|
||
ciphers=`$DBCLIENT -c help 2>&1 | awk '/ ciphers: /{print $4}' | tr ',' ' '` | ||
if [ -z "$ciphers" ]; then | ||
trace dbclient query ciphers failed, making assumptions. | ||
ciphers="[email protected] aes128-ctr aes256-ctr" | ||
fi | ||
macs=`$DBCLIENT -m help 2>&1 | awk '/ MACs: /{print $4}' | tr ',' ' '` | ||
if [ -z "$macs" ]; then | ||
trace dbclient query macs failed, making assumptions. | ||
macs="hmac-sha1 hmac-sha2-256" | ||
fi | ||
keytype=`(cd $OBJ/.dropbear && ls id_*)` | ||
|
||
for c in $ciphers ; do | ||
|