diff options
| author | Madhusudan Mathihalli <madhum@apache.org> | 2003-03-14 03:20:50 +0100 |
|---|---|---|
| committer | Madhusudan Mathihalli <madhum@apache.org> | 2003-03-14 03:20:50 +0100 |
| commit | aea3ed09fb32bb7a259ebff92e2fd157df1a94cc (patch) | |
| tree | 2ed104b08f547237c230e9bb544862c4cfb35844 | |
| parent | Added documentation for the directives SecureListen and NWSSLTrustedCerts (diff) | |
| download | apache2-aea3ed09fb32bb7a259ebff92e2fd157df1a94cc.tar.xz apache2-aea3ed09fb32bb7a259ebff92e2fd157df1a94cc.zip | |
OpenSSL should be included as "openssl/ssl.h" and not "ssl.h" (and rely on the
INCLUDE path to be defined properly)
PR: 11310
Submitted by: Geoff Thrope <geoff@geoffthrope.net>
Reviewed by: Madhusudan Mathihalli
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99008 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | modules/ssl/mod_ssl.h | 16 | ||||
| -rw-r--r-- | modules/ssl/ssl_toolkit_compat.h | 29 |
3 files changed, 25 insertions, 24 deletions
@@ -2,6 +2,10 @@ Changes with Apache 2.1.0-dev [Remove entries to the current 2.0 section below, when backported] + *) OpenSSL headers should be included as "openssl/ssl.h", and not rely on + the INCLUDE path to be defined properly. + PR 11310. [Geoff Thrope <geoff@geoffthorpe.net>] + *) Modify APACHE_CHECK_SSL_TOOLKIT to detect SSL-C. [Madhusudan Mathihalli] *) Replace the APACHE_CHECK_SSL_TOOLKIT method with a cleaner one, using diff --git a/modules/ssl/mod_ssl.h b/modules/ssl/mod_ssl.h index bd451a9064..0e87525f5f 100644 --- a/modules/ssl/mod_ssl.h +++ b/modules/ssl/mod_ssl.h @@ -107,24 +107,8 @@ #define MOD_SSL_VERSION AP_SERVER_BASEREVISION -/* OpenSSL headers */ -#include <ssl.h> -#include <err.h> -#include <x509.h> -#include <pem.h> -#include <crypto.h> -#include <evp.h> -#include <rand.h> -#ifdef SSL_EXPERIMENTAL_ENGINE -#include <engine.h> -#endif - #include "ssl_toolkit_compat.h" -#ifdef HAVE_SSL_X509V3_H -#include <x509v3.h> -#endif - /* mod_ssl headers */ #include "ssl_expr.h" #include "ssl_util_ssl.h" diff --git a/modules/ssl/ssl_toolkit_compat.h b/modules/ssl/ssl_toolkit_compat.h index 8d89646b01..f2519005de 100644 --- a/modules/ssl/ssl_toolkit_compat.h +++ b/modules/ssl/ssl_toolkit_compat.h @@ -55,7 +55,20 @@ * between OpenSSL and RSA sslc */ -#ifdef OPENSSL_VERSION_NUMBER +#ifdef HAVE_OPENSSL + +/* OpenSSL headers */ +#include <openssl/ssl.h> +#include <openssl/err.h> +#include <openssl/x509.h> +#include <openssl/pem.h> +#include <openssl/crypto.h> +#include <openssl/evp.h> +#include <openssl/rand.h> +#include <openssl/x509v3.h> +#ifdef SSL_EXPERIMENTAL_ENGINE +#include <openssl/engine.h> +#endif /* * rsa sslc uses incomplete types for most structures @@ -121,7 +134,13 @@ #define HAVE_SSL_X509V3_EXT_d2i -#else /* RSA sslc */ +#else /* HAVE_SSLC */ + +#include <sslc.h> + +#if SSLC_VERSION > 0x1FFF +#include <x509v3.h> +#endif /* sslc does not support this function, OpenSSL has since 9.5.1 */ #define RAND_status() 1 @@ -171,8 +190,6 @@ #define modssl_set_verify(ssl, verify, cb) \ SSL_set_verify(ssl, verify) -#define NO_SSL_X509V3_H - #endif /* BEGIN GENERATED SECTION */ @@ -210,8 +227,4 @@ SSL_set_verify(ssl, verify, cb) #endif -#ifndef NO_SSL_X509V3_H -#define HAVE_SSL_X509V3_H -#endif - #endif /* SSL_TOOLKIT_COMPAT_H */ |