From: Darren Tucker <dtucker@dtucker.net>
Date: Fri, 6 Jan 2023 23:34:18 +0000 (+1100)
Subject: Check openssl_bin path is executable before using.
X-Git-Tag: V_9_2_P1~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5532e010a0eeb6aa264396514f9aed7948471538;p=thirdparty%2Fopenssh-portable.git

Check openssl_bin path is executable before using.
---

diff --git a/configure.ac b/configure.ac
index be8d9ad82..f6802500f 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
 	]
 )