From: dtucker@openbsd.org <dtucker@openbsd.org>
Date: Wed, 21 Aug 2024 10:33:27 +0000 (+0000)
Subject: upstream: Some awks won't match on the \r so delete it instead. Fixes
X-Git-Tag: V_9_9_P1~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15ace435ea1c2fab2a1cc7d9c3157fe20c776b80;p=thirdparty%2Fopenssh-portable.git

upstream: Some awks won't match on the \r so delete it instead. Fixes

regress in portable on, eg Solaris.

OpenBSD-Regress-ID: 44a96d6d2f8341d89b7d5fff777502b92ac9e9ba
---

diff --git a/regress/rekey.sh b/regress/rekey.sh
index 79e52f2a9..53f74baaa 100644
--- a/regress/rekey.sh
+++ b/regress/rekey.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: rekey.sh,v 1.27 2024/08/21 06:59:08 dtucker Exp $
+#	$OpenBSD: rekey.sh,v 1.28 2024/08/21 10:33:27 dtucker Exp $
 #	Placed in the Public Domain.
 
 tid="rekey"
@@ -43,8 +43,8 @@ ssh_data_rekeying()
 	case "$_kexopt" in
 	KexAlgorithms*)
 		_want=`echo $_kexopt | cut -f2 -d=`
-		_got=`awk 'BEGIN{FS="[ \r]+"} /kex: algorithm: /{print $4}' \
-		    ${LOG} | sort -u`
+		_got=`awk '/kex: algorithm: /{print $4}' ${LOG} | \
+		    tr -d '\r' | sort -u`
 		if [ "$_want" != "$_got" ]; then
 			fail "expected kex $_want, got $_got"
 		fi