mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-11-27 05:46:36 +08:00
upstream: Some awks won't match on the \r so delete it instead. Fixes
regress in portable on, eg Solaris. OpenBSD-Regress-ID: 44a96d6d2f8341d89b7d5fff777502b92ac9e9ba
This commit is contained in:
parent
51c96b6ed6
commit
15ace435ea
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user