[openssh-commits] [openssh] 02/04: upstream: Use -Ohashalg to restrict output to specfic hash instead

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 3f44bece40902b0d1504c5885f0b87c1cabd4e26
Author: dtucker at openbsd.org <dtucker at openbsd.org>
AuthorDate: Thu Jul 16 09:07:18 2026 +0000

    upstream: Use -Ohashalg to restrict output to specfic hash instead
    
    of awk.
    
    OpenBSD-Regress-ID: aa5fac0e3ee8f518794d3361d537090c6e3f0bec
---
 regress/sshfp-connect.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/regress/sshfp-connect.sh b/regress/sshfp-connect.sh
index d8c2a28b1..7cfef3768 100644
--- a/regress/sshfp-connect.sh
+++ b/regress/sshfp-connect.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: sshfp-connect.sh,v 1.8 2026/07/12 11:19:33 dtucker Exp $
+#	$OpenBSD: sshfp-connect.sh,v 1.9 2026/07/16 09:07:18 dtucker Exp $
 #	Placed in the Public Domain.
 
 # This test requires external setup and thus is skipped unless
@@ -37,14 +37,14 @@ for kt in `$SSH -Q key-plain | grep -v sk- | \
 	file="${dnsname}_openssh"
 	# Make good fingerprints
 	$SSHKEYGEN -r ${dnsname} -f ${SRC}/${file}.pub
-	$SSHKEYGEN -r ${dnsname}-sha1 -f ${SRC}/${file}.pub | awk '$5=="1"'
-	$SSHKEYGEN -r ${dnsname}-sha256 -f ${SRC}/${file}.pub | awk '$5=="2"'
+	$SSHKEYGEN -r ${dnsname}-sha1 -f ${SRC}/${file}.pub -Ohashalg=sha1
+	$SSHKEYGEN -r ${dnsname}-sha256 -f ${SRC}/${file}.pub -Ohashalg=sha256
 	# Make bad fingerprints.
 	# For the name with both types we only want the sha1 to be bad.
-	$SSHKEYGEN -r ${dnsname}-bad -f ${SRC}/${file}.pub | awk '$5=="1"' | tr f e
-	$SSHKEYGEN -r ${dnsname}-bad -f ${SRC}/${file}.pub | awk '$5=="2"'
-	$SSHKEYGEN -r ${dnsname}-sha1-bad -f ${SRC}/${file}.pub | awk '$5=="1"' | tr f e
-	$SSHKEYGEN -r ${dnsname}-sha256-bad -f ${SRC}/${file}.pub | awk '$5=="2"' | tr f e
+	$SSHKEYGEN -r ${dnsname}-bad -f ${SRC}/${file}.pub -Ohashalg=sha1 | tr f e
+	$SSHKEYGEN -r ${dnsname}-bad -f ${SRC}/${file}.pub -Ohashalg=sha256
+	$SSHKEYGEN -r ${dnsname}-sha1-bad -f ${SRC}/${file}.pub -Ohashalg=sha1 | tr f e
+	$SSHKEYGEN -r ${dnsname}-sha256-bad -f ${SRC}/${file}.pub -Ohashalg=sha256 | tr f e
 done | sort -n -k4,5 > $OBJ/sshfp-connect.zone
 
 # Check that the required DNS entries exist.

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.