diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2024-06-20 08:23:19 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2024-06-20 08:23:19 +0000 |
| commit | 417bb157a224adc2a74a3d98b5c423372871692b (patch) | |
| tree | 49c42ecb72106ccaef2250c7e142195e0856e51c /regress/usr.bin | |
| parent | 328e212d9e0ead2abbc3fbc8c2e84688ea3fd080 (diff) | |
Work around dbclient cipher and 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.
Diffstat (limited to 'regress/usr.bin')
| -rw-r--r-- | regress/usr.bin/ssh/dropbear-ciphers.sh | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/regress/usr.bin/ssh/dropbear-ciphers.sh b/regress/usr.bin/ssh/dropbear-ciphers.sh index 7b0924ce7a0..1500fa0e725 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.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_*)` |