Attachment 3650 Details for Bug 3521 – Skip these tests if there is no openssl in local path.

Skip these tests if there is no openssl in local path.

Skip-tests-for-C-since-no-openssl-in-local-path.patch (text/plain), 2.11 KB, created by renmingshuai on 2023-01-14 14:53:46 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: renmingshuai

Created: 2023-01-14 14:53:46 AEDT

Size: 2.11 KB

patch

obsolete

>From 3aa4371f23a1b21111fa5dfaa23f66bfc9ac0488 Mon Sep 17 00:00:00 2001
>From: ren mingshuai <78132473+rmsh1216@users.noreply.github.com>
>Date: Fri, 6 Jan 2023 11:33:44 +0800
>Subject: [PATCH] Update percent.sh
>
>skip tests for '%C' since no openssl in local path
>---
> regress/percent.sh | 23 +++++++++++++++++------
> 1 file changed, 17 insertions(+), 6 deletions(-)
>
>diff --git a/regress/percent.sh b/regress/percent.sh
>index bb81779a..f0612b21 100644
>--- a/regress/percent.sh
>+++ b/regress/percent.sh
>@@ -19,6 +19,9 @@ HOSTNAME=`hostname`
> # We also have to explicitly enable it.
> echo "permitlocalcommand yes" >> $OBJ/ssh_proxy
> 
>+NOOPENSSL=0
>+IFS=":";for i in $PATH;do [ -x "$i/openssl" ] && NOOPENSSL=1;done
>+
> trial()
> {
> 	opt="$1"; arg="$2"
>@@ -78,11 +81,13 @@ for i in matchexec localcommand remotecommand controlpath identityagent \
> 	if [ "$i" = "$localcommand" ]; then
> 		trial $i '%T' NONE
> 	fi
>-	# Matches implementation in readconf.c:ssh_connection_hash()
>-	HASH=`printf "${HOSTNAME}127.0.0.1${PORT}$REMUSER" |
>-	    $OPENSSL_BIN sha1 | cut -f2 -d' '`
>+	if [ $NOOPENSSL -eq 1 ]; then
>+		# Matches implementation in readconf.c:ssh_connection_hash()
>+		HASH=`printf "${HOSTNAME}127.0.0.1${PORT}$REMUSER" |
>+		    $OPENSSL_BIN sha1 | cut -f2 -d' '`
>+	fi
> 	trial $i '%%' '%'
>-	trial $i '%C' $HASH
>+	if [ $NOOPENSSL -eq 1 ]; then trial $i '%C' $HASH; fi
> 	trial $i '%i' $USERID
> 	trial $i '%h' 127.0.0.1
> 	trial $i '%L' $HOST
>@@ -96,8 +101,14 @@ for i in matchexec localcommand remotecommand controlpath identityagent \
> 	# containing %d for UserKnownHostsFile
> 	if [ "$i" != "userknownhostsfile" ]; then
> 		trial $i '%d' $HOME
>-		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"
>+		# skip tests for '%C' since no openssl in local path
>+		if [ $NOOPENSSL -eq 0 ]; then
>+			trial $i '%%/%i/%h/%d/%L/%l/%n/%p/%r/%u' \
>+				"%/$USERID/127.0.0.1/$HOME/$HOST/$HOSTNAME/somehost/$PORT/$REMUSER/$USER"
>+		else
>+			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"
>+		fi
> 	fi
> done
> 
>-- 
>2.27.0
>

Actions: View

Attachments on bug 3521: 3650