From 5038d2afe3fde4d8e9ff270fc5fec9e97dc11ea9 Mon Sep 17 00:00:00 2001 From: Madhusudan Mathihalli Date: Thu, 13 Mar 2003 20:36:39 +0000 Subject: [PATCH] Replace the APACHE_CHECK_SSL_TOOLKIT method with a cleaner one, using autoconf tools (AC_CHECK_HEADER, AC_CHECK_LIB etc). Submitted by: Geoff Thorpe Reviewed by: Madhu, Justin git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98999 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 4 + acconfig.h | 6 ++ acinclude.m4 | 172 +++++++++++++++++++++--------------------- modules/ssl/config.m4 | 2 - 4 files changed, 95 insertions(+), 89 deletions(-) diff --git a/CHANGES b/CHANGES index 9ad04ec1cd..32a47cdd6d 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,10 @@ Changes with Apache 2.1.0-dev [Remove entries to the current 2.0 section below, when backported] + *) Replace the APACHE_CHECK_SSL_TOOLKIT method with a cleaner one, using + autoconf tools (AC_CHECK_HEADER, AC_CHECK_LIB etc). + [Geoff Thorpe ] + *) ssl session caching(shmht) : Fix a SEGV problem with SHMHT session caching. PR 17864. [Andreas Leimbacher , Madhusudan Mathihalli] diff --git a/acconfig.h b/acconfig.h index 31ad39f7a7..20336ef6ab 100644 --- a/acconfig.h +++ b/acconfig.h @@ -1,2 +1,8 @@ /* Define this if struct tm has a field tm_gmtoff */ #undef HAVE_GMTOFF + +/* Define this if we are building with OpenSSL */ +#undef HAVE_OPENSSL + +/* Define this if we are building with SSL-C */ +#undef HAVE_SSLC diff --git a/acinclude.m4 b/acinclude.m4 index f0ef66fb02..233a452975 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -314,113 +314,111 @@ AC_DEFUN(APACHE_REQUIRE_CXX,[ dnl dnl APACHE_CHECK_SSL_TOOLKIT dnl -dnl Find the openssl toolkit installation and check it for the right -dnl version, then add its flags to INCLUDES and LIBS. This should -dnl really be using a custom AC_TRY_COMPILE function to test the includes -dnl and then AC_TRY_LINK to test the libraries directly for the version, -dnl but that will require someone who knows how to program openssl. +dnl Configure for the detected openssl/ssl-c toolkit installation, giving +dnl preference to "--with-ssl=" if it was specified. dnl AC_DEFUN(APACHE_CHECK_SSL_TOOLKIT,[ -if test "x$ap_ssltk_base" = "x"; then - AC_MSG_CHECKING(for SSL/TLS toolkit base) +if test "x$ap_ssltk_configured" = "x"; then + dnl initialise the variables we use ap_ssltk_base="" - AC_ARG_WITH(ssl, APACHE_HELP_STRING(--with-ssl=DIR,SSL/TLS toolkit (OpenSSL)), [ + ap_ssltk_inc="" + ap_ssltk_lib="" + ap_ssltk_type="" + + dnl Determine the SSL/TLS toolkit's base directory, if any + AC_MSG_CHECKING(for SSL/TLS toolkit base) + AC_ARG_WITH(ssl, APACHE_HELP_STRING(--with-ssl=DIR,SSL/TLS toolkit), [ + dnl If --with-ssl specifies a directory, we use that directory or fail if test "x$withval" != "xyes" -a "x$withval" != "x"; then - ap_ssltk_base="$withval" - if test -f "$ap_ssltk_base/bin/openssl"; then - ap_ssltk_version="`$ap_ssltk_base/bin/openssl version`" - else - ap_ssltk_version="unknown" - fi + dnl This ensures $withval is actually a directory and that it is absolute + ap_ssltk_base="`cd $withval ; pwd`" fi ]) if test "x$ap_ssltk_base" = "x"; then - AC_CACHE_VAL(ap_cv_ssltk,[ - # - # shotgun approach: find all occurrences of the openssl program - # - # The IFS=... trick eliminates the colons from $PATH, without using an external program - for p in `IFS=":$IFS"; echo $PATH` /usr/local/openssl/bin /usr/local/ssl/bin; do - if test -f "$p/openssl"; then - ap_ssltk_version="`$p/openssl version`" - if test "x$ap_ssltk_version" != "x"; then - ap_cv_ssltk="`(cd $p/.. && pwd)`" - break - fi - fi - done - if test "x$ap_cv_ssltk" = "x"; then - AC_MSG_ERROR([requires OpenSSL 0.9.6e or higher]) - fi - ]) - ap_ssltk_base="$ap_cv_ssltk" + AC_MSG_RESULT(none) + else + AC_MSG_RESULT($ap_ssltk_base) fi - if test ! -d $ap_ssltk_base; then - AC_MSG_ERROR([invalid SSL/TLS toolkit base directory $ap_ssltk_base]) + + dnl Run header and version checks + saved_CPPFLAGS=$CPPFLAGS + if test "x$ap_ssltk_base" != "x"; then + ap_ssltk_inc="-I$ap_ssltk_base/include" + CPPFLAGS="$CPPFLAGS $ap_ssltk_inc" fi - AC_MSG_RESULT($ap_ssltk_base) - - AC_MSG_CHECKING(for SSL/TLS toolkit version) - AC_MSG_RESULT($ap_ssltk_version) - case "$ap_ssltk_version" in - "OpenSSL "[[1-9]]* | \ - "OpenSSL "0.9.6[[e-z]]* | \ - "OpenSSL "0.9.[[7-9]]* | \ - "OpenSSL "0.[[1-9]][[0-9]]* ) - # okay versions that do not have known security holes - ;; - "OpenSSL"*) - AC_MSG_WARN([OpenSSL versions prior to 0.9.6e have known security holes]) - ;; - *) - # unknown version -- assume the user knows what they are doing - ;; - esac - - AC_MSG_CHECKING(for SSL/TLS toolkit includes) - ap_ssltk_incdir="" - for p in $ap_ssltk_base/include /usr/local/openssl/include \ - /usr/local/ssl/include /usr/local/include /usr/include; do - if test -f "$p/openssl/ssl.h"; then - ap_ssltk_incdir="$p" - break - elif test -f "$p/ssl.h"; then - ap_ssltk_incdir="$p" - break + AC_CHECK_HEADERS([sslc.h], [ap_ssltk_type="sslc"], []) + if test "x$ap_ssltk_type" = "x"; then + AC_CHECK_HEADERS([openssl/opensslv.h openssl/ssl.h], [ap_ssltk_type="openssl"], []) + if test "x$ap_ssltk_type" = "x"; then + AC_MSG_ERROR([No SSL/TLS headers were available]) fi - done - if test "x$ap_ssltk_incdir" = "x"; then - AC_MSG_ERROR([OpenSSL headers not found]) + dnl so it's OpenSSL - report, then test for a good version + echo "... SSL/TLS support configuring for OpenSSL" + AC_MSG_CHECKING(for OpenSSL version) + AC_TRY_COMPILE([#include ], +[#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x0090609f +#error "invalid openssl version" +#endif], + [dnl Replace this with OPENSSL_VERSION_TEXT from opensslv.h? + AC_MSG_RESULT(OK)], + [AC_MSG_RESULT([not encouraging]) + echo "WARNING: OpenSSL version may contain security vulnerabilities!"]) + + else + + dnl so it's SSL-C - report, then test anything relevant + echo "... SSL/TLS support configuring for SSL-C" + AC_MSG_CHECKING(for SSL-C version) + dnl FIXME: we currently don't check anything for SSL-C + AC_MSG_RESULT([OK, but I didn't really check]) fi - AC_MSG_RESULT($ap_ssltk_incdir) + dnl restore + CPPFLAGS=$saved_CPPFLAGS - AC_MSG_CHECKING(for SSL/TLS toolkit libraries) - ap_ssltk_libdir="" - for p in $ap_ssltk_base/lib /usr/local/openssl/lib \ - /usr/local/ssl/lib /usr/local/lib /usr/lib /lib /usr/lib64; do - if test -f "$p/libssl.a" -o -f "$p/libssl.so" -o -f "$p/libssl.dylib"; then - ap_ssltk_libdir="$p" - break + dnl Run library checks + saved_LDFLAGS=$LDFLAGS + saved_LIBS=$LIBS + if test "x$ap_ssltk_base" != "x"; then + if test -d "$ap_ssltk_base/lib"; then + ap_ssltk_lib="$ap_ssltk_base/lib" + else + ap_ssltk_lib="$ap_ssltk_base" fi - done - if test ".$ap_ssltk_libdir" = .; then - AC_MSG_ERROR([OpenSSL libraries not found]) + LDFLAGS="$LDFLAGS -L$ap_ssltk_lib" + fi + dnl make sure "other" flags are available so libcrypto and libssl can link + LIBS="$LIBS `$apr_config --libs`" + liberrors="" + AC_CHECK_LIB(crypto, SSLeay_version, [], [liberrors="yes"]) + AC_CHECK_LIB(ssl, SSL_CTX_new, [], [liberrors="yes"]) + if test "x$liberrors" != "x"; then + AC_MSG_ERROR([... Error, SSL/TLS libraries were missing or unusable]) fi - AC_MSG_RESULT($ap_ssltk_libdir) + dnl restore + LDFLAGS=$saved_LDFLAGS + LIBS=$saved_LIBS - dnl # annotate the Apache build environment with determined information - APR_ADDTO(INCLUDES, [-I$ap_ssltk_incdir/openssl]) - if test "x$ap_ssltk_incdir" != "x/usr/include"; then - APR_ADDTO(INCLUDES, [-I$ap_ssltk_incdir]) + dnl Adjust apache's configuration based on what we found above. + dnl (a) define preprocessor symbols + if test "$ap_ssltk_type" = "openssl"; then + AC_DEFINE(HAVE_OPENSSL) + else + AC_DEFINE(HAVE_SSLC) + fi + dnl (b) hook up include paths + if test "x$ap_ssltk_inc" != "x"; then + APR_ADDTO(INCLUDES, [$ap_ssltk_inc]) fi - if test "x$ap_ssltk_libdir" != "x/usr/lib"; then - APR_ADDTO(LDFLAGS, [-L$ap_ssltk_libdir]) + dnl (c) hook up linker paths + if test "x$ap_ssltk_lib" != "x"; then + APR_ADDTO(LDFLAGS, ["-L$ap_ssltk_lib"]) if test "x$ap_platform_runtime_link_flag" != "x"; then - APR_ADDTO(LDFLAGS, [$ap_platform_runtime_link_flag$ap_ssltk_libdir]) + APR_ADDTO(LDFLAGS, ["$ap_platform_runtime_link_flag$ap_ssltk_libdir"]) fi fi + dnl (d) add "-lssl -lcrypto" to LIBS because restoring LIBS after + dnl AC_CHECK_LIB() obliterates any flags AC_CHECK_LIB() added. APR_ADDTO(LIBS, [-lssl -lcrypto]) - ap_cv_ssltk="$ap_ssltk_base" fi ]) diff --git a/modules/ssl/config.m4 b/modules/ssl/config.m4 index e56c48dc5c..a14254395a 100644 --- a/modules/ssl/config.m4 +++ b/modules/ssl/config.m4 @@ -77,8 +77,6 @@ ssl_util_table.lo dnl dnl # hook module into the Autoconf mechanism (--enable-ssl option) APACHE_MODULE(ssl, [SSL/TLS support (mod_ssl)], $ssl_objs, , no, [ APACHE_CHECK_SSL_TOOLKIT - AC_CHECK_FUNCS(SSL_set_state) - AC_CHECK_FUNCS(SSL_set_cert_store) ]) dnl # end of module specific part -- 2.40.0