Commit 0b86338a authored by Madhusudan Mathihalli's avatar Madhusudan Mathihalli
Browse files

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/modules/ssl@99008 13f79535-47bb-0310-9956-ffa450edef68
parent 396fa4df

mod_ssl.h

+0 −16
Changes for mod_ssl.h: 0 added lines, 16 removed lines.
Original line number Diff line number Diff line
@@ -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"

ssl_toolkit_compat.h

+21 −8
Changes for ssl_toolkit_compat.h: 21 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -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 */