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.

diff --git a/regress/usr.bin/ssh/ssh2putty.sh b/regress/usr.bin/ssh/ssh2putty.sh
index 321301b..5b2d795 100755 (executable)
--- a/regress/usr.bin/ssh/ssh2putty.sh
+++ b/regress/usr.bin/ssh/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 -q "BEGIN RSA PRIVATE KEY" $KEYFILE ; then
        echo "Unsupported private key format"

diff --git a/regress/usr.bin/ssh/test-exec.sh b/regress/usr.bin/ssh/test-exec.sh
index cadf6dc..d2f918e 100644 (file)
--- a/regress/usr.bin/ssh/test-exec.sh
+++ b/regress/usr.bin/ssh/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.
 
 USER=`id -un`
@@ -60,7 +60,7 @@ CONCH=/usr/local/bin/conch
 
 # Tools used by multiple tests
 NC=nc
-OPENSSL=openssl
+OPENSSL="${OPENSSL:-openssl}"
 
 if [ "x$TEST_SSH_SSH" != "x" ]; then
        SSH="${TEST_SSH_SSH}"