diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2024-06-19 10:15:52 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2024-06-19 10:15:52 +0000 |
| commit | f34cb3f8fb7a131bdaa172c7860f5055f8acba9a (patch) | |
| tree | c1d5141ddbfd6fabeae45223616a700dcddd57a9 /regress | |
| parent | 60921183c4895457b8d14531bc7fb06764061c8c (diff) | |
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.
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/usr.bin/ssh/dropbear-ciphers.sh | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/regress/usr.bin/ssh/dropbear-ciphers.sh b/regress/usr.bin/ssh/dropbear-ciphers.sh index 2e0f9a1d337..7b0924ce7a0 100644 --- a/regress/usr.bin/ssh/dropbear-ciphers.sh +++ b/regress/usr.bin/ssh/dropbear-ciphers.sh @@ -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="chacha20-poly1305@openssh.com 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 |