From e81ebcdc942c29b1f6d77aa38d3fa61d7a40d623 Mon Sep 17 00:00:00 2001
From: dtucker <dtucker@openbsd.org>
Date: Thu, 20 Jun 2024 08:23:18 +0000
Subject: [PATCH] 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.
---
 regress/usr.bin/ssh/dropbear-ciphers.sh | 15 +++++----------
 1 file 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_*)`
 
-- 
2.20.1