On 10/28/2009 10:17 PM, [email protected] wrote:
> Author: fuankg
> Date: Wed Oct 28 21:17:50 2009
> New Revision: 830765
>
> URL: http://svn.apache.org/viewvc?rev=830765&view=rev
> Log:
> define HAVE_OCSP dependent on OpenSSL version to make things
> easier for non-configure platforms (NetWare, Win32).
>
> Modified:
> httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h
>
> Modified: httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h
> URL:
> http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h?rev=830765&r1=830764&r2=830765&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h (original)
> +++ httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h Wed Oct 28 21:17:50
> 2009
> @@ -39,7 +39,8 @@
> #include <openssl/rand.h>
> #include <openssl/x509v3.h>
>
> -#ifdef HAVE_OCSP
> +#if OPENSSL_VERSION_NUMBER >= 0x00907000
> +#define HAVE_OCSP
> #include <openssl/x509_vfy.h>
> #include <openssl/ocsp.h>
> #endif
>
>
I now get the following warnings on Linux:
In file included from ssl_private.h:57,
from mod_ssl.c:27:
ssl_toolkit_compat.h:43:1: warning: "HAVE_OCSP" redefined
In file included from /usr/src/apache/httpd-trunk/include/ap_config.h:234,
from /usr/src/apache/httpd-trunk/include/httpd.h:43,
from ssl_private.h:30,
from mod_ssl.c:27:
/usr/src/apache/httpd-trunk/include/ap_config_auto.h:102:1: warning: this is
the location of the previous definition
So if the above is only needed for Netware and Windows we should make this
either conditional
on those two OS'es or we should add an
#ifndef HAVE_OCSP
#endif
block around this.
Regards
Rüdiger
