diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2024-03-07 07:18:14 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2024-03-07 09:25:17 +0100 |
| commit | 9b3f0beb4007a7e01dfedabb429097fb593deae6 (patch) | |
| tree | 628c2319fb92a93092e768404960272d23bdd2e2 /configure.ac | |
| parent | upstream: fix memory leak in mux proxy mode when requesting forwarding. (diff) | |
| download | openssh-9b3f0beb4007a7e01dfedabb429097fb593deae6.tar.xz openssh-9b3f0beb4007a7e01dfedabb429097fb593deae6.zip | |
Prefer openssl binary from --with-ssl-dir directory.
Use openssl in the directory specified by --with-ssl-dir as long
as it's functional. Reported by The Doctor.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index c1af4b423..82e8bb7c1 100644 --- a/configure.ac +++ b/configure.ac @@ -2743,7 +2743,15 @@ AC_ARG_WITH([ssl-dir], else CPPFLAGS="-I${withval} ${CPPFLAGS}" fi - openssl_bin_PATH="${PATH}${PATH_SEPARATOR}${withval}/bin${PATH_SEPARATOR}${withval}/apps" + dnl Ensure specified openssl binary works, eg it can + dnl find its runtime libraries, before trying to use. + if test -x "${withval}/bin/openssl" && \ + "${withval}/bin/openssl" version >/dev/null 2>&1; then + openssl_bin_PATH="${withval}/bin${PATH_SEPARATOR}${PATH}" + elif test -x "${withval}/apps/openssl" && \ + "${withval}/apps/openssl" version >/dev/null 2>&1; then + openssl_bin_PATH="${withval}/apps${PATH_SEPARATOR}${PATH}" + fi fi ] ) |