[openssh-commits] [openssh] 01/02: upstream: Use a default value for $OPENSSL,

[git+noreply at mindrot.org]

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

dtucker pushed a commit to branch master
in repository openssh.

commit 9d482295c9f073e84d75af46b720a1c0f7ec2867
Author: dtucker at openbsd.org <dtucker at openbsd.org>
Date:   Tue Jun 1 23:56:20 2021 +0000

    upstream: Use a default value for $OPENSSL,
    
    allowing it to be overridden. Do the same in the PuTTY tests since it's
    needed there and not exported by test-exec.sh.
    
    OpenBSD-Regress-ID: c49dcd6aa7602a8606b7afa192196ca1fa65de16
---
 regress/ssh2putty.sh | 4 +++-
 regress/test-exec.sh | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/regress/ssh2putty.sh b/regress/ssh2putty.sh
index b89c1b2b..ac4c4ccf 100755
--- a/regress/ssh2putty.sh
+++ b/regress/ssh2putty.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: ssh2putty.sh,v 1.6 2021/05/24 10:25:18 dtucker Exp $
+#	$OpenBSD: ssh2putty.sh,v 1.7 2021/06/01 23:56:20 dtucker Exp $
 
 if test "x$1" = "x" -o "x$2" = "x" -o "x$3" = "x" ; then
 	echo "Usage: ssh2putty hostname port ssh-private-key"
@@ -10,6 +10,8 @@ HOST=$1
 PORT=$2
 KEYFILE=$3
 
+OPENSSL="${OPENSSL:-openssl}"
+
 # XXX - support DSA keys too
 if grep "BEGIN RSA PRIVATE KEY" $KEYFILE >/dev/null 2>&1 ; then
 	:
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index fd749f7e..1bb6aa4a 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: test-exec.sh,v 1.80 2021/05/24 10:25:18 dtucker Exp $
+#	$OpenBSD: test-exec.sh,v 1.81 2021/06/01 23:56:20 dtucker Exp $
 #	Placed in the Public Domain.
 
 #SUDO=sudo
@@ -100,7 +100,7 @@ CONCH=conch
 
 # Tools used by multiple tests
 NC=$OBJ/netcat
-OPENSSL=openssl
+OPENSSL="${OPENSSL:-openssl}"
 
 if [ "x$TEST_SSH_SSH" != "x" ]; then
 	SSH="${TEST_SSH_SSH}"

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