From b5171adf542296a886a3f04b97d16c392021f9e1 Mon Sep 17 00:00:00 2001 From: dtucker Date: Sat, 14 Jan 2023 09:57:08 +0000 Subject: [PATCH] Instead of skipping the all-tokens test if we don't have OpenSSL (since we use it to compute the hash), put the hash at the end and just omit it if we don't have it. Prompted by bz#3521. --- regress/usr.bin/ssh/percent.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/regress/usr.bin/ssh/percent.sh b/regress/usr.bin/ssh/percent.sh index 3b87b902492..e34aaf2f071 100644 --- a/regress/usr.bin/ssh/percent.sh +++ b/regress/usr.bin/ssh/percent.sh @@ -1,4 +1,4 @@ -# $OpenBSD: percent.sh,v 1.15 2023/01/06 12:33:33 dtucker Exp $ +# $OpenBSD: percent.sh,v 1.16 2023/01/14 09:57:08 dtucker Exp $ # Placed in the Public Domain. tid="percent expansions" @@ -7,6 +7,7 @@ USER=`id -u -n` USERID=`id -u` HOST=`hostname | cut -f1 -d.` HOSTNAME=`hostname` +HASH="" # Localcommand is evaluated after connection because %T is not available # until then. Because of this we use a different method of exercising it, @@ -93,10 +94,13 @@ for i in matchexec localcommand remotecommand controlpath identityagent \ # containing %d for UserKnownHostsFile if [ "$i" != "userknownhostsfile" ]; then trial $i '%d' $HOME + in='%%/%i/%h/%d/%L/%l/%n/%p/%r/%u' + out="%/$USERID/127.0.0.1/$HOME/$HOST/$HOSTNAME/somehost/$PORT/$REMUSER/$USER" if [ ! -z "${HASH}" ]; then - trial $i '%%/%C/%i/%h/%d/%L/%l/%n/%p/%r/%u' \ - "%/$HASH/$USERID/127.0.0.1/$HOME/$HOST/$HOSTNAME/somehost/$PORT/$REMUSER/$USER" + in="$in/%C" + out="$out/$HASH" fi + trial $i "$in" "$out" fi done -- 2.20.1