[openssh-commits] [openssh] 01/01: Check openssl_bin path is executable before using.

[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 5532e010a0eeb6aa264396514f9aed7948471538
Author: Darren Tucker <dtucker at dtucker.net>
Date:   Sat Jan 7 10:34:18 2023 +1100

    Check openssl_bin path is executable before using.
---
 configure.ac | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index be8d9ad8..f6802500 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2696,14 +2696,11 @@ AC_ARG_WITH([ssl-dir],
 			esac
 			if test -d "$withval/lib"; then
 				libcrypto_path="${withval}/lib"
-				openssl_bin="${withval}/bin/openssl"
 			elif test -d "$withval/lib64"; then
 				libcrypto_path="$withval/lib64"
-				openssl_bin="${withval}/bin/openssl"
 			else
 				# Built but not installed
 				libcrypto_path="${withval}"
-				openssl_bin="${withval}/apps/openssl"
 			fi
 			if test -n "${rpath_opt}"; then
 				LDFLAGS="-L${libcrypto_path} ${rpath_opt}${libcrypto_path} ${LDFLAGS}"
@@ -2715,6 +2712,11 @@ AC_ARG_WITH([ssl-dir],
 			else
 				CPPFLAGS="-I${withval} ${CPPFLAGS}"
 			fi
+			if test -x "${withval}/bin/openssl"; then
+				openssl_bin="${withval}/bin/openssl"
+			elif test -x "${withval}/apps/openssl"; then
+				openssl_bin="${withval}/apps/openssl"
+			fi
 		fi
 	]
 )

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