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

diff --git a/regress/ssh2putty.sh b/regress/ssh2putty.sh
index b89c1b2b7c2a3975549cad1679325957f2662abb..ac4c4ccfd9052c944bd1438f2881ad671ec9813c 100755 (executable)
--- 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 fd749f7e3ec5a510767fca05c49c16b9d4792d22..1bb6aa4af20fd2b335d5e6d6b1025e687de0370f 100644 (file)
--- 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}"