upstream: Find openssl binary via environment variable. This

allows overriding if necessary (eg in -portable where we're testing against a
specific version of OpenSSL).

OpenBSD-Regress-ID: 491f39cae9e762c71aa4bf045803d077139815c5

diff --git a/regress/agent-pkcs11.sh b/regress/agent-pkcs11.sh
index fbbaea5186db1b084f48c938a09065c10fa1ca19..c9bd9d3245a77755cc8122a8cb96efd56d73c62b 100644 (file)
--- a/regress/agent-pkcs11.sh
+++ b/regress/agent-pkcs11.sh
@@ -1,4 +1,4 @@
-#      $OpenBSD: agent-pkcs11.sh,v 1.7 2019/11/26 23:43:10 djm Exp $
+#      $OpenBSD: agent-pkcs11.sh,v 1.8 2021/05/24 10:25:18 dtucker Exp $
 #      Placed in the Public Domain.
 
 tid="pkcs11 agent test"
@@ -62,16 +62,16 @@ notty() {
 trace "generating keys"
 RSA=${DIR}/RSA
 EC=${DIR}/EC
-openssl genpkey -algorithm rsa > $RSA
-openssl pkcs8 -nocrypt -in $RSA |\
+$OPENSSL genpkey -algorithm rsa > $RSA
+$OPENSSL pkcs8 -nocrypt -in $RSA |\
     softhsm2-util --slot "$slot" --label 01 --id 01 --pin "$TEST_SSH_PIN" --import /dev/stdin
-openssl genpkey \
+$OPENSSL genpkey \
     -genparam \
     -algorithm ec \
     -pkeyopt ec_paramgen_curve:prime256v1 |\
-    openssl genpkey \
+    $OPENSSL genpkey \
     -paramfile /dev/stdin > $EC
-openssl pkcs8 -nocrypt -in $EC |\
+$OPENSSL pkcs8 -nocrypt -in $EC |\
     softhsm2-util --slot "$slot" --label 02 --id 02 --pin "$TEST_SSH_PIN" --import /dev/stdin
 
 trace "start agent"

diff --git a/regress/percent.sh b/regress/percent.sh
index 72f07f4b8adbb3da0d9c86fde20da8c0e5f8da97..a00a777daa2c8641038d5df998ae6abc8b99f3c3 100644 (file)
--- a/regress/percent.sh
+++ b/regress/percent.sh
@@ -1,4 +1,4 @@
-#      $OpenBSD: percent.sh,v 1.11 2021/02/05 22:03:40 dtucker Exp $
+#      $OpenBSD: percent.sh,v 1.12 2021/05/24 10:25:18 dtucker Exp $
 #      Placed in the Public Domain.
 
 tid="percent expansions"
@@ -79,7 +79,7 @@ for i in matchexec localcommand remotecommand controlpath identityagent \
        fi
        # Matches implementation in readconf.c:ssh_connection_hash()
        HASH=`printf "${HOSTNAME}127.0.0.1${PORT}$REMUSER" |
-           openssl sha1 | cut -f2 -d' '`
+           $OPENSSL sha1 | cut -f2 -d' '`
        trial $i '%%' '%'
        trial $i '%C' $HASH
        trial $i '%i' $USERID

diff --git a/regress/ssh2putty.sh b/regress/ssh2putty.sh
index dcb975d952f668d0ff6d0c5836c5ba7ffef46b18..b89c1b2b7c2a3975549cad1679325957f2662abb 100755 (executable)
--- a/regress/ssh2putty.sh
+++ b/regress/ssh2putty.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#      $OpenBSD: ssh2putty.sh,v 1.5 2019/11/21 05:18:47 tb Exp $
+#      $OpenBSD: ssh2putty.sh,v 1.6 2021/05/24 10:25:18 dtucker Exp $
 
 if test "x$1" = "x" -o "x$2" = "x" -o "x$3" = "x" ; then
        echo "Usage: ssh2putty hostname port ssh-private-key"
@@ -19,13 +19,13 @@ else
 fi
 
 public_exponent=`
-       openssl rsa -noout -text -in $KEYFILE | grep ^publicExponent |
+       $OPENSSL rsa -noout -text -in $KEYFILE | grep ^publicExponent |
        sed 's/.*(//;s/).*//'
 `
 test $? -ne 0 && exit 1
 
 modulus=`
-       openssl rsa -noout -modulus -in $KEYFILE | grep ^Modulus= |
+       $OPENSSL rsa -noout -modulus -in $KEYFILE | grep ^Modulus= |
        sed 's/^Modulus=/0x/' | tr A-Z a-z
 `
 test $? -ne 0 && exit 1

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index bc59ebddf0554c1bb72417b58523cfdef3ab2c3e..fd749f7e3ec5a510767fca05c49c16b9d4792d22 100644 (file)
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#      $OpenBSD: test-exec.sh,v 1.79 2021/04/06 23:57:56 dtucker Exp $
+#      $OpenBSD: test-exec.sh,v 1.80 2021/05/24 10:25:18 dtucker Exp $
 #      Placed in the Public Domain.
 
 #SUDO=sudo
@@ -100,6 +100,7 @@ CONCH=conch
 
 # Tools used by multiple tests
 NC=$OBJ/netcat
+OPENSSL=openssl
 
 if [ "x$TEST_SSH_SSH" != "x" ]; then
        SSH="${TEST_SSH_SSH}"
@@ -155,6 +156,9 @@ fi
 if [ "x$TEST_SSH_SK_HELPER" != "x" ]; then
        SSH_SK_HELPER="${TEST_SSH_SK_HELPER}"
 fi
+if [ "x$TEST_SSH_OPENSSL" != "x" ]; then
+       OPENSSL="${TEST_SSH_OPENSSL}"
+fi
 
 # Path to sshd must be absolute for rexec
 case "$SSHD" in