diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2024-06-20 10:23:18 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2024-06-20 10:34:50 +0200 |
| commit | dbbf9337c19381786a8e5a8a49152fe6b80c780d (patch) | |
| tree | 73a3c64e8664eef6a05084427bb7fe8e8434dfb9 | |
| parent | upstream: Remove dropbear key types not supported (diff) | |
| download | openssh-dbbf9337c19381786a8e5a8a49152fe6b80c780d.tar.xz openssh-dbbf9337c19381786a8e5a8a49152fe6b80c780d.zip | |
upstream: Work around dbclient cipher/mac query bug.
Unlike earlier versions, recent Dropbear (at least v2024.85) requires
a host arg when querying supported ciphers and macs via "-c/-m
help". Earlier versions accept but do not require it, so always
provide it. If these queries fail, skip the test with a warning.
OpenBSD-Regress-ID: 98eb863a3f0363416922efb273885e6b3c7f68d4
| -rw-r--r-- | regress/dropbear-ciphers.sh | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/regress/dropbear-ciphers.sh b/regress/dropbear-ciphers.sh index 7b0924ce7..1500fa0e7 100644 --- a/regress/dropbear-ciphers.sh +++ b/regress/dropbear-ciphers.sh @@ -1,4 +1,4 @@ -# $OpenBSD: dropbear-ciphers.sh,v 1.2 2024/06/19 10:15:51 dtucker Exp $ +# $OpenBSD: dropbear-ciphers.sh,v 1.3 2024/06/20 08:23:18 dtucker Exp $ # Placed in the Public Domain. tid="dropbear ciphers" @@ -14,15 +14,10 @@ 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" +ciphers=`$DBCLIENT -c help hst 2>&1 | awk '/ ciphers: /{print $4}' | tr ',' ' '` +macs=`$DBCLIENT -m help hst 2>&1 | awk '/ MACs: /{print $4}' | tr ',' ' '` +if [ -z "$macs" ] || [ -z "$ciphers" ]; then + skip "dbclient query ciphers '$ciphers' or macs '$macs' failed" fi keytype=`(cd $OBJ/.dropbear && ls id_*)` |