Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

soft require openssl #1471

Merged
merged 2 commits into from
Oct 8, 2023
Merged

soft require openssl #1471

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6ac880
soft require openssl
Oct 2, 2023
ccc4164
Update error msg
vanosg Oct 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 21 additions & 26 deletions aclocal.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1530,13 +1530,10 @@ AC_DEFUN([EGG_TLS_ENABLE],
[
AC_MSG_CHECKING([whether to enable TLS support])
AC_ARG_ENABLE(tls,
[ --enable-tls enable TLS support (autodetect)],
[enable_tls="$enableval"])
AC_ARG_ENABLE(tls,
[ --disable-tls disable TLS support ], [enable_tls="$enableval"],
[enable_tls="autodetect"])
[ --disable-tls disable TLS support ], [tls_enabled="$enableval"],
[tls_enabled="$enableval"])

AC_MSG_RESULT([$enable_tls])
AC_MSG_RESULT([$tls_enabled])
])


Expand All @@ -1546,14 +1543,14 @@ AC_DEFUN(EGG_TLS_WITHSSL,
[
save_LIBS="$LIBS"
AC_ARG_WITH(sslinc, [ --with-sslinc=PATH Path to OpenSSL headers], [
if test "$enable_tls" != "no"; then
if test "$tls_enabled" != "no"; then
if test -d "$withval"; then
save_CC="$CC"
save_CPP="$CPP"
CC="$CC -I$withval"
CPP="$CPP -I$withval"
AC_CHECK_HEADERS([openssl/ssl.h openssl/x509v3.h], [sslinc="-I$withval"], [
AC_MSG_WARN([Invalid path to OpenSSL headers. $withval/openssl/ doesn't contain the required files.])
AC_MSG_ERROR([Invalid path to OpenSSL headers. $withval/openssl/ doesn't contain the required files.])
sslinc=""
break
], [[
Expand All @@ -1567,25 +1564,25 @@ AC_DEFUN(EGG_TLS_WITHSSL,
CC="$save_CC"
CPP="$save_CPP"
else
AC_MSG_WARN([Invalid path to OpenSSL headers. $withval is not a directory.])
AC_MSG_ERROR([Invalid path to OpenSSL headers. $withval is not a directory.])
fi
fi
])

AC_ARG_WITH(ssllib, [ --with-ssllib=PATH Path to OpenSSL libraries],
[
if test "$enable_tls" != "no"; then
if test "$tls_enabled" != "no"; then
if test -d "$withval"; then
AC_CHECK_LIB(crypto, X509_digest, , [havessllib="no"], [-L$withval -lssl])
AC_CHECK_LIB(ssl, SSL_accept, , [havessllib="no"], [-L$withval -lcrypto])
if test "$havessllib" = "no"; then
AC_MSG_WARN([Invalid path to OpenSSL libs. $withval doesn't contain the required files.])
AC_MSG_ERROR([Invalid path to OpenSSL libs. $withval doesn't contain the required files.])
else
AC_SUBST(SSL_LIBS, [-L$withval])
LDFLAGS="${LDFLAGS} -L$withval"
fi
else
AC_MSG_WARN([You have specified an invalid path to OpenSSL libs. $withval is not a directory.])
AC_MSG_ERROR([You have specified an invalid path to OpenSSL libs. $withval is not a directory.])
fi
fi
])
Expand All @@ -1596,8 +1593,7 @@ dnl EGG_TLS_DETECT
dnl
AC_DEFUN([EGG_TLS_DETECT],
[
tls_enabled="no"
if test "$enable_tls" != "no"; then
if test "$tls_enabled" != "no"; then
if test -z "$SSL_INCLUDES"; then
AC_CHECK_HEADERS([openssl/ssl.h openssl/x509v3.h], , [havesslinc="no"], [
#ifdef CYGWIN_HACKS
Expand Down Expand Up @@ -1632,20 +1628,20 @@ AC_DEFUN([EGG_TLS_DETECT],
break
]])
)
if test "$enable_tls" = "yes"; then
if test "$havesslinc" = "no"; then
AC_MSG_WARN([Cannot find OpenSSL headers.])
AC_MSG_WARN([Please specify the path to the openssl include dir using --with-sslinc=path])
fi
if test "$havessllib" = "no"; then
AC_MSG_WARN([Cannot find OpenSSL libraries.])
AC_MSG_WARN([Please specify the path to libssl and libcrypto using --with-ssllib=path])
fi
if test "$havesslinc" = "no"; then
AC_MSG_WARN([Cannot find OpenSSL headers.])
AC_MSG_WARN([Please specify the path to the openssl include dir using --with-sslinc=path])
fi
if test "$havessllib" = "no"; then
AC_MSG_WARN([Cannot find OpenSSL libraries.])
AC_MSG_WARN([Please specify the path to libssl and libcrypto using --with-ssllib=path])
fi
AC_MSG_CHECKING([for OpenSSL])
if test "$havesslinc" = "no" || test "$havessllib" = "no"; then
AC_MSG_RESULT([no (make sure you have version 0.9.8 or higher installed)])
LIBS="$save_LIBS"
AC_MSG_RESULT([no])
AC_MSG_RESULT([* We tried, but couldn't find TLS libraries. If installed, please specify their paths using the configure flags above])
AC_MSG_RESULT([* While not recommended, you can continue without TLS protection by specifying the --disable-tls configure flag])
AC_MSG_ERROR([TLS Libraries not found])
else
AC_MSG_RESULT([yes])
if test "$EGG_CYGWIN" = "yes"; then
Expand All @@ -1660,7 +1656,6 @@ AC_DEFUN([EGG_TLS_DETECT],
)
dnl EVP_PKEY_get1_EC_KEY: OpenSSL without EC (SunOS 5.11 Solaris 11.3 I love you Oracle)
AC_CHECK_FUNCS([EVP_PKEY_get1_EC_KEY])
tls_enabled="yes"
EGG_MD5_COMPAT
fi
fi
Expand Down