From 62b0484ba95148b34b734bb8b8136f4a9fb2b354 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Tue, 6 Feb 2018 02:31:13 +0000
Subject: Respect the OPENSSL make variable everywhere so that

	make OPENSSL=/usr/src/usr.bin/openssl/obj/openssl

actually does the expected thing instead of running a mixture of both the
openssl below /usr/obj and the one below /usr/bin.  Found the hard way via
backtraces that made no sense whatsoever.

ok jsing
---
 src/regress/usr.bin/openssl/testdsa.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/regress/usr.bin/openssl/testdsa.sh')

diff --git a/src/regress/usr.bin/openssl/testdsa.sh b/src/regress/usr.bin/openssl/testdsa.sh
index 32293d8ff3..a04ba171ff 100644
--- a/src/regress/usr.bin/openssl/testdsa.sh
+++ b/src/regress/usr.bin/openssl/testdsa.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: testdsa.sh,v 1.1 2014/08/26 17:50:07 jsing Exp $
+#	$OpenBSD: testdsa.sh,v 1.2 2018/02/06 02:31:13 tb Exp $
 
 
 #Test DSA certificate generation of openssl
@@ -7,21 +7,22 @@
 cd $1
 
 # Generate DSA paramter set
-openssl dsaparam 512 -out dsa512.pem
+openssl_bin=${OPENSSL:-/usr/bin/openssl}
+$openssl_bin dsaparam 512 -out dsa512.pem
 if [ $? != 0 ]; then
         exit 1;
 fi
 
 
 # Denerate a DSA certificate
-openssl req -config $2/openssl.cnf -x509 -newkey dsa:dsa512.pem -out testdsa.pem -keyout testdsa.key
+$openssl_bin req -config $2/openssl.cnf -x509 -newkey dsa:dsa512.pem -out testdsa.pem -keyout testdsa.key
 if [ $? != 0 ]; then
         exit 1;
 fi
 
 
 # Now check the certificate
-openssl x509 -text -in testdsa.pem
+$openssl_bin x509 -text -in testdsa.pem
 if [ $? != 0 ]; then
         exit 1;
 fi
-- 
cgit v1.2.3-55-g6feb